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-15 13:18:42
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15719/src/ccmtools/parser/assembly Modified Files: Main.java Log Message: Java assemblies Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/Main.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Main.java 14 Feb 2007 12:27:05 -0000 1.4 --- Main.java 15 Feb 2007 13:18:37 -0000 1.5 *************** *** 12,16 **** import java.io.FileReader; import java.util.List; - import ccmtools.CcmtoolsException; import ccmtools.parser.assembly.metamodel.Model; --- 12,15 ---- *************** *** 68,72 **** catch (Exception e) { ! throw new CcmtoolsException("problem with: " + f, e); } } --- 67,71 ---- catch (Exception e) { ! throw new RuntimeException("problem with: " + f, e); } } |
|
From: Robert L. <rle...@us...> - 2007-02-15 13:18:42
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15719/src/ccmtools Modified Files: Constants.java Log Message: Java assemblies Index: Constants.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/Constants.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Constants.java 14 Feb 2007 12:27:05 -0000 1.24 --- Constants.java 15 Feb 2007 13:18:37 -0000 1.25 *************** *** 24,28 **** { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.8.10"; public static final String CPP_PATH = "cpp"; --- 24,28 ---- { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.9.0"; public static final String CPP_PATH = "cpp"; |
|
From: Robert L. <rle...@us...> - 2007-02-15 13:18:41
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15719/src/ccmtools/generator/java Modified Files: JavaComponentGenerator.java Log Message: Java assemblies Index: JavaComponentGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/JavaComponentGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JavaComponentGenerator.java 14 Feb 2007 12:27:04 -0000 1.2 --- JavaComponentGenerator.java 15 Feb 2007 13:18:37 -0000 1.3 *************** *** 189,193 **** for(JavaApplicationGeneratorElement element : generatorElements) { ! SourceFileHelper.writeApplicationFiles(uiDriver, parameters.getOutDir(), element.generateAssemblySourceFiles(assemblies)); } --- 189,193 ---- for(JavaApplicationGeneratorElement element : generatorElements) { ! SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), element.generateAssemblySourceFiles(assemblies)); } |
|
From: Robert L. <rle...@us...> - 2007-02-15 12:21:33
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Test In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27103/test/JavaAssembly/prototype/wamas/Test Modified Files: I1Adapter.java C1i1Impl.java Log Message: first version of the assembly prototype Index: I1Adapter.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Test/I1Adapter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** I1Adapter.java 15 Feb 2007 09:51:31 -0000 1.2 --- I1Adapter.java 15 Feb 2007 12:21:21 -0000 1.3 *************** *** 6,24 **** package wamas.Test; ! import java.util.logging.Logger; ! import Components.CCMException; import ccmtools.local.ServiceLocator; ! ! ! public class I1Adapter implements I1 { private Logger logger = ServiceLocator.instance().getLogger(); ! private CCM_I1 localInterface; ! protected I1Adapter() { --- 6,24 ---- package wamas.Test; ! import java.util.logging.Logger; ! import Components.CCMException; import ccmtools.local.ServiceLocator; ! ! ! public class I1Adapter implements I1 { private Logger logger = ServiceLocator.instance().getLogger(); ! private CCM_I1 localInterface; ! protected I1Adapter() { *************** *** 31,44 **** this.localInterface = localInterface; } - - ! public String value() ! throws CCMException { logger.fine(""); return localInterface.value(); } ! ! } --- 31,44 ---- this.localInterface = localInterface; } ! ! ! public String value() ! throws CCMException { logger.fine(""); return localInterface.value(); } ! ! } Index: C1i1Impl.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Test/C1i1Impl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** C1i1Impl.java 15 Feb 2007 09:51:31 -0000 1.2 --- C1i1Impl.java 15 Feb 2007 12:21:21 -0000 1.3 *************** *** 2,20 **** * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> ! * * CCM_I1Impl facet implementation. * * // TODO: WRITE YOUR DESCRIPTION HERE ! ! * * @author * @version */ ! package wamas.Test; import Components.CCMException; - ! /** * This class implements a component facet's methods. * --- 2,20 ---- * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> ! * * CCM_I1Impl facet implementation. * * // TODO: WRITE YOUR DESCRIPTION HERE ! ! * * @author * @version */ ! package wamas.Test; import Components.CCMException; ! ! /** * This class implements a component facet's methods. * *************** *** 24,28 **** * @version */ ! public class C1i1Impl implements CCM_I1 { --- 24,28 ---- * @version */ ! public class C1i1Impl implements CCM_I1 { *************** *** 34,52 **** this.component = component; } ! /** Business logic implementations */ ! ! ! public String value() throws CCMException { ! // TODO: IMPLEMENT ME HERE ! ! return ""; ! } } --- 34,51 ---- this.component = component; } ! /** Business logic implementations */ ! ! ! public String value() throws CCMException { ! return this.getClass().getName(); ! } } |
|
From: Robert L. <rle...@us...> - 2007-02-15 12:21:33
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27103/test/JavaAssembly/prototype/wamas Modified Files: C3i1Impl.java C3Impl.java Main.java Log Message: first version of the assembly prototype Index: C3i1Impl.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/C3i1Impl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** C3i1Impl.java 15 Feb 2007 09:51:31 -0000 1.2 --- C3i1Impl.java 15 Feb 2007 12:21:19 -0000 1.3 *************** *** 2,22 **** * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> ! * * CCM_I1Impl facet implementation. * * // TODO: WRITE YOUR DESCRIPTION HERE ! ! * * @author * @version */ ! package wamas; import Components.CCMException; import wamas.Test.CCM_I1; import wamas.Test.I1; - ! /** * This class implements a component facet's methods. * --- 2,22 ---- * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> ! * * CCM_I1Impl facet implementation. * * // TODO: WRITE YOUR DESCRIPTION HERE ! ! * * @author * @version */ ! package wamas; import Components.CCMException; import wamas.Test.CCM_I1; import wamas.Test.I1; ! ! /** * This class implements a component facet's methods. * *************** *** 26,30 **** * @version */ ! public class C3i1Impl implements CCM_I1 { --- 26,30 ---- * @version */ ! public class C3i1Impl implements CCM_I1 { *************** *** 32,54 **** private C3Impl component; ! public C3i1Impl(C3Impl component) { this.component = component; } ! /** Business logic implementations */ ! ! ! public String value() throws CCMException { ! // TODO: IMPLEMENT ME HERE ! ! return ""; ! } } --- 32,54 ---- private C3Impl component; ! public C3i1Impl(C3Impl component, wamas.Test.I1 target) { this.component = component; + this.target = target; } ! /** Business logic implementations */ ! ! // connect comp1.i1 to this.i1; ! private wamas.Test.I1 target; public String value() throws CCMException { ! return target.value(); ! } } Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Main.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Main.java 15 Feb 2007 09:51:31 -0000 1.1 --- Main.java 15 Feb 2007 12:21:20 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- H3 home = (H3)H3Deployment.create(); C3 component = home.create(); + component.configuration_complete(); System.out.println("C3.b = "+component.b()); wamas.Test.I1 c3i1 = component.provide_i1(); *************** *** 15,18 **** --- 16,20 ---- wamas.Test.H1 h1 = (wamas.Test.H1)wamas.Test.H1Deployment.create(); wamas.Test.C1 c1 = h1.create(); + c1.configuration_complete(); wamas.Test.I1 c1i1 = c1.provide_i1(); System.out.println("C1->I1.value() = "+c1i1.value()); Index: C3Impl.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/C3Impl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C3Impl.java 15 Feb 2007 09:27:25 -0000 1.1 --- C3Impl.java 15 Feb 2007 12:21:20 -0000 1.2 *************** *** 2,6 **** * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> ! * * CCM_C3 component business logic. * --- 2,6 ---- * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> ! * * CCM_C3 component business logic. * *************** *** 12,21 **** package wamas; - - import Components.CCMException; - import Components.SessionContext; ! ! /** * This class implements component equivalent and supported interfaces --- 12,22 ---- package wamas; ! import Components.CCMException; ! import Components.CCMExceptionReason; ! import Components.SessionContext; ! ! ! /** * This class implements component equivalent and supported interfaces *************** *** 27,45 **** * @author * @version ! */ ! public class C3Impl implements CCM_C3 { /** Supported interface attribute variables */ ! ! /** Component attribute variables */ ! ! private int b_; public CCM_C3_Context ctx; ! ! public C3Impl() { --- 28,53 ---- * @author * @version ! */ ! public class C3Impl implements CCM_C3 { /** Supported interface attribute variables */ ! ! /** Component attribute variables */ ! ! private int b_; public CCM_C3_Context ctx; ! ! ! // component Test::C1 comp1; ! private wamas.Test.C1 comp1_; ! ! // component Test::C2 comp2; ! private wamas.Test.C2 comp2_; ! ! public C3Impl() { *************** *** 48,61 **** ! /* ! * Supported interface methods */ /** Supported interface attributes */ ! ! ! /** Supported interface methods */ ! --- 56,69 ---- ! /* ! * Supported interface methods */ /** Supported interface attributes */ ! ! ! /** Supported interface methods */ ! *************** *** 67,71 **** { return this.b_; ! } public void b(int value) --- 75,79 ---- { return this.b_; ! } public void b(int value) *************** *** 74,104 **** this.b_ = value; } ! /** Facet implementation factory methods */ ! public wamas.Test.CCM_I1 get_i1() { ! return new wamas.C3i1Impl(this); } ! /** Component callback methods */ ! ! public void set_session_context(SessionContext ctx) throws CCMException { ! this.ctx = (CCM_C3_Context)ctx; } ! public void ccm_activate() throws CCMException { ! // OPTIONAL: IMPLEMENT ME HERE ! } ! public void ccm_passivate() throws CCMException { --- 82,149 ---- this.b_ = value; } ! /** Facet implementation factory methods */ ! public wamas.Test.CCM_I1 get_i1() { ! // connect comp1.i1 to this.i1; ! return new wamas.C3i1Impl(this, comp1_.provide_i1()); } ! /** Component callback methods */ ! ! public void set_session_context(SessionContext ctx) throws CCMException { ! this.ctx = (CCM_C3_Context)ctx; } ! public void ccm_activate() throws CCMException { ! try ! { ! { ! // component Test::C1 comp1; ! wamas.Test.H1 home = (wamas.Test.H1)wamas.Test.H1Deployment.create(); ! comp1_ = home.create(); ! } ! ! { ! // component wamas::Test::C2 comp2; ! wamas.Test.H2 home = (wamas.Test.H2)wamas.Test.H2Deployment.create(); ! comp2_ = home.create(); ! } ! ! // connect comp2.i2 to comp1.i2; ! comp1_.connect_i2(comp2_.provide_i2()); ! ! // connect this.i3 to comp2.i3; ! comp2_.connect_i3(ctx.get_connection_i3()); ! ! // constant comp1.a1 = "Hello World"; ! comp1_.a1("Hello World"); ! ! // constant comp1.a2 = 642; ! comp1_.a2(642); ! ! // attribute comp2.b = this.b; ! comp2_.b(this.b_); ! ! // finish configuration ! comp1_.configuration_complete(); ! comp2_.configuration_complete(); ! } ! catch(Exception e) ! { ! throw new CCMException(e.getMessage(), CCMExceptionReason.CREATE_ERROR); ! } } ! public void ccm_passivate() throws CCMException { *************** *** 106,110 **** } ! public void ccm_remove() throws CCMException { --- 151,155 ---- } ! public void ccm_remove() throws CCMException { |
|
From: Robert L. <rle...@us...> - 2007-02-15 12:21:33
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27103/test/JavaAssembly/prototype Modified Files: test1.assembly Log Message: first version of the assembly prototype Index: test1.assembly =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/test1.assembly,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test1.assembly 15 Feb 2007 09:27:25 -0000 1.1 --- test1.assembly 15 Feb 2007 12:21:22 -0000 1.2 *************** *** 12,16 **** constant comp1.a1 = "Hello World"; ! constant comp1.a1 = 642; attribute comp2.b = this.b; --- 12,16 ---- constant comp1.a1 = "Hello World"; ! constant comp1.a2 = 642; attribute comp2.b = this.b; |
|
From: Robert L. <rle...@us...> - 2007-02-15 09:51:37
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Test In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1208/test/JavaAssembly/prototype/wamas/Test Modified Files: I1Adapter.java C1i1Impl.java I1.java Log Message: empty prototype Index: I1.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Test/I1.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** I1.java 15 Feb 2007 09:27:24 -0000 1.1 --- I1.java 15 Feb 2007 09:51:31 -0000 1.2 *************** *** 18,20 **** --- 18,23 ---- + String value () + throws CCMException; + } Index: I1Adapter.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Test/I1Adapter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** I1Adapter.java 15 Feb 2007 09:27:23 -0000 1.1 --- I1Adapter.java 15 Feb 2007 09:51:31 -0000 1.2 *************** *** 32,36 **** } ! } --- 32,44 ---- } ! ! ! public String value() ! throws CCMException ! { ! logger.fine(""); ! return localInterface.value(); ! } ! } Index: C1i1Impl.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Test/C1i1Impl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C1i1Impl.java 15 Feb 2007 09:27:24 -0000 1.1 --- C1i1Impl.java 15 Feb 2007 09:51:31 -0000 1.2 *************** *** 43,45 **** --- 43,52 ---- + public String value() + throws CCMException + { + // TODO: IMPLEMENT ME HERE ! + return ""; + } + } |
|
From: Robert L. <rle...@us...> - 2007-02-15 09:51:37
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1208/test/JavaAssembly/prototype/wamas Modified Files: C3i1Impl.java Added Files: Main.java Log Message: empty prototype --- NEW FILE: Main.java --- package wamas; class Main { public static void main(String[] args) { try { H3 home = (H3)H3Deployment.create(); C3 component = home.create(); System.out.println("C3.b = "+component.b()); wamas.Test.I1 c3i1 = component.provide_i1(); System.out.println("C3->I1.value() = "+c3i1.value()); wamas.Test.H1 h1 = (wamas.Test.H1)wamas.Test.H1Deployment.create(); wamas.Test.C1 c1 = h1.create(); wamas.Test.I1 c1i1 = c1.provide_i1(); System.out.println("C1->I1.value() = "+c1i1.value()); } catch(Exception e) { e.printStackTrace(); } } } Index: C3i1Impl.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/C3i1Impl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C3i1Impl.java 15 Feb 2007 09:27:24 -0000 1.1 --- C3i1Impl.java 15 Feb 2007 09:51:31 -0000 1.2 *************** *** 45,47 **** --- 45,54 ---- + public String value() + throws CCMException + { + // TODO: IMPLEMENT ME HERE ! + return ""; + } + } |
|
From: Robert L. <rle...@us...> - 2007-02-15 09:51:36
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1208/test/JavaAssembly/prototype Modified Files: test1.idl Log Message: empty prototype Index: test1.idl =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/test1.idl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test1.idl 15 Feb 2007 09:27:25 -0000 1.1 --- test1.idl 15 Feb 2007 09:51:31 -0000 1.2 *************** *** 5,9 **** interface I1 { ! /* empty */ }; --- 5,9 ---- interface I1 { ! string value(); }; |
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25040/test/JavaAssembly/prototype/wamas Added Files: CCM_H3.java CCM_C3_Context.java CCM_C3.java .cvsignore CCM_C3_ContextImpl.java H3Implicit.java C3i1Impl.java H3Deployment.java CCM_H3Explicit.java H3Adapter.java H3Explicit.java CCM_H3Implicit.java C3.java C3Impl.java H3Factory.java C3Adapter.java H3.java H3Impl.java Log Message: empty prototype --- NEW FILE: H3Adapter.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import java.util.logging.Logger; import Components.Assembly; import Components.AssemblyFactory; import Components.CCMException; import Components.CCMObject; import Components.CreateFailure; import Components.RemoveFailure; import ccmtools.local.ServiceLocator; public class H3Adapter implements H3 { private Logger logger = ServiceLocator.instance().getLogger(); private CCM_H3 localInterface; private AssemblyFactory assemblyFactory; protected H3Adapter() { this(null, null); } public H3Adapter(CCM_H3 localInterface) { this(localInterface, null); } public H3Adapter(CCM_H3 localInterface, AssemblyFactory assemblyFactory) { logger.fine("localInterface = " + localInterface + ", " + assemblyFactory); this.localInterface = localInterface; this.assemblyFactory = assemblyFactory; } public C3 create() throws CreateFailure { logger.fine(""); try { CCM_C3 c = (CCM_C3)localInterface.create(); C3 component; if(assemblyFactory != null) { Assembly assembly = assemblyFactory.create(); component = new C3Adapter(c, assembly); assembly.build(component); } else { component = new C3Adapter(c); } return component; } catch(CCMException e) { throw new CreateFailure(); } } public void remove_component(CCMObject component) throws CCMException, RemoveFailure { logger.fine(""); component.remove(); } public CCMObject create_component() throws CCMException, CreateFailure { logger.fine(""); return create(); } } --- NEW FILE: C3i1Impl.java --- /** * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * * CCM_I1Impl facet implementation. * * // TODO: WRITE YOUR DESCRIPTION HERE ! * * @author * @version */ package wamas; import Components.CCMException; import wamas.Test.CCM_I1; import wamas.Test.I1; /** * This class implements a component facet's methods. * * // TODO: WRITE YOUR DESCRIPTION HERE ! * * @author * @version */ public class C3i1Impl implements CCM_I1 { /** Reference to the facet's component implementation */ private C3Impl component; public C3i1Impl(C3Impl component) { this.component = component; } /** Business logic implementations */ } --- NEW FILE: CCM_H3Explicit.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; public interface CCM_H3Explicit extends Components.HomeExecutorBase { } --- NEW FILE: H3Implicit.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import Components.KeylessCCMHome; import Components.CreateFailure; public interface H3Implicit extends KeylessCCMHome { C3 create() throws CreateFailure; } --- NEW FILE: H3Impl.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * * H3 Implementation * * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author * @version */ package wamas; import Components.CCMException; import Components.EnterpriseComponent; /** * This class implements a component home's attributes and factory methods. * * // TODO: WRITE YOUR DESCRIPTION HERE ! * * @author * @version */ public class H3Impl implements CCM_H3 { public H3Impl() { // OPTIONAL: IMPLEMENT ME HERE ! } public EnterpriseComponent create() throws CCMException { return (EnterpriseComponent) new C3Impl(); } } --- NEW FILE: C3Impl.java --- /** * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * * CCM_C3 component business logic. * * // TODO: WRITE YOUR DESCRIPTION HERE ! * * @author * @version */ package wamas; import Components.CCMException; import Components.SessionContext; /** * This class implements component equivalent and supported interfaces * as well as component attributes. * Additionally, session component callback methods must be implemented. * * // TODO: WRITE YOUR DESCRIPTION HERE ! * * @author * @version */ public class C3Impl implements CCM_C3 { /** Supported interface attribute variables */ /** Component attribute variables */ private int b_; public CCM_C3_Context ctx; public C3Impl() { // OPTIONAL: IMPLEMENT ME HERE ! } /* * Supported interface methods */ /** Supported interface attributes */ /** Supported interface methods */ /** Component attribute accessor methods */ public int b() throws CCMException { return this.b_; } public void b(int value) throws CCMException { this.b_ = value; } /** Facet implementation factory methods */ public wamas.Test.CCM_I1 get_i1() { return new wamas.C3i1Impl(this); } /** Component callback methods */ public void set_session_context(SessionContext ctx) throws CCMException { this.ctx = (CCM_C3_Context)ctx; } public void ccm_activate() throws CCMException { // OPTIONAL: IMPLEMENT ME HERE ! } public void ccm_passivate() throws CCMException { // OPTIONAL: IMPLEMENT ME HERE ! } public void ccm_remove() throws CCMException { // OPTIONAL: IMPLEMENT ME HERE ! } } --- NEW FILE: C3.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import Components.AlreadyConnected; import Components.CCMObject; import Components.CCMException; import Components.Cookie; import Components.ExceededConnectionLimit; import Components.InvalidConnection; import Components.NoConnection; public interface C3 extends CCMObject { /** Attribute equivalent methods */ int b() throws CCMException; void b(int value) throws CCMException; /** Facet equivalent methods */ wamas.Test.I1 provide_i1(); /** Receptacle equivalent methods */ void connect_i3(wamas.Test.I3 localObj) throws AlreadyConnected, InvalidConnection; wamas.Test.I3 disconnect_i3() throws NoConnection; wamas.Test.I3 get_connection_i3(); } --- NEW FILE: .cvsignore --- *.class --- NEW FILE: CCM_C3_Context.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import Components.NoConnection; public interface CCM_C3_Context extends Components.SessionContext { /** Receptacle access methods */ wamas.Test.I3 get_connection_i3() throws NoConnection; } --- NEW FILE: CCM_C3_ContextImpl.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import Components.HomeExecutorBase; import Components.IllegalState; import Components.NoConnection; import java.util.logging.Logger; import ccmtools.local.ServiceLocator; public class CCM_C3_ContextImpl implements wamas.CCM_C3_Context { private Logger logger = ServiceLocator.instance().getLogger(); private C3 component; public CCM_C3_ContextImpl(C3 component) { logger.fine("component = " + component); this.component = component; } /** Receptacle access methods */ public wamas.Test.I3 get_connection_i3() throws NoConnection { logger.fine(""); return component.get_connection_i3(); } /** CCMContext methods */ public HomeExecutorBase get_CCM_home() { logger.fine(""); throw new RuntimeException("Not implemented!"); } /** SessionContext methods */ public Object get_CCM_object() throws IllegalState { logger.fine(""); throw new RuntimeException("Not implemented!"); } } --- NEW FILE: H3Explicit.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import Components.CCMHome; public interface H3Explicit extends CCMHome { } --- NEW FILE: CCM_C3.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import Components.CCMException; import Components.SessionComponent; public interface CCM_C3 extends SessionComponent { /** Component attribute accessor methods */ int b() throws CCMException; void b(int value) throws CCMException; /** Facet implementation factory methods */ wamas.Test.CCM_I1 get_i1(); } --- NEW FILE: CCM_H3Implicit.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; public interface CCM_H3Implicit { Components.EnterpriseComponent create() throws Components.CCMException; } --- NEW FILE: H3.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; public interface H3 extends H3Explicit, H3Implicit { } --- NEW FILE: H3Factory.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import Components.HomeExecutorBase; import Components.CCMException; public class H3Factory { public static HomeExecutorBase create() throws CCMException { return new H3Impl(); } } --- NEW FILE: CCM_H3.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; public interface CCM_H3 extends CCM_H3Explicit, CCM_H3Implicit { } --- NEW FILE: H3Deployment.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import java.util.logging.Logger; import Components.CCMHome; import Components.CCMException; import Components.AssemblyFactory; import Components.HomeFinder; import ccmtools.local.ServiceLocator; public class H3Deployment { /** Default logger instance */ private static Logger logger = ServiceLocator.instance().getLogger(); public static CCMHome create() throws CCMException { logger.fine(""); return new H3Adapter((CCM_H3)H3Factory.create()); } public static CCMHome create(AssemblyFactory factory) throws CCMException { logger.fine("assemblyFactory = " + factory); return new H3Adapter((CCM_H3)H3Factory.create(), factory); } public static void deploy(String name) throws CCMException { logger.fine("name = " + name); HomeFinder.instance().register_home(create(), name); } public static void deploy(String name, AssemblyFactory factory) throws CCMException { logger.fine("name = " + name + ", assemblyFactory = " + factory); HomeFinder.instance().register_home(create(factory), name); } public static void undeploy(String name) { logger.fine("name = " + name); HomeFinder.instance().unregister_home(name); } } --- NEW FILE: C3Adapter.java --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net> * DO NOT EDIT! */ package wamas; import java.util.logging.Logger; import Components.AlreadyConnected; import Components.Assembly; import Components.CCMException; import Components.CCMHome; import Components.Cookie; import Components.CookieImpl; import Components.CookieRequired; import Components.ExceededConnectionLimit; import Components.InvalidConfiguration; import Components.InvalidConnection; import Components.InvalidName; import Components.NoConnection; import Components.RemoveFailure; import ccmtools.local.ServiceLocator; public class C3Adapter implements C3 { private Logger logger = ServiceLocator.instance().getLogger(); private CCM_C3 localInterface; private CCM_C3_Context ctx; private Assembly assembly; /** Facet adapter references */ private wamas.Test.I1 i1FacetAdapter; /** Receptacle references */ private wamas.Test.I3 i3Receptacle = null; protected C3Adapter() { this(null, null); } public C3Adapter(CCM_C3 localInterface) { this(localInterface, null); } public C3Adapter(CCM_C3 localInterface, Assembly assembly) { logger.fine("localInterface = " + localInterface + ", " + assembly); this.localInterface = localInterface; this.assembly = assembly; } /* * Supported interface methods */ /** Supported interface attributes */ /** Supported interface methods */ /* * Equivalent interface methods */ /** Attribute equivalent methods */ public int b() throws CCMException { int result = localInterface.b(); logger.fine("result = " + result); return result; } public void b(int value) throws CCMException { logger.fine("value = " + value); localInterface.b(value); } /** Facet equivalent methods */ public wamas.Test.I1 provide_i1() { logger.fine(""); if(i1FacetAdapter == null) { i1FacetAdapter = new wamas.Test.I1Adapter(localInterface.get_i1()); } return i1FacetAdapter; } /** Receptacle equivalent methods */ public void connect_i3(wamas.Test.I3 localObj) throws AlreadyConnected, InvalidConnection { logger.fine("obj = " + localObj); if(i3Receptacle != null) { throw new AlreadyConnected(); } else { i3Receptacle = localObj; } } public wamas.Test.I3 disconnect_i3() throws NoConnection { logger.fine(""); if(i3Receptacle == null) { throw new NoConnection(); } else { wamas.Test.I3 f = i3Receptacle; i3Receptacle = null; return f; } } public wamas.Test.I3 get_connection_i3() { logger.fine(""); return i3Receptacle; } /** CCMObject interface methods */ public void configuration_complete() throws InvalidConfiguration { logger.fine(""); ctx = new CCM_C3_ContextImpl(this); try { if(assembly != null) { assembly.configuration_complete(); } localInterface.set_session_context(ctx); localInterface.ccm_activate(); } catch(CCMException e) { throw new InvalidConfiguration(); } } public void remove() throws RemoveFailure { logger.fine(""); try { localInterface.ccm_remove(); if(assembly != null) { assembly.tear_down(); assembly = null; } } catch(CCMException e) { throw new RemoveFailure(); } } public CCMHome get_ccm_home() { throw new RuntimeException("Not implemented!"); } /** Navigation interface methods */ public Object provide_facet(String name) throws InvalidName { logger.fine("name = " + name); if(name == null) { throw new InvalidName(); } else if(name.equals("i1")) { return provide_i1(); } throw new InvalidName(); } /** Receptacle methods */ public Cookie connect(String name, Object obj) throws InvalidName, InvalidConnection, AlreadyConnected, ExceededConnectionLimit { logger.fine("name = " + name + ", obj = " + obj); if(name == null) { throw new InvalidName(); } if(obj == null) { throw new InvalidConnection(); } else if(name.equals("i3")) { connect_i3((wamas.Test.I3) obj); return new CookieImpl(); } else { throw new InvalidName(); } } public void disconnect(String name, Cookie ck) throws InvalidName, InvalidConnection, CookieRequired, NoConnection { logger.fine("name = " + name + ", ck = " + ck ); if(name == null) { throw new InvalidName(); } if(ck == null) { throw new CookieRequired(); } else if(name.equals("i3")) { disconnect_i3(); } else { throw new InvalidName(); } } } |
|
From: Robert L. <rle...@us...> - 2007-02-15 09:27:28
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25040/test/JavaAssembly/prototype Added Files: test1.assembly test1.idl Log Message: empty prototype --- 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; }; home H1 manages C1 { }; component C2 { attribute long b; provides I2 i2; uses I3 i3; }; home H2 manages C2 { }; }; // /module Test component C3 { attribute long b; provides Test::I1 i1; uses Test::I3 i3; }; home H3 manages C3 { }; }; // /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-15 07:50:24
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20566/test/JavaAssembly Log Message: Directory /cvsroot/ccmtools/ccmtools/test/JavaAssembly added to the repository |
|
From: Robert L. <rle...@us...> - 2007-02-15 07:50:24
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20566/test/JavaAssembly/prototype Log Message: Directory /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype added to the repository |
|
From: Robert L. <rle...@us...> - 2007-02-15 07:50:24
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Test In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20566/test/JavaAssembly/prototype/wamas/Test Log Message: Directory /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas/Test added to the repository |
|
From: Robert L. <rle...@us...> - 2007-02-15 07:50:23
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20566/test/JavaAssembly/prototype/wamas Log Message: Directory /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype/wamas added to the repository |
|
From: Robert L. <rle...@us...> - 2007-02-15 07:36:12
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/cpp In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15473/src/ccmtools/parser/cpp Modified Files: JPP.java Log Message: using of deprecated API changed Index: JPP.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/cpp/JPP.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JPP.java 18 Jan 2007 17:11:45 -0000 1.1 --- JPP.java 15 Feb 2007 07:35:51 -0000 1.2 *************** *** 21,30 **** package ccmtools.parser.cpp; ! import java.io.*; import java.util.Enumeration; - import java.util.StringTokenizer; import java.util.Hashtable; - import java.util.Vector; import java.util.Stack; /** --- 21,37 ---- package ccmtools.parser.cpp; ! import java.io.BufferedReader; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FilterInputStream; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.InputStreamReader; ! import java.io.OutputStream; import java.util.Enumeration; import java.util.Hashtable; import java.util.Stack; + import java.util.StringTokenizer; + import java.util.Vector; /** *************** *** 94,98 **** Stack nbStack = null; ! DataInputStream fCur = null; String nameCur = null; int nbCur = -1; --- 101,105 ---- Stack nbStack = null; ! BufferedReader fCur = null; String nameCur = null; int nbCur = -1; *************** *** 100,104 **** JPPExpandedStream (String fileName, Vector includeDirs) throws java.io.IOException { ! fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fileName))); iDirs = includeDirs; fStack = new Stack(); --- 107,112 ---- JPPExpandedStream (String fileName, Vector includeDirs) throws java.io.IOException { ! //fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fileName))); ! fCur=new BufferedReader(new InputStreamReader(new FileInputStream(fileName))); iDirs = includeDirs; fStack = new Stack(); *************** *** 119,123 **** line = "# "+nbCur+" "+"\""+nameCur+"\""+" 2"; nameCur = (String) nameStack.pop(); ! fCur = (DataInputStream) fStack.pop(); } } else { --- 127,131 ---- line = "# "+nbCur+" "+"\""+nameCur+"\""+" 2"; nameCur = (String) nameStack.pop(); ! fCur = (BufferedReader) fStack.pop(); } } else { *************** *** 138,142 **** nbStack.push(new Integer(nbCur)); ! fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fiName))); nameCur = new String(fiName); line = "# "+nbCur+" "+"\""+fiName+"\""+" 1"; --- 146,151 ---- nbStack.push(new Integer(nbCur)); ! //fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fiName))); ! fCur=new BufferedReader(new InputStreamReader(new FileInputStream(fiName))); nameCur = new String(fiName); line = "# "+nbCur+" "+"\""+fiName+"\""+" 1"; |
|
From: Robert L. <rle...@us...> - 2007-02-15 07:24:11
|
Update of /cvsroot/ccmtools/ccmtools/test/AssemblyParser In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11337/test/AssemblyParser Modified Files: test1.idl parser.sh Added Files: build-parser.sh Makefile Log Message: checks the pretty printer Index: parser.sh =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/AssemblyParser/parser.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** parser.sh 12 Feb 2007 14:08:31 -0000 1.1 --- parser.sh 15 Feb 2007 07:24:07 -0000 1.2 *************** *** 1,5 **** #! /bin/sh ! libdir=$PWD/../../lib export CLASSPATH=$libdir/java-cup-11a.jar:$libdir/assembly.jar ! java ccmtools.parser.assembly.Main $* --- 1,9 ---- #! /bin/sh ! thisdir=$(pwd) ! root="$thisdir/../.." ! libdir="$root/lib" ! export CLASSPATH=$libdir/java-cup-11a.jar:$libdir/assembly.jar ! java ccmtools.parser.assembly.Main "$@" || exit 1 ! --- NEW FILE: Makefile --- all: test1 parser: ./build-parser.sh test1: parser ./parser.sh test1.assembly > test1.1 ./parser.sh test1.1 > test1.2 diff test1.1 test1.2 rm test1.1 test1.2 Index: test1.idl =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/AssemblyParser/test1.idl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test1.idl 12 Feb 2007 14:08:31 -0000 1.1 --- test1.idl 15 Feb 2007 07:24:07 -0000 1.2 *************** *** 2,41 **** ! 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; ! }; --- 2,41 ---- ! 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 Test::I1 i1; ! uses Test::I3 i3; ! }; --- NEW FILE: build-parser.sh --- #! /bin/sh thisdir=$(pwd) root="$thisdir/../.." libdir="$root/lib" cd $root ant jar.AssemblyMain || exit 1 export CLASSPATH=$libdir/java-cup-11a.jar:$libdir/assembly.jar cd $thisdir |
|
From: Robert L. <rle...@us...> - 2007-02-14 13:17:32
|
Update of /cvsroot/ccmtools/ccmtools/doc/manual/HelloWorldExample In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2498/doc/manual/HelloWorldExample Modified Files: .cvsignore Log Message: # Index: .cvsignore =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/HelloWorldExample/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 18 Jan 2007 09:31:55 -0000 1.1 --- .cvsignore 14 Feb 2007 13:17:29 -0000 1.2 *************** *** 1 **** --- 1,2 ---- HelloWorldExample.dvi + HelloWorldExample.aux |
|
From: Robert L. <rle...@us...> - 2007-02-14 13:16:02
|
Update of /cvsroot/ccmtools/ccmtools/doc/manual/HelloWorldExample In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1658/doc/manual/HelloWorldExample Removed Files: HelloWorldExample.aux Log Message: # --- HelloWorldExample.aux DELETED --- |
|
From: Teiniker E. <tei...@us...> - 2007-02-14 12:32:34
|
Update of /cvsroot/ccmtools/ccmtools/doc/manual In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17218/doc/manual Modified Files: CcmtoolsManual.pdf Added Files: Makefile Log Message: Added Makefile to build the manual. Index: CcmtoolsManual.pdf =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/CcmtoolsManual.pdf,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 Binary files /tmp/cvsRrFPb9 and /tmp/cvsITFqBR differ --- NEW FILE: Makefile --- all: pdf_with_bibtex pdf: pdflatex CcmtoolsManual pdf_with_bibtex: pdflatex CcmtoolsManual bibtex CcmtoolsManual pdflatex CcmtoolsManual pdflatex CcmtoolsManual clean: rm -rf *.aux *.bbl *.blg *.log *.out *.toc |
|
From: Robert L. <rle...@us...> - 2007-02-14 12:29:52
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15897 Modified Files: build.xml Log Message: ccm assembly metamodel + Java generator Index: build.xml =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/build.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** build.xml 12 Feb 2007 14:08:31 -0000 1.75 --- build.xml 14 Feb 2007 12:29:49 -0000 1.76 *************** *** 38,41 **** --- 38,42 ---- <mkdir dir="${build}" /> <mkdir dir="${build}/classes" /> + <delete file="${lib}/assembly.jar" /> </target> |
|
From: Robert L. <rle...@us...> - 2007-02-14 12:27:18
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14714/src/ccmtools/generator/java Modified Files: Main.java JavaComponentGenerator.java CommandLineParameters.java Log Message: ccm assembly metamodel + Java generator Index: JavaComponentGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/JavaComponentGenerator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JavaComponentGenerator.java 15 Jan 2007 16:42:24 -0000 1.1 --- JavaComponentGenerator.java 14 Feb 2007 12:27:04 -0000 1.2 *************** *** 4,8 **** import java.util.List; import java.util.logging.Logger; - import ccmtools.CcmtoolsException; import ccmtools.Constants; --- 4,7 ---- *************** *** 13,16 **** --- 12,16 ---- import ccmtools.generator.java.metamodel.JavaLocalInterfaceGeneratorElement; import ccmtools.generator.java.metamodel.ModelRepository; + import ccmtools.parser.assembly.metamodel.Model; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.SourceFileHelper; *************** *** 24,27 **** --- 24,28 ---- public static final String CLIENT_LIB_GENERATOR_ID = "clientlib"; public static final String CORBA_COMPONENT_GENERATOR_ID = "remote"; + public static final String ASSEMBLY_GENERATOR_ID = "assembly"; /** UI driver for generator messages */ *************** *** 54,58 **** ! public void generate(ModelRepository javaModel) throws CcmtoolsException { logger.fine("enter"); --- 55,59 ---- ! public void generate(ModelRepository javaModel, Model assemblies) throws CcmtoolsException { logger.fine("enter"); *************** *** 79,82 **** --- 80,87 ---- generateApplication(javaModel); } + else if (generatorId.equals(ASSEMBLY_GENERATOR_ID)) + { + generateAssembly(javaModel, assemblies); + } } logger.fine("leave"); *************** *** 168,172 **** logger.fine("leave"); } ! public void generateClientLibComponent(ModelRepository javaModelRepo) --- 173,202 ---- logger.fine("leave"); } ! ! public void generateAssembly(ModelRepository javaModelRepo, Model assemblies) ! throws CcmtoolsException ! { ! logger.fine("enter"); ! try ! { ! List<JavaApplicationGeneratorElement> generatorElements = ! new ArrayList<JavaApplicationGeneratorElement>(); ! generatorElements.addAll(javaModelRepo.findAllProvides()); ! generatorElements.addAll(javaModelRepo.findAllComponents()); ! generatorElements.addAll(javaModelRepo.findAllHomes()); ! ! // Save all source file objects ! for(JavaApplicationGeneratorElement element : generatorElements) ! { ! SourceFileHelper.writeApplicationFiles(uiDriver, parameters.getOutDir(), ! element.generateAssemblySourceFiles(assemblies)); ! } ! } ! catch (Exception e) ! { ! throw new CcmtoolsException("[Java Assembly Generator] " + e.getMessage()); ! } ! logger.fine("leave"); ! } public void generateClientLibComponent(ModelRepository javaModelRepo) Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/Main.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Main.java 19 Jan 2007 12:07:30 -0000 1.9 --- Main.java 14 Feb 2007 12:27:04 -0000 1.10 *************** *** 4,8 **** import java.util.Iterator; import java.util.logging.Logger; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; --- 4,7 ---- *************** *** 12,20 **** import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; - import ccmtools.CcmtoolsException; import ccmtools.CodeGenerator.CcmGraphTraverser; import ccmtools.CodeGenerator.GraphTraverser; import ccmtools.generator.java.metamodel.ModelRepository; import ccmtools.parser.idl.ParserManager; import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; --- 11,19 ---- import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import ccmtools.CcmtoolsException; import ccmtools.CodeGenerator.CcmGraphTraverser; import ccmtools.CodeGenerator.GraphTraverser; import ccmtools.generator.java.metamodel.ModelRepository; + import ccmtools.parser.assembly.metamodel.Model; import ccmtools.parser.idl.ParserManager; import ccmtools.parser.idl.metamodel.BaseIDL.MContainer; *************** *** 60,63 **** --- 59,64 ---- setCcmtoolsProperties(); JavaComponentGenerator generator = new JavaComponentGenerator(parameters, uiDriver); + + Model assemblies = ccmtools.parser.assembly.Main.parse(parameters.getAssemblyFiles()); for (Iterator i = parameters.getIdlFiles().iterator(); i.hasNext();) *************** *** 78,82 **** // Run the Java component generator which can handle all of // the different generator flags (-iface, -local, -app, -clientlib, etc.) ! generator.generate(javaModel); } } --- 79,83 ---- // Run the Java component generator which can handle all of // the different generator flags (-iface, -local, -app, -clientlib, etc.) ! generator.generate(javaModel, assemblies); } } *************** *** 137,140 **** --- 138,143 ---- options.addOption(JavaComponentGenerator.CORBA_COMPONENT_GENERATOR_ID, false, "Run the Java CORBA component generator"); + options.addOption(JavaComponentGenerator.ASSEMBLY_GENERATOR_ID, + false, "Run the Java assembly generator"); options.addOption("noexit", false, "Don't exit Java VM with error status"); *************** *** 193,198 **** --- 196,208 ---- if (cmd.hasOption(JavaComponentGenerator.APPLICATION_GENERATOR_ID)) { + if (cmd.hasOption(JavaComponentGenerator.ASSEMBLY_GENERATOR_ID)) + throw new ParseException("cannot use impl. skeletons"+ + " and assemblies together"); parameters.getGeneratorIds().add(JavaComponentGenerator.APPLICATION_GENERATOR_ID); } + else if (cmd.hasOption(JavaComponentGenerator.ASSEMBLY_GENERATOR_ID)) + { + parameters.getGeneratorIds().add(JavaComponentGenerator.ASSEMBLY_GENERATOR_ID); + } if (cmd.hasOption(JavaComponentGenerator.INTERFACE_GENERATOR_ID)) *************** *** 241,245 **** for(int i = 0; i < arguments.length; i++) { ! parameters.getIdlFiles().add(arguments[i]); } --- 251,261 ---- for(int i = 0; i < arguments.length; i++) { ! String x = arguments[i].toLowerCase(); ! if(x.endsWith(".idl")) ! parameters.getIdlFiles().add(arguments[i]); ! else if(x.endsWith(".assembly")) ! parameters.getAssemblyFiles().add(arguments[i]); ! else ! throw new ParseException("unknown file type: "+arguments[i]); } Index: CommandLineParameters.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/CommandLineParameters.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CommandLineParameters.java 10 Aug 2006 20:21:59 -0000 1.1 --- CommandLineParameters.java 14 Feb 2007 12:27:04 -0000 1.2 *************** *** 24,27 **** --- 24,30 ---- private List<String> idlFiles = new ArrayList<String>(); + /** List of assembly input files */ + private List<String> assemblyFiles = new ArrayList<String>(); + // Parameter getter and setter methods ------------------------------------ *************** *** 60,63 **** --- 63,72 ---- } + + public List<String> getAssemblyFiles() + { + return assemblyFiles; + } + public List<String> getGeneratorIds() *************** *** 74,77 **** --- 83,87 ---- checkOutputPath(); checkIdlFiles(); + checkAssemblyFiles(); } *************** *** 93,108 **** /** * Check if the given IDL file exists. * @throws CcmtoolsException */ ! private void checkIdlFiles() ! throws CcmtoolsException { ! for(String idlFile : getIdlFiles()) ! { ! if(!isExistingFile(idlFile, getIncludePaths())) ! { ! throw new CcmtoolsException("Invalid IDL input file " + idlFile); ! } ! } } --- 103,132 ---- /** * Check if the given IDL file exists. + * * @throws CcmtoolsException */ ! private void checkIdlFiles() throws CcmtoolsException { ! for (String idlFile : getIdlFiles()) ! { ! if (!isExistingFile(idlFile, getIncludePaths())) ! { ! throw new CcmtoolsException("Invalid IDL input file " + idlFile); ! } ! } ! } ! ! /** ! * Check if the given assembly file exists. ! * ! * @throws CcmtoolsException ! */ ! private void checkAssemblyFiles() throws CcmtoolsException ! { ! for (String f : getAssemblyFiles()) ! { ! if (f == null || !(new File(f)).exists()) ! throw new CcmtoolsException("Invalid assembly input file " + f); ! } } *************** *** 161,164 **** --- 185,193 ---- buffer.append("IDL input files: ").append(idlFile).append("\n"); } + + for(String f : getAssemblyFiles()) + { + buffer.append("assembly input files: ").append(f).append("\n"); + } return buffer.toString(); |
|
From: Robert L. <rle...@us...> - 2007-02-14 12:27:12
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14714/src/ccmtools Modified Files: CcmtoolsException.java Constants.java Log Message: ccm assembly metamodel + Java generator Index: CcmtoolsException.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CcmtoolsException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CcmtoolsException.java 20 Aug 2005 19:40:12 -0000 1.1 --- CcmtoolsException.java 14 Feb 2007 12:27:05 -0000 1.2 *************** *** 27,29 **** --- 27,34 ---- super(message); } + + public CcmtoolsException(String message, Throwable cause) + { + super(message, cause); + } } \ No newline at end of file Index: Constants.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/Constants.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Constants.java 13 Feb 2007 10:16:12 -0000 1.23 --- Constants.java 14 Feb 2007 12:27:05 -0000 1.24 *************** *** 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.10"; public static final String CPP_PATH = "cpp"; |
|
From: Robert L. <rle...@us...> - 2007-02-14 12:27:12
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14714/src/ccmtools/parser/assembly/metamodel Modified Files: Module.java Assembly.java ModelElement.java Model.java Log Message: ccm assembly metamodel + Java generator Index: ModelElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/ModelElement.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ModelElement.java 12 Feb 2007 16:01:13 -0000 1.3 --- ModelElement.java 14 Feb 2007 12:27:05 -0000 1.4 *************** *** 11,14 **** --- 11,15 ---- import java.io.PrintStream; + import java.util.Map; /** *************** *** 17,20 **** --- 18,23 ---- public abstract class ModelElement { + public static final String IDL_SCOPE = "::"; + protected String name_; *************** *** 22,31 **** { name_ = name; } public abstract void prettyPrint( PrintStream out, String offset ); ! protected Module parent_; ! /** * returns the parent Module of this element (or null) --- 25,36 ---- { name_ = name; + if (name.indexOf(IDL_SCOPE) >= 0) + throw new RuntimeException("scoped name!"); } public abstract void prettyPrint( PrintStream out, String offset ); ! protected Module parent_; ! /** * returns the parent Module of this element (or null) *************** *** 36,44 **** } /** * call this method after model creation * * @param parent namespace or null */ ! abstract void postProcessing( Module parent ); } --- 41,62 ---- } + public String getGlobalName() + { + if (parent_ != null) + { + return parent_.getGlobalName() + IDL_SCOPE + name_; + } + else + { + return IDL_SCOPE + name_; + } + } + /** * call this method after model creation * * @param parent namespace or null + * @param assemblies add all assemblies to that map */ ! abstract void postProcessing( Module parent, Map<String, Assembly> assemblies ); } Index: Model.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Model.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Model.java 12 Feb 2007 16:01:17 -0000 1.4 --- Model.java 14 Feb 2007 12:27:05 -0000 1.5 *************** *** 11,14 **** --- 11,15 ---- import java.io.PrintStream; + import java.util.HashMap; import java.util.Vector; *************** *** 28,31 **** --- 29,34 ---- } + private HashMap<String, Assembly> assemblies_; + /** * call this method after model creation *************** *** 33,39 **** public void postProcessing() { ! for (int i = 0; i < elements_.size(); ++i) { ! elements_.get(i).postProcessing(null); } } --- 36,43 ---- public void postProcessing() { ! assemblies_ = new HashMap<String, Assembly>(); ! for (ModelElement e : elements_) { ! e.postProcessing(null, assemblies_); } } *************** *** 46,53 **** public void prettyPrint( PrintStream out ) { ! for (int i = 0; i < elements_.size(); ++i) { ! elements_.get(i).prettyPrint(out, ""); } } } --- 50,77 ---- public void prettyPrint( PrintStream out ) { ! for (ModelElement e : elements_) { ! e.prettyPrint(out, ""); } } + + /** + * adds all elements of the give model to this model + */ + public void merge( Model m ) + { + elements_.addAll(m.elements_); + if (assemblies_ == null) + assemblies_ = new HashMap<String, Assembly>(m.assemblies_); + else + for (String key : m.assemblies_.keySet()) + { + if (assemblies_.containsKey(key)) + { + throw new RuntimeException("an assembly of type \"" + key + "\" already exists"); + } + Assembly a = m.assemblies_.get(key); + assemblies_.put(key, a); + } + } } Index: Module.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Module.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Module.java 12 Feb 2007 16:01:12 -0000 1.4 --- Module.java 14 Feb 2007 12:27:05 -0000 1.5 *************** *** 11,14 **** --- 11,15 ---- import java.io.PrintStream; + import java.util.Map; import java.util.Vector; *************** *** 26,35 **** } ! void postProcessing( Module parent ) { parent_ = parent; for (int i = 0; i < children_.size(); ++i) { ! children_.get(i).postProcessing(this); } } --- 27,36 ---- } ! void postProcessing( Module parent, Map<String, Assembly> assemblies ) { parent_ = parent; for (int i = 0; i < children_.size(); ++i) { ! children_.get(i).postProcessing(this, assemblies); } } Index: Assembly.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Assembly.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Assembly.java 12 Feb 2007 16:01:12 -0000 1.4 --- Assembly.java 14 Feb 2007 12:27:05 -0000 1.5 *************** *** 12,15 **** --- 12,16 ---- import java.io.PrintStream; import java.util.HashMap; + import java.util.Map; import java.util.Vector; *************** *** 19,30 **** 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; } --- 20,31 ---- public class Assembly extends ModelElement { ! private String opt_name_; private Vector<AssemblyElement> elements_; ! public Assembly( String name, String opt_name, Vector<AssemblyElement> elements ) { super(name); ! opt_name_ = opt_name; elements_ = elements; } *************** *** 32,39 **** 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) --- 33,45 ---- private HashMap<String, Component> components_; ! void postProcessing( Module parent, Map<String, Assembly> assemblies ) { parent_ = parent; ! String key = getGlobalName(); ! if (assemblies.containsKey(key)) ! { ! throw new RuntimeException("an assembly of type \"" + key + "\" already exists"); ! } ! assemblies.put(key, this); components_ = new HashMap<String, Component>(); for (int i = 0; i < elements_.size(); ++i) *************** *** 45,49 **** public void prettyPrint( PrintStream out, String offset ) { ! out.println(offset + "assembly " + name_ + " implements " + idl_name_ + " {"); for (int i = 0; i < elements_.size(); ++i) { --- 51,58 ---- public void prettyPrint( PrintStream out, String offset ) { ! out.print(offset + "assembly "); ! if (opt_name_ != null) ! out.print(opt_name_ + " "); ! out.println("implements " + name_ + " {"); for (int i = 0; i < elements_.size(); ++i) { |
|
From: Robert L. <rle...@us...> - 2007-02-14 12:27:12
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14714/src/ccmtools/generator/java/metamodel Modified Files: JavaApplicationGeneratorElement.java HomeDef.java ComponentDef.java ProvidesDef.java Log Message: ccm assembly metamodel + Java generator Index: ComponentDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ComponentDef.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ComponentDef.java 16 Jan 2007 09:25:22 -0000 1.16 --- ComponentDef.java 14 Feb 2007 12:27:05 -0000 1.17 *************** *** 15,18 **** --- 15,19 ---- import ccmtools.generator.java.templates.ComponentDefContextInterfaceTemplate; import ccmtools.generator.java.templates.ComponentDefInterfaceTemplate; + import ccmtools.parser.assembly.metamodel.Model; import ccmtools.utils.SourceFile; import ccmtools.utils.Text; *************** *** 234,237 **** --- 235,245 ---- return sourceFileList; } + + public List<SourceFile> generateAssemblySourceFiles(Model assemblies) + { + List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); + // TODO + return sourceFileList; + } Index: JavaApplicationGeneratorElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/JavaApplicationGeneratorElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JavaApplicationGeneratorElement.java 15 Jan 2007 16:42:22 -0000 1.1 --- JavaApplicationGeneratorElement.java 14 Feb 2007 12:27:05 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- import java.util.List; + import ccmtools.parser.assembly.metamodel.Model; import ccmtools.utils.SourceFile; *************** *** 8,10 **** --- 9,12 ---- { List<SourceFile> generateApplicationSourceFiles(); + List<SourceFile> generateAssemblySourceFiles(Model assemblies); } \ No newline at end of file Index: HomeDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/HomeDef.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** HomeDef.java 16 Jan 2007 09:25:22 -0000 1.11 --- HomeDef.java 14 Feb 2007 12:27:05 -0000 1.12 *************** *** 21,24 **** --- 21,25 ---- import ccmtools.generator.java.templates.HomeDefImplicitInterfaceTemplate; import ccmtools.generator.java.templates.HomeDefInterfaceTemplate; + import ccmtools.parser.assembly.metamodel.Model; import ccmtools.utils.SourceFile; import ccmtools.utils.Text; *************** *** 210,213 **** --- 211,220 ---- return sourceFileList; } + + public List<SourceFile> generateAssemblySourceFiles(Model assemblies) + { + // no special home implementation for assemblies + return generateApplicationSourceFiles(); + } Index: ProvidesDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ProvidesDef.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ProvidesDef.java 16 Jan 2007 09:25:22 -0000 1.16 --- ProvidesDef.java 14 Feb 2007 12:27:05 -0000 1.17 *************** *** 14,17 **** --- 14,18 ---- import ccmtools.generator.java.templates.ProvidesDefNavigationMethodAdapterLocalTemplate; import ccmtools.generator.java.templates.ProvidesDefNavigationMethodAdapterToCorbaTemplate; + import ccmtools.parser.assembly.metamodel.Model; import ccmtools.utils.SourceFile; import ccmtools.utils.Text; *************** *** 143,147 **** return sourceFileList; } ! --- 144,155 ---- return sourceFileList; } ! ! public List<SourceFile> generateAssemblySourceFiles(Model assemblies) ! { ! List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); ! // TODO ! return sourceFileList; ! } ! |
1 message has been excluded from this view by a project administrator.
