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: Teiniker E. <tei...@us...> - 2007-07-09 09:51:03
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ant In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13681/src/ccmtools/ant Modified Files: IdljTask.java CcmtoolsTask.java Log Message: Bugfix: added isWindows() method to handle path calculations. Index: IdljTask.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/IdljTask.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IdljTask.java 16 May 2007 07:59:00 -0000 1.4 --- IdljTask.java 9 Jul 2007 09:50:52 -0000 1.5 *************** *** 35,38 **** --- 35,40 ---- import org.apache.tools.ant.types.FileSet; + import ccmtools.utils.ConfigurationLocator; + /** *************** *** 266,275 **** cmdline.createArgument().setValue("-" + binding); ! cmdline.createArgument().setLine("-td \"" + destDir.getAbsolutePath() + "\""); for(String s : includePaths) { ! cmdline.createArgument().setLine("-i \"" + s + "\""); } ! cmdline.createArgument().setValue("\"" + idlFile.getAbsolutePath() + "\""); log("command line = " + cmdline, Project.MSG_VERBOSE); --- 268,289 ---- cmdline.createArgument().setValue("-" + binding); ! ! if(ConfigurationLocator.getInstance().isWindows()) ! cmdline.createArgument().setLine("-td \"" + destDir.getAbsolutePath() + "\""); ! else ! cmdline.createArgument().setLine("-td " + destDir.getAbsolutePath()); ! for(String s : includePaths) { ! if(ConfigurationLocator.getInstance().isWindows()) ! cmdline.createArgument().setLine("-i \"" + s + "\""); ! else ! cmdline.createArgument().setLine("-i " + s); } ! ! if(ConfigurationLocator.getInstance().isWindows()) ! cmdline.createArgument().setValue("\"" + idlFile.getAbsolutePath() + "\""); ! else ! cmdline.createArgument().setValue(idlFile.getAbsolutePath()); log("command line = " + cmdline, Project.MSG_VERBOSE); Index: CcmtoolsTask.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/CcmtoolsTask.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CcmtoolsTask.java 6 Jul 2007 09:01:19 -0000 1.5 --- CcmtoolsTask.java 9 Jul 2007 09:50:52 -0000 1.6 *************** *** 31,34 **** --- 31,36 ---- import org.apache.tools.ant.types.FileSet; + import ccmtools.utils.ConfigurationLocator; + /** * This <ccmtools> ant task is used to execute different ccmtools generators *************** *** 185,191 **** static void appendIncludePath( StringBuilder cmd, String s ) { ! // TODO: replace this ugly check for Windows ! if (java.io.File.separatorChar == '\\') ! cmd.append(" -I\"").append(s).append("\""); else cmd.append(" -I").append(s); --- 187,192 ---- static void appendIncludePath( StringBuilder cmd, String s ) { ! if(ConfigurationLocator.getInstance().isWindows()) ! cmd.append(" -I\"").append(s).append("\""); else cmd.append(" -I").append(s); |
|
From: Teiniker E. <tei...@us...> - 2007-07-09 09:51:03
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13681 Modified Files: RELEASE-HOWTO Log Message: Bugfix: added isWindows() method to handle path calculations. Index: RELEASE-HOWTO =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/RELEASE-HOWTO,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RELEASE-HOWTO 12 Nov 2004 15:08:26 -0000 1.7 --- RELEASE-HOWTO 9 Jul 2007 09:50:51 -0000 1.8 *************** *** 56,60 **** ccmtools $ cvs ci ! Where C = B + 1. X should be the bugfix number, which starts at 0 for the first release of the branch and proceeds up by one for each subsequent release on the same branch. The unstable release will be made after merging in from --- 56,60 ---- ccmtools $ cvs ci ! Where C = B + 1. X should be the bugfiCcmtoolsManual.pdfx number, which starts at 0 for the first release of the branch and proceeds up by one for each subsequent release on the same branch. The unstable release will be made after merging in from *************** *** 74,78 **** I use the "cvs2cl" script to do this, and then edit the resulting ChangeLog : ! A.B $ cvs2cl -U AUTHORS --accum -f ChangeLog A.B $ emacsclient ChangeLog --- 74,78 ---- I use the "cvs2cl" script to do this, and then edit the resulting ChangeLog : ! ccmtools.sf.net A.B $ cvs2cl -U AUTHORS --accum -f ChangeLog A.B $ emacsclient ChangeLog *************** *** 128,132 **** A.B $ scp ccmtools-A.B.X*.tar.gz \ ! ccmtools.sf.net:/home/groups/c/cc/ccmtools/htdocs/releases/A.B/ A.B $ scp RELEASE \ ccmtools.sf.net:/home/groups/c/cc/ccmtools/htdocs/releases/A.B/RELEASE-A.B.X --- 128,132 ---- A.B $ scp ccmtools-A.B.X*.tar.gz \ ! ccmtools.sf.net:releases/A.B/ A.B $ scp RELEASE \ ccmtools.sf.net:/home/groups/c/cc/ccmtools/htdocs/releases/A.B/RELEASE-A.B.X |
|
From: Teiniker E. <tei...@us...> - 2007-07-09 09:51:03
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/utils In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13681/src/ccmtools/utils Modified Files: ConfigurationLocator.java Log Message: Bugfix: added isWindows() method to handle path calculations. Index: ConfigurationLocator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/utils/ConfigurationLocator.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ConfigurationLocator.java 10 Jan 2007 16:19:24 -0000 1.6 --- ConfigurationLocator.java 9 Jul 2007 09:50:52 -0000 1.7 *************** *** 179,181 **** --- 179,196 ---- } + + + /* + * System Properties + */ + + /** + * This method is used to determine if the tools are running on a Windows box. + * Usually, this information is important for calculating file paths and things + * like this. + */ + public boolean isWindows() + { + return System.getProperty("os.name").startsWith("Windows"); + } } |
|
From: Robert L. <rle...@us...> - 2007-07-06 09:04:57
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_simple In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32435/test/JavaRemoteComponents/facet_simple Modified Files: Makefile Log Message: small fix so we can call the Makefile more than one time Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_simple/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 10 Jan 2007 16:19:17 -0000 1.12 --- Makefile 6 Jul 2007 09:04:50 -0000 1.13 *************** *** 14,17 **** --- 14,18 ---- # Generate component metadata in a component descriptor file. metainf: idl3 + rm -rf ${DEST_DIR}/META-INF mkdir ${DEST_DIR}/META-INF ccmdescriptor -o ${DEST_DIR}/META-INF -name TestHome ${INCLUDE} ${IDL3_DIR}/component/world/TestHome.idl |
|
From: Robert L. <rle...@us...> - 2007-07-06 09:01:25
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ant In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31291/src/ccmtools/ant Modified Files: CcmtoolsTask.java Log Message: ugly check for Windows Index: CcmtoolsTask.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/CcmtoolsTask.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CcmtoolsTask.java 16 May 2007 07:59:00 -0000 1.4 --- CcmtoolsTask.java 6 Jul 2007 09:01:19 -0000 1.5 *************** *** 160,164 **** for(String s : includePaths) { ! cmd.append(" -I\"").append(s).append("\""); } --- 160,164 ---- for(String s : includePaths) { ! appendIncludePath(cmd, s); } *************** *** 179,182 **** --- 179,195 ---- } + + /** + * adds an include path to an external command + */ + static void appendIncludePath( StringBuilder cmd, String s ) + { + // TODO: replace this ugly check for Windows + if (java.io.File.separatorChar == '\\') + cmd.append(" -I\"").append(s).append("\""); + else + cmd.append(" -I").append(s); + } + /** *************** *** 208,212 **** for(String s : includePaths) { ! cmd.append(" -I\"").append(s).append("\""); } --- 221,225 ---- for(String s : includePaths) { ! appendIncludePath(cmd, s); } *************** *** 270,274 **** for(String s : includePaths) { ! cmd.append(" -I\"").append(s).append("\""); } --- 283,287 ---- for(String s : includePaths) { ! appendIncludePath(cmd, s); } |
|
From: Robert L. <rle...@us...> - 2007-06-15 10:05:08
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19040/test/JavaAssembly/prototype Added Files: .cvsignore Log Message: # --- NEW FILE: .cvsignore --- wamas |
|
From: Robert L. <rle...@us...> - 2007-06-15 10:01:25
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17757/src/ccmtools/generator/java/metamodel Modified Files: ModelElement.java Log Message: bug fix: element without namespace Index: ModelElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ModelElement.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ModelElement.java 16 Jan 2007 09:25:22 -0000 1.14 --- ModelElement.java 15 Jun 2007 10:01:20 -0000 1.15 *************** *** 107,118 **** * import world.europe.Color; // is needed */ ! public boolean isNeededJavaImportStatement(String namespace, String statement) ! { ! String packages = statement.substring(0, statement.lastIndexOf(".")); ! if(packages.equals(namespace)) ! return false; ! else ! return true; ! } public String generateJavaImportStatements(Set<String> importStatements) --- 107,119 ---- * import world.europe.Color; // is needed */ ! public boolean isNeededJavaImportStatement( String namespace, String statement ) ! { ! int index = statement.lastIndexOf("."); ! String packages = index < 1 ? "" : statement.substring(0, index); ! if (packages.equals(namespace)) ! return false; ! else ! return true; ! } public String generateJavaImportStatements(Set<String> importStatements) |
|
From: Robert L. <rle...@us...> - 2007-06-15 09:55:46
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15647/src/ccmtools/generator/java Modified Files: JavaComponentGenerator.java Log Message: print exception stack trace Index: JavaComponentGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/JavaComponentGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JavaComponentGenerator.java 15 Feb 2007 13:18:37 -0000 1.3 --- JavaComponentGenerator.java 15 Jun 2007 09:55:41 -0000 1.4 *************** *** 142,145 **** --- 142,146 ---- catch (Exception e) { + e.printStackTrace(); throw new CcmtoolsException("[Java Local Component Generator] " + e.getMessage()); } *************** *** 169,172 **** --- 170,174 ---- catch (Exception e) { + e.printStackTrace(); throw new CcmtoolsException("[Java Application Skeleton Generator] " + e.getMessage()); } *************** *** 195,198 **** --- 197,201 ---- catch (Exception e) { + e.printStackTrace(); throw new CcmtoolsException("[Java Assembly Generator] " + e.getMessage()); } *************** *** 221,224 **** --- 224,228 ---- catch (Exception e) { + e.printStackTrace(); throw new CcmtoolsException("[Java Client Library Generator] " + e.getMessage()); } *************** *** 254,257 **** --- 258,262 ---- catch (Exception e) { + e.printStackTrace(); throw new CcmtoolsException("[Java CORBA Component Generator] " + e.getMessage()); } |
|
From: Robert L. <rle...@us...> - 2007-05-23 16:08:33
|
Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7080/src/templates/CppLocalTemplates Modified Files: Tag: RELEASE-0_8-BRANCH MComponentDef MHomeDef Log Message: hack for Itanium (from version 0.6.16) Index: MHomeDef =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MHomeDef,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -C2 -d -r1.24 -r1.24.2.1 *** MHomeDef 17 Jan 2007 17:47:09 -0000 1.24 --- MHomeDef 23 May 2007 16:08:27 -0000 1.24.2.1 *************** *** 24,27 **** --- 24,31 ---- #include "%(ComponentType)s_gen.h" + // BEGIN-HACK: Itanium + #include <%(HomeInclude)s_impl.h> + // END-HACK: Itanium + %(OpenNamespace)s *************** *** 89,93 **** protected: ! %(LocalNamespace)sCCM_%(Identifier)s* local_home; ::Components::AssemblyFactory::SmartPtr assembly_factory; --- 93,100 ---- protected: ! // BEGIN-HACK: Itanium ! %(LocalNamespace)s%(Identifier)s_impl* local_home; ! // END-HACK: Itanium ! ::Components::AssemblyFactory::SmartPtr assembly_factory; *************** *** 145,150 **** %(Identifier)s::%(Identifier)s() { ! local_home = dynamic_cast< %(LocalNamespace)sCCM_%(Identifier)s*>( create_%(AbsoluteLocalHomeName)s()); assembly_factory = ::Components::AssemblyFactory::SmartPtr(); } --- 152,159 ---- %(Identifier)s::%(Identifier)s() { ! // BEGIN-HACK: Itanium ! local_home = dynamic_cast< %(LocalNamespace)s%(Identifier)s_impl*>( create_%(AbsoluteLocalHomeName)s()); + // END-HACK: Itanium assembly_factory = ::Components::AssemblyFactory::SmartPtr(); } *************** *** 153,158 **** : assembly_factory(f) { ! local_home = dynamic_cast< %(LocalNamespace)sCCM_%(Identifier)s*>( create_%(AbsoluteLocalHomeName)s()); } --- 162,169 ---- : assembly_factory(f) { ! // BEGIN-HACK: Itanium ! local_home = dynamic_cast< %(LocalNamespace)s%(Identifier)s_impl*>( create_%(AbsoluteLocalHomeName)s()); + // END-HACK: Itanium } Index: MComponentDef =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MComponentDef,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -C2 -d -r1.23 -r1.23.2.1 *** MComponentDef 5 Jan 2007 14:17:24 -0000 1.23 --- MComponentDef 23 May 2007 16:08:27 -0000 1.23.2.1 *************** *** 30,33 **** --- 30,37 ---- %(BaseInclude)s + // BEGIN-HACK: Itanium + #include <%(ComponentInclude)s_impl.h> + // END-HACK: Itanium + %(OpenNamespace)s *************** *** 91,95 **** protected: %(HomeType)s* home_local_adapter; ! %(LocalNamespace)sCCM_%(Identifier)s* local_component; %(LocalNamespace)sCCM_%(Identifier)s_Context* context; ::Components::Assembly::SmartPtr assembly; --- 95,102 ---- protected: %(HomeType)s* home_local_adapter; ! // BEGIN-HACK: Itanium ! %(LocalNamespace)s%(Identifier)s_impl* local_component; ! // END-HACK: Itanium ! %(LocalNamespace)sCCM_%(Identifier)s_Context* context; ::Components::Assembly::SmartPtr assembly; *************** *** 172,176 **** %(LocalNamespace)sCCM_%(Identifier)s* lc, ::Components::Assembly::SmartPtr a) : %(MSupportsDefAdapterConstructor)s ! home_local_adapter(h), local_component(lc), assembly(a) { context = NULL; --- 179,187 ---- %(LocalNamespace)sCCM_%(Identifier)s* lc, ::Components::Assembly::SmartPtr a) : %(MSupportsDefAdapterConstructor)s ! home_local_adapter(h), ! // BEGIN-HACK: Itanium ! local_component(dynamic_cast< %(LocalNamespace)s%(Identifier)s_impl*>(lc)), ! // END-HACK: Itanium ! assembly(a) { context = NULL; |
|
From: Robert L. <rle...@us...> - 2007-05-23 16:08:33
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7080/src/ccmtools Modified Files: Tag: RELEASE-0_8-BRANCH Constants.java Log Message: hack for Itanium (from version 0.6.16) Index: Constants.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/Constants.java,v retrieving revision 1.22.2.2 retrieving revision 1.22.2.3 diff -C2 -d -r1.22.2.2 -r1.22.2.3 *** Constants.java 26 Jan 2007 09:05:14 -0000 1.22.2.2 --- Constants.java 23 May 2007 16:08:26 -0000 1.22.2.3 *************** *** 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.9"; public static final String CPP_PATH = "cpp"; |
|
From: Teiniker E. <tei...@us...> - 2007-05-22 15:51:11
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_simple In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11971/test/JavaRemoteComponents/facet_simple Added Files: Makefile.xml Log Message: Added Makefile.xml which is used by the JUnit test. --- NEW FILE: Makefile.xml --- <?xml version="1.0" encoding="ISO-8859-1"?> <project name="FacetSimplExample" basedir="." default="test"> <property environment="env"/> <property name="ccmtools.home" location="${env.CCMTOOLS_HOME}"/> <property name="dest.dir" location="xxx"/> <property name="idl3.dir" location="${dest.dir}/idl3"/> <property name="idl2.dir" location="${dest.dir}/idl2"/> <property name="src" location="${dest.dir}/src"/> <property name="src.gen" location="${dest.dir}/src-gen"/> <property name="src.client" location="src"/> <property name="src.impl" location="impl"/> <property name="build" location="${dest.dir}/build" /> <property name="bin" location="bin" /> <path id="compile.classpath"> <fileset dir="${ccmtools.home}/lib" includes="*.jar"/> </path> <path id="run.classpath"> <pathelement path="${ccmtools.home}/lib/ccm-runtime.jar" /> <pathelement path="${build}" /> </path> <taskdef name="ccmtools" classname="ccmtools.ant.CcmtoolsTask" > <classpath refid="compile.classpath" /> </taskdef> <taskdef name="idlj" classname="ccmtools.ant.IdljTask" > <classpath refid="compile.classpath" /> </taskdef> <target name="init" description="" > <mkdir dir="${build}" /> </target> <target name="clean" description="" > <delete dir="${dest.dir}" /> </target> <!-- Generate IDL3 repository directory --> <target name="idl3repo"> <ccmtools generator="idl3" destdir="${idl3.dir}" validate="true"> <fileset dir="." includes="*.idl" /> </ccmtools> </target> <!-- Generate a local Java component. --> <target name="local" depends="idl3repo"> <ccmtools generator="java.local" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> <ccmtools generator="java.impl" destdir="${src}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}/component" includes="**/*.idl" /> </ccmtools> </target> <!-- Generate a remote Java component. --> <target name="remote" depends="local"> <ccmtools generator="idl2" destdir="${idl2.dir}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> <idlj destdir="${src.gen}" binding="fall"> <include path="${ccmtools.home}/idl:${idl2.dir}" /> <fileset dir="${idl2.dir}" includes="*.idl" /> </idlj> <ccmtools generator="java.remote.adapter" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> </target> <!-- Generate Java clinetlib component. --> <target name="clientlib" depends="remote"> <ccmtools generator="java.clientlib" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> </target> <!-- Check --> <target name="check" depends="init, clientlib"> <copy todir="${src}/world" overwrite="true"> <fileset dir="${src.impl}" includes="*.java" /> </copy> <javac srcdir="${src.gen}:${src}:${src.client}" destdir="${build}" debug="on" source="1.5" target="1.5"> <classpath refid="compile.classpath" /> </javac> <java classname="Client" classpathref="run.classpath" failonerror="true" fork="true"> <assertions><enable/></assertions> </java> <java classname="Client" classpathref="run.classpath" failonerror="true" fork="true"> <assertions><enable/></assertions> <arg line="-ORBInitRef NameService=corbaloc:iiop:1.2@localhost:5050/NameService"/> <arg line="-ORBServerHost localhost"/> </java> </target> <target name="test" depends="check, clean"/> </project> |
|
From: Teiniker E. <tei...@us...> - 2007-05-22 15:49:26
|
Update of /cvsroot/ccmtools/ccmtools/test/manual/Login/c++/server/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11482/test/manual/Login/c++/server/impl Modified Files: Server_login_impl.cc _check_application_Server.cc _check_ccmtools_remote_application_Server.cc Log Message: Bugfix Index: _check_ccmtools_remote_application_Server.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/manual/Login/c++/server/impl/_check_ccmtools_remote_application_Server.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** _check_ccmtools_remote_application_Server.cc 18 Jan 2007 10:12:57 -0000 1.1 --- _check_ccmtools_remote_application_Server.cc 22 May 2007 15:49:22 -0000 1.2 *************** *** 23,26 **** --- 23,27 ---- #include <coss/CosNaming.h> + #include <application_ServerHome_entry.h> #include <ccmtools/remote/application/ServerHome_remote.h> #include <ccmtools_corba_application_Server.h> Index: Server_login_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/manual/Login/c++/server/impl/Server_login_impl.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Server_login_impl.cc 18 Jan 2007 10:12:56 -0000 1.1 --- Server_login_impl.cc 22 May 2007 15:49:22 -0000 1.2 *************** *** 37,40 **** --- 37,42 ---- throw(Components::CCMException, application::InvalidPersonData) { + cout << "Server_login_impl::isValidUser()" << endl; + if(person.name.length() == 0) throw application::InvalidPersonData(); Index: _check_application_Server.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/manual/Login/c++/server/impl/_check_application_Server.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** _check_application_Server.cc 23 Jan 2007 09:57:23 -0000 1.2 --- _check_application_Server.cc 22 May 2007 15:49:22 -0000 1.3 *************** *** 17,20 **** --- 17,21 ---- #include <Components/ccmtools.h> + #include <application_ServerHome_entry.h> #include <application/ServerHome_gen.h> |
|
From: Teiniker E. <tei...@us...> - 2007-05-22 13:57:42
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaAssembly/prototype2/xxx In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1764/test/JavaAssembly/prototype2/xxx Added Files: .cvsignore Log Message: Added some cvsignore files --- NEW FILE: .cvsignore --- build |
|
From: Teiniker E. <tei...@us...> - 2007-05-22 13:57:36
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_inheritance In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1730/test/CppGenerator/receptacle_inheritance Added Files: .cvsignore Log Message: Added some cvsignore files --- NEW FILE: .cvsignore --- xxx |
|
From: Teiniker E. <tei...@us...> - 2007-05-22 13:57:36
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_attribute In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1730/test/CppGenerator/receptacle_attribute Added Files: .cvsignore Log Message: Added some cvsignore files --- NEW FILE: .cvsignore --- xxx |
|
From: Teiniker E. <tei...@us...> - 2007-05-22 13:57:36
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_types In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1730/test/CppGenerator/receptacle_types Added Files: .cvsignore Log Message: Added some cvsignore files --- NEW FILE: .cvsignore --- xxx |
|
From: Teiniker E. <tei...@us...> - 2007-05-22 13:57:36
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_multiple In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1730/test/CppGenerator/receptacle_multiple Added Files: .cvsignore Log Message: Added some cvsignore files --- NEW FILE: .cvsignore --- xxx |
|
From: Teiniker E. <tei...@us...> - 2007-05-22 13:57:36
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_exception In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1730/test/CppGenerator/receptacle_exception Added Files: .cvsignore Log Message: Added some cvsignore files --- NEW FILE: .cvsignore --- xxx |
|
From: Teiniker E. <tei...@us...> - 2007-05-16 07:59:17
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ant In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19948/src/ccmtools/ant Modified Files: IdljTask.java CcmtoolsTask.java Log Message: Added quotes to some of the Ant tasks parameters to support spaces within paths. Index: IdljTask.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/IdljTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IdljTask.java 13 Apr 2007 10:37:08 -0000 1.3 --- IdljTask.java 16 May 2007 07:59:00 -0000 1.4 *************** *** 266,275 **** cmdline.createArgument().setValue("-" + binding); ! cmdline.createArgument().setLine("-td " + destDir.getAbsolutePath()); for(String s : includePaths) { ! cmdline.createArgument().setLine("-i " + s); } ! cmdline.createArgument().setValue(idlFile.getAbsolutePath()); log("command line = " + cmdline, Project.MSG_VERBOSE); --- 266,275 ---- cmdline.createArgument().setValue("-" + binding); ! cmdline.createArgument().setLine("-td \"" + destDir.getAbsolutePath() + "\""); for(String s : includePaths) { ! cmdline.createArgument().setLine("-i \"" + s + "\""); } ! cmdline.createArgument().setValue("\"" + idlFile.getAbsolutePath() + "\""); log("command line = " + cmdline, Project.MSG_VERBOSE); Index: CcmtoolsTask.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/CcmtoolsTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CcmtoolsTask.java 13 Apr 2007 10:37:09 -0000 1.3 --- CcmtoolsTask.java 16 May 2007 07:59:00 -0000 1.4 *************** *** 160,164 **** for(String s : includePaths) { ! cmd.append(" -I" + s); } --- 160,164 ---- for(String s : includePaths) { ! cmd.append(" -I\"").append(s).append("\""); } *************** *** 208,215 **** for(String s : includePaths) { ! cmd.append(" -I" + s); } ! cmd.append(" -o " + destDir.getAbsolutePath()); for(FileSet fs: filesets) --- 208,215 ---- for(String s : includePaths) { ! cmd.append(" -I\"").append(s).append("\""); } ! cmd.append(" -o ").append(destDir.getAbsolutePath()); for(FileSet fs: filesets) *************** *** 270,277 **** for(String s : includePaths) { ! cmd.append(" -I" + s); } ! cmd.append(" -o " + destDir.getAbsolutePath()); for(FileSet fs: filesets) --- 270,277 ---- for(String s : includePaths) { ! cmd.append(" -I\"").append(s).append("\""); } ! cmd.append(" -o ").append(destDir.getAbsolutePath()); for(FileSet fs: filesets) |
|
From: Robert L. <rle...@us...> - 2007-04-18 08:08:37
|
Update of /cvsroot/ccmtools/ccmtools/bin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8984/bin Modified Files: ccmconfix ccmtools-idl ccmidl ccmmodel ccmjava ccmdescriptor ccmtools Log Message: better usage of CLASSPATH Index: ccmtools =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmtools,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ccmtools 6 Nov 2006 13:11:28 -0000 1.13 --- ccmtools 18 Apr 2007 08:08:30 -0000 1.14 *************** *** 16,27 **** if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH" else ! CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH" fi ! exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Dccmtools.templates="$CCMTOOLS_HOME/templates" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.ui.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi \ No newline at end of file --- 16,27 ---- if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH" else ! export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH" fi ! exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Dccmtools.templates="$CCMTOOLS_HOME/templates" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.ui.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi Index: ccmmodel =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmmodel,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ccmmodel 19 Jan 2007 12:07:24 -0000 1.5 --- ccmmodel 18 Apr 2007 08:08:30 -0000 1.6 *************** *** 16,27 **** if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CCMTOOLS_HOME/lib/ccm-runtime.jar;$CLASSPATH" else ! CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH" fi ! exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.parser.idl.metamodel.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi \ No newline at end of file --- 16,27 ---- if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! export CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CCMTOOLS_HOME/lib/ccm-runtime.jar;$CLASSPATH" else ! export CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH" fi ! exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.parser.idl.metamodel.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi Index: ccmconfix =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmconfix,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ccmconfix 10 Aug 2006 20:21:56 -0000 1.4 --- ccmconfix 18 Apr 2007 08:08:30 -0000 1.5 *************** *** 16,27 **** if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! CLASSPATH="$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH" else ! CLASSPATH="$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH" fi ! exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.confix.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi \ No newline at end of file --- 16,27 ---- if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! export CLASSPATH="$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH" else ! export CLASSPATH="$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH" fi ! exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.confix.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi Index: ccmdescriptor =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmdescriptor,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ccmdescriptor 22 Jan 2007 09:08:37 -0000 1.8 --- ccmdescriptor 18 Apr 2007 08:08:30 -0000 1.9 *************** *** 16,27 **** if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/jdom.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH" else ! CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH" fi ! exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.deployment.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi \ No newline at end of file --- 16,27 ---- if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/jdom.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH" else ! export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH" fi ! exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.deployment.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi Index: ccmtools-idl =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmtools-idl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ccmtools-idl 23 Oct 2006 15:44:02 -0000 1.6 --- ccmtools-idl 18 Apr 2007 08:08:30 -0000 1.7 *************** *** 1,3 **** ! #! /usr/bin/env python ## ccmtools-idl : IDL compiler wrapper --- 1,3 ---- ! #! /bin/env python ## ccmtools-idl : IDL compiler wrapper Index: ccmidl =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmidl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ccmidl 24 Nov 2006 14:48:17 -0000 1.5 --- ccmidl 18 Apr 2007 08:08:30 -0000 1.6 *************** *** 16,27 **** if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! CLASSPATH="$CCMTOOLS_HOME/lib/xpp3_min-1.1.3.4.O.jar;$CCMTOOLS_HOME/lib/xstream-1.2.jar;$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" else ! CLASSPATH="$CCMTOOLS_HOME/lib/xpp3_min-1.1.3.4.O.jar:$CCMTOOLS_HOME/lib/xstream-1.2.jar:$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" fi ! exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.idl.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi \ No newline at end of file --- 16,27 ---- if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! export CLASSPATH="$CCMTOOLS_HOME/lib/xpp3_min-1.1.3.4.O.jar;$CCMTOOLS_HOME/lib/xstream-1.2.jar;$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" else ! export CLASSPATH="$CCMTOOLS_HOME/lib/xpp3_min-1.1.3.4.O.jar:$CCMTOOLS_HOME/lib/xstream-1.2.jar:$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" fi ! exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.idl.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi Index: ccmjava =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmjava,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ccmjava 6 Nov 2006 13:11:28 -0000 1.10 --- ccmjava 18 Apr 2007 08:08:30 -0000 1.11 *************** *** 16,27 **** if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! 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" else ! 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" fi ! exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.java.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi \ No newline at end of file --- 16,27 ---- if [ -x $JAVA_LAUNCHER ]; then if [ "`uname`" = "Interix" ]; then ! export 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" else ! export 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" fi ! exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.java.Main $@ else echo "ERROR!" echo "Java executable not found in" "$JAVA_HOME/bin" exit 1 ! fi |
|
From: Teiniker E. <tei...@us...> - 2007-04-13 10:38:04
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_simple In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11517/test/JavaRemoteComponents/facet_simple Added Files: Makefile1.xml Makefile2.xml Removed Files: Makefile.xml Log Message: Added ant build file that uses the new convenients generator ids. --- NEW FILE: Makefile2.xml --- <?xml version="1.0" encoding="ISO-8859-1"?> <project name="FacetSimplExample" basedir="." default="check"> <property environment="env"/> <property name="ccmtools.home" location="${env.CCMTOOLS_HOME}"/> <property name="dest.dir" location="xxx"/> <property name="idl3.dir" location="${dest.dir}/idl3"/> <property name="idl2.dir" location="${dest.dir}/idl2"/> <property name="src" location="${dest.dir}/src"/> <property name="src.gen" location="${dest.dir}/src-gen"/> <property name="src.client" location="src"/> <property name="src.impl" location="impl"/> <property name="build" location="${dest.dir}/build" /> <property name="bin" location="bin" /> <path id="compile.classpath"> <fileset dir="${ccmtools.home}/lib" includes="*.jar"/> </path> <path id="run.classpath"> <pathelement path="${ccmtools.home}/lib/ccm-runtime.jar" /> <pathelement path="${build}" /> </path> <taskdef name="ccmtools" classname="ccmtools.ant.CcmtoolsTask" > <classpath refid="compile.classpath" /> </taskdef> <taskdef name="idlj" classname="ccmtools.ant.IdljTask" > <classpath refid="compile.classpath" /> </taskdef> <target name="init" description="" > <mkdir dir="${build}" /> </target> <target name="clean" description="" > <delete dir="${dest.dir}" /> </target> <!-- Generate IDL3 repository directory --> <target name="idl3repo"> <ccmtools generator="idl3" destdir="${idl3.dir}" validate="true"> <fileset dir="." includes="*.idl" /> </ccmtools> </target> <!-- Generate a local Java component. --> <target name="local" depends="idl3repo"> <ccmtools generator="java.local" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> <ccmtools generator="java.impl" destdir="${src}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}/component" includes="**/*.idl" /> </ccmtools> </target> <!-- Generate a remote Java component. --> <target name="remote" depends="local"> <ccmtools generator="idl2" destdir="${idl2.dir}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> <idlj destdir="${src.gen}" binding="fall"> <include path="${ccmtools.home}/idl:${idl2.dir}" /> <fileset dir="${idl2.dir}" includes="*.idl" /> </idlj> <ccmtools generator="java.remote.adapter" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> </target> <!-- Generate Java clinetlib component. --> <target name="clientlib" depends="remote"> <ccmtools generator="java.clientlib" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> </target> <!-- Check --> <target name="check" depends="init, clientlib"> <copy todir="${src}/world" overwrite="true"> <fileset dir="${src.impl}" includes="*.java" /> </copy> <javac srcdir="${src.gen}:${src}:${src.client}" destdir="${build}" debug="on" source="1.5" target="1.5"> <classpath refid="compile.classpath" /> </javac> <java classname="Client" classpathref="run.classpath" failonerror="true" fork="true"> <assertions><enable/></assertions> </java> <java classname="Client" classpathref="run.classpath" failonerror="true" fork="true"> <assertions><enable/></assertions> <arg line="-ORBInitRef NameService=corbaloc:iiop:1.2@localhost:5050/NameService"/> <arg line="-ORBServerHost localhost"/> </java> </target> </project> --- NEW FILE: Makefile1.xml --- <?xml version="1.0" encoding="ISO-8859-1"?> <project name="FacetSimplExample" basedir="." default="check"> <property environment="env"/> <property name="ccmtools.home" location="${env.CCMTOOLS_HOME}"/> <property name="dest.dir" location="xxx"/> <property name="idl3.dir" location="${dest.dir}/idl3"/> <property name="idl2.dir" location="${dest.dir}/idl2"/> <property name="src" location="${dest.dir}/src"/> <property name="src.gen" location="${dest.dir}/src-gen"/> <property name="src.client" location="src"/> <property name="src.impl" location="impl"/> <property name="build" location="${dest.dir}/build" /> <property name="bin" location="bin" /> <path id="compile.classpath"> <fileset dir="${ccmtools.home}/lib" includes="*.jar"/> </path> <path id="run.classpath"> <pathelement path="${ccmtools.home}/lib/ccm-runtime.jar" /> <pathelement path="${build}" /> </path> <taskdef name="ccmtools" classname="ccmtools.ant.CcmtoolsTask" > <classpath refid="compile.classpath" /> </taskdef> <taskdef name="idlj" classname="ccmtools.ant.IdljTask" > <classpath refid="compile.classpath" /> </taskdef> <target name="init" description="" > <mkdir dir="${build}" /> </target> <target name="clean" description="" > <delete dir="${dest.dir}" /> </target> <!-- Generate IDL3 repository directory --> <target name="idl3repo"> <ccmtools generator="model.validator" > <fileset dir="." includes="*.idl" /> </ccmtools> <ccmtools generator="idl3" destdir="${idl3.dir}"> <fileset dir="." includes="*.idl" /> </ccmtools> </target> <!-- Generate a local Java component. --> <target name="local" depends="idl3repo"> <ccmtools generator="java.local.iface" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> <ccmtools generator="java.local.adapter" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> <ccmtools generator="java.impl" destdir="${src}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}/component" includes="**/*.idl" /> </ccmtools> </target> <!-- Generate a remote Java component. --> <target name="remote" depends="local"> <ccmtools generator="idl2" destdir="${idl2.dir}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> <idlj destdir="${src.gen}" binding="fall"> <include path="${ccmtools.home}/idl:${idl2.dir}" /> <fileset dir="${idl2.dir}" includes="*.idl" /> </idlj> <ccmtools generator="java.remote.adapter" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> </target> <!-- Generate Java clinetlib component. --> <target name="clientlib" depends="remote"> <ccmtools generator="java.clientlib" destdir="${src.gen}"> <include path="${idl3.dir}/interface:${idl3.dir}/component" /> <fileset dir="${idl3.dir}" includes="**/*.idl" /> </ccmtools> </target> <!-- Check --> <target name="check" depends="init, clientlib"> <copy todir="${src}/world" overwrite="true"> <fileset dir="${src.impl}" includes="*.java" /> </copy> <javac srcdir="${src.gen}:${src}:${src.client}" destdir="${build}" debug="on" source="1.5" target="1.5"> <classpath refid="compile.classpath" /> </javac> <java classname="Client" classpathref="run.classpath" failonerror="true" fork="true"> <assertions><enable/></assertions> </java> <java classname="Client" classpathref="run.classpath" failonerror="true" fork="true"> <assertions><enable/></assertions> <arg line="-ORBInitRef NameService=corbaloc:iiop:1.2@localhost:5050/NameService"/> <arg line="-ORBServerHost localhost"/> </java> </target> </project> --- Makefile.xml DELETED --- |
|
From: Teiniker E. <tei...@us...> - 2007-04-13 10:37:17
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ant In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11358/src/ccmtools/ant Modified Files: IncludePath.java GeneratorType.java IdljTask.java BindingType.java CcmtoolsTask.java Log Message: Added convenients generator ids for the ccmtools ant task. Added source code documentation. Index: IdljTask.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/IdljTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IdljTask.java 12 Apr 2007 15:08:28 -0000 1.2 --- IdljTask.java 13 Apr 2007 10:37:08 -0000 1.3 *************** *** 1,3 **** ! /* CCM Tools : ccmtools ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net --- 1,3 ---- ! /* CCM Tools : ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net *************** *** 35,43 **** import org.apache.tools.ant.types.FileSet; public class IdljTask extends Task { /** ! * Handle attribute keep * If a file to be generated already exists, do not overwrite it. * By default it is overwritten. --- 35,67 ---- import org.apache.tools.ant.types.FileSet; + + /** + * This <idlj> ant task is used to execute java's IDL compiler + * from an ant build file. + * + * TODO: there are some idlj options that have not been implemented yet + * as ant attributes or nested elements: + * + * -d <symbol> + * This is equivalent to the following line in an IDL file: + * #define <symbol> + * + * -pkgPrefix <t> <prefix> + * When the type or module name <t> is encountered at file scope, + * begin the Java package name for all files generated for <t> + * with <prefix>. + * + * -pkgTranslate <t> <pkg> + * When the type or module name <t> in encountered, replace + * it with <pkg> in the generated java package. Note that + * pkgPrefix changes are made first. <t> must match the + * full package name exactly. Also, <t> must not be + * org, org.omg, or any subpackage of org.omg. + */ public class IdljTask extends Task { /** ! * Attribute: keep * If a file to be generated already exists, do not overwrite it. * By default it is overwritten. *************** *** 51,55 **** /** ! * Handle attribute emitAll * Emit all types, including those found in #included files. */ --- 75,79 ---- /** ! * Attribute: emitAll * Emit all types, including those found in #included files. */ *************** *** 62,66 **** /** ! * Handle attribute noWarn * Suppress warnings. */ --- 86,90 ---- /** ! * Attribute: noWarn * Suppress warnings. */ *************** *** 73,78 **** /** ! * Handle attribute oldImplBase ! * */ private boolean oldImplBase = false; --- 97,102 ---- /** ! * Attribute: oldImplBase ! * Generate skeletons compatible with old (pre-1.4) JDK ORBs. */ private boolean oldImplBase = false; *************** *** 84,89 **** /** ! * Handle attribute verbose ! * */ private boolean verbose = false; --- 108,113 ---- /** ! * Attribute: verbose ! * Verbose mode. */ private boolean verbose = false; *************** *** 95,100 **** /** ! * Handle attribute skeletonName ! * */ private String skeletonName; --- 119,127 ---- /** ! * Attribute: skeletonName="<xxx%yyy>" ! * Name the skeleton according to the pattern. ! * The defaults are: ! * %POA for the POA base class (-fserver or -fall) ! * _%ImplBase for the oldImplBase base class */ private String skeletonName; *************** *** 106,111 **** /** ! * Handle attribute tieName ! * */ private String tieName; --- 133,141 ---- /** ! * Attribute: tieName="<xxx%yyy>" ! * Name the tie according to the pattern. ! * The defaults are: ! * %POATie for the POA tie (-fserverTie or -fallTie) ! * %_Tie for the oldImplBase tie */ private String tieName; *************** *** 117,124 **** /** ! * Handle attribute binding ! * */ ! private String binding = "fall"; public void setBinding(BindingType binding) { --- 147,157 ---- /** ! * Attribute: binding="f<side>" ! * Define what bindings to emit. ! * <side> is one of client, server, all, serverTIE, allTIE. ! * serverTIE and allTIE cause delegate model skeletons to be emitted. ! * If this flag is not used, -fclient is assumed. */ ! private String binding = "fclient"; public void setBinding(BindingType binding) { *************** *** 128,133 **** /** ! * Handle attribute destdir ! * */ private File destDir = new File("./"); --- 161,166 ---- /** ! * Attribute: destdir="<dir>" ! * Use <dir> for the output directory instead of the current directory. */ private File destDir = new File("./"); *************** *** 139,144 **** /** ! * Handle nested <include> elements ! * */ private List<String> includePaths = new ArrayList<String>(); --- 172,178 ---- /** ! * Nested element: <include> ! * By default, the current directory is scanned for included files. ! * This option adds another directory. */ private List<String> includePaths = new ArrayList<String>(); *************** *** 153,158 **** /** ! * Handle file sets ! * */ private List<FileSet> filesets = new ArrayList<FileSet>(); --- 187,192 ---- /** ! * Nested element: fileset ! * Specifies a set of input files for the IDL generator. */ private List<FileSet> filesets = new ArrayList<FileSet>(); *************** *** 164,167 **** --- 198,207 ---- + /** + * Execute the <ccmtools> task based on the given attributes and + * nested elements. + * To run the IDL generator, a helper method is called for every + * single input file. + */ public void execute() { *************** *** 186,189 **** --- 226,233 ---- + /** + * Helper method to execute java's idlj script. + * Note that idlj must be reachable from the environment's PATH variable. + */ public void runIdlCompiler(File idlFile) { *************** *** 252,255 **** --- 296,303 ---- + /** + * Helper class to log the given attributes and nested elements of + * the <idlj> task (shown in ant's verbose mode). + */ public void logTask() { Index: CcmtoolsTask.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/CcmtoolsTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CcmtoolsTask.java 12 Apr 2007 15:08:28 -0000 1.2 --- CcmtoolsTask.java 13 Apr 2007 10:37:09 -0000 1.3 *************** *** 1,3 **** ! /* CCM Tools : ccmtools ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net --- 1,3 ---- ! /* CCM Tools : ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net *************** *** 31,40 **** import org.apache.tools.ant.types.FileSet; public class CcmtoolsTask extends Task { /** ! * Handle attribute generator ! * */ private String generator; --- 31,44 ---- import org.apache.tools.ant.types.FileSet; + /** + * This <ccmtools> ant task is used to execute different ccmtools generators + * from an ant build file. + */ public class CcmtoolsTask extends Task { /** ! * attribute: generator ! * Defines the ccmtools generator type (see GeneratorType) */ private String generator; *************** *** 43,51 **** this.generator=generator.getValue(); } ! /** ! * Handle attribute destdir ! * */ private File destDir = new File("./"); --- 47,67 ---- this.generator=generator.getValue(); } ! /** ! * Attribute: validate ! * Forces the execution of ccmtools' model validator which ensures ! * that a given IDL file conforms to the supported ccmtools metamodel. ! */ ! private boolean validate = false; ! public void setValidate(boolean validate) ! { ! this.validate=validate; ! } ! ! ! /** ! * Attribute: destdir ! * Defines the generator's output directory. */ private File destDir = new File("./"); *************** *** 57,62 **** /** ! * Handle nested includepath elements ! * */ private List<String> includePaths; --- 73,79 ---- /** ! * Nested element: <include> ! * Contains a path attribute to specify an include path for the given ! * generator (see IncludePath). */ private List<String> includePaths; *************** *** 71,76 **** /** ! * Handle file sets ! * */ private List<FileSet> filesets = new ArrayList<FileSet>(); --- 88,93 ---- /** ! * Nested element: <fileset> ! * Specifies a set of input files for the given generator. */ private List<FileSet> filesets = new ArrayList<FileSet>(); *************** *** 80,84 **** } ! public void execute() { --- 97,107 ---- } ! ! /** ! * Execute the <ccmtools> task based on the given attributes and ! * nested elements. ! * To run the ccmtools generators, their static main methods are called ! * with a particular args array. ! */ public void execute() { *************** *** 105,109 **** if(generator.startsWith("model")) { ! executeModelTools(); } else if(generator.startsWith("idl")) --- 128,132 ---- if(generator.startsWith("model")) { ! executeModelTools(generator); } else if(generator.startsWith("idl")) *************** *** 117,130 **** } ! ! protected void executeModelTools() { StringBuilder cmd = new StringBuilder(); ! if(generator.equals("model.validator")) { cmd.append("-validator"); } ! else if(generator.equals("model.parser")) { cmd.append("-parser"); --- 140,156 ---- } ! ! /** ! * Helper method to execute the ccmtools.parser.idl.metamodel.Main class. ! */ ! protected void executeModelTools(String type) { StringBuilder cmd = new StringBuilder(); ! if(type.equals("model.validator")) { cmd.append("-validator"); } ! else if(type.equals("model.parser")) { cmd.append("-parser"); *************** *** 148,159 **** } ! log("command line = " + cmd.toString(), Project.MSG_VERBOSE); String[] args = cmd.toString().split(" "); ccmtools.parser.idl.metamodel.Main.main(args); } ! protected void executeIdlGenerator() { StringBuilder cmd = new StringBuilder(); --- 174,193 ---- } ! log(">> ccmmodel " + cmd.toString()); String[] args = cmd.toString().split(" "); ccmtools.parser.idl.metamodel.Main.main(args); } ! ! /** ! * Helper method to execute the ccmtools.generator.idl.Main class. ! */ protected void executeIdlGenerator() { + if(validate) + { + executeModelTools("model.validator"); + } + StringBuilder cmd = new StringBuilder(); *************** *** 190,194 **** } ! log("command line = " + cmd.toString(), Project.MSG_VERBOSE); String[] args = cmd.toString().split(" "); ccmtools.generator.idl.Main.main(args); --- 224,228 ---- } ! log(">> ccmidl " + cmd.toString()); String[] args = cmd.toString().split(" "); ccmtools.generator.idl.Main.main(args); *************** *** 196,216 **** protected void executeJavaGenerator() { StringBuilder cmd = new StringBuilder(); ! if(generator.equals("java.iface")) { cmd.append("-iface"); } ! else if(generator.equals("java.local")) { cmd.append("-local"); } ! else if(generator.equals("java.app")) { cmd.append("-app"); } ! else if(generator.equals("java.remote")) { cmd.append("-remote"); --- 230,262 ---- + /** + * Helper method to execute the ccmtools.generator.java.Main class. + */ protected void executeJavaGenerator() { + if(validate) + { + executeModelTools("model.validator"); + } + StringBuilder cmd = new StringBuilder(); ! if(generator.equals("java.local")) ! { ! cmd.append("-iface -local"); ! } ! else if(generator.equals("java.local.iface")) { cmd.append("-iface"); } ! else if(generator.equals("java.local.adapter")) { cmd.append("-local"); } ! else if(generator.equals("java.impl")) { cmd.append("-app"); } ! else if(generator.equals("java.remote.adapter")) { cmd.append("-remote"); *************** *** 240,244 **** } ! log("command line = " + cmd.toString(), Project.MSG_VERBOSE); String[] args = cmd.toString().split(" "); ccmtools.generator.java.Main.main(args); --- 286,290 ---- } ! log(">> ccmjava " + cmd.toString()); String[] args = cmd.toString().split(" "); ccmtools.generator.java.Main.main(args); *************** *** 246,249 **** --- 292,299 ---- + /** + * Helper class to log the given attributes and nested elements of + * the <ccmtools> task (shown in ant's verbose mode). + */ public void logTask() { *************** *** 252,255 **** --- 302,306 ---- log("property ccmtools.home = " + home, Project.MSG_VERBOSE); log("attribute generator = " + generator, Project.MSG_VERBOSE); + log("attribute validate = " + validate, Project.MSG_VERBOSE); if(destDir != null) log("attribute destdir = " + destDir.getAbsolutePath(), Project.MSG_VERBOSE); Index: BindingType.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/BindingType.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BindingType.java 12 Apr 2007 15:08:28 -0000 1.2 --- BindingType.java 13 Apr 2007 10:37:09 -0000 1.3 *************** *** 1,3 **** ! /* CCM Tools : ccmtools ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net --- 1,3 ---- ! /* CCM Tools : ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net *************** *** 25,29 **** extends EnumeratedAttribute { ! public String[] getValues() { --- 25,32 ---- extends EnumeratedAttribute { ! /** ! * This class is used by the Ant framework to define the possible ! * values of the <idlj> task's binding attribute. ! */ public String[] getValues() { Index: IncludePath.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/IncludePath.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IncludePath.java 12 Apr 2007 15:08:28 -0000 1.2 --- IncludePath.java 13 Apr 2007 10:37:08 -0000 1.3 *************** *** 1,3 **** ! /* CCM Tools : ccmtools ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net --- 1,3 ---- ! /* CCM Tools : ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net *************** *** 22,34 **** import org.apache.tools.ant.types.Path; public class IncludePath ! { ! ! public String[] getPaths() ! { ! return path.list(); ! } ! ! /** Handle path attribute */ private Path path; public void setPath(Path path) --- 22,36 ---- import org.apache.tools.ant.types.Path; + /** + * This class implements the nested <include> element of the <ccmtools> + * ant task. + */ public class IncludePath ! { ! /** ! * Attribute: path ! * Specifies a Path object which is used to define include paths for a ! * ccmtools generator call. ! */ private Path path; public void setPath(Path path) *************** *** 36,40 **** this.path = path; } ! public String toString() --- 38,50 ---- this.path = path; } ! ! /** ! * Getter method that returns all stored include paths as a string array. ! */ ! public String[] getPaths() ! { ! return path.list(); ! } ! public String toString() Index: GeneratorType.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/GeneratorType.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeneratorType.java 12 Apr 2007 15:08:28 -0000 1.2 --- GeneratorType.java 13 Apr 2007 10:37:08 -0000 1.3 *************** *** 1,3 **** ! /* CCM Tools : ccmtools ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net --- 1,3 ---- ! /* CCM Tools : ant tasks * Egon Teiniker <ego...@fh...> * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net *************** *** 22,29 **** import org.apache.tools.ant.types.EnumeratedAttribute; public class GeneratorType extends EnumeratedAttribute { - public String[] getValues() { --- 22,33 ---- import org.apache.tools.ant.types.EnumeratedAttribute; + /** + * This class is used by the Ant framework to define the possible + * values of the <ccmtools> task's generator attribute. + * Each value represents one or more ccmtools generator calls. + */ public class GeneratorType extends EnumeratedAttribute { public String[] getValues() { *************** *** 40,47 **** // ccmtools.generator.java ! "java.iface", ! "java.local", ! "java.app", ! "java.remote", "java.clientlib", --- 44,52 ---- // ccmtools.generator.java ! "java.local", // => "java.local.iface" + "java.local.adapter" ! "java.local.iface", ! "java.local.adapter", ! "java.impl", ! "java.remote.adapter", "java.clientlib", |
|
From: Robert L. <rle...@us...> - 2007-04-12 15:24:46
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5682/src/ccmtools/generator/java/templates/jet Modified Files: ExceptionDefDefaultConstructor.jet ExceptionDefReasonConstructor.jet ComponentDefAssemblyClass.jet ExceptionDefConstructor.jet ExceptionDefImplementation.jet Log Message: *) UserException now calculates the repo-id *) all CCM-exceptions copy the message text to java.lang.Exception *) some small updates Index: ComponentDefAssemblyClass.jet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ComponentDefAssemblyClass.jet,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ComponentDefAssemblyClass.jet 21 Mar 2007 12:29:51 -0000 1.11 --- ComponentDefAssemblyClass.jet 12 Apr 2007 15:24:12 -0000 1.12 *************** *** 79,83 **** %> } catch(Exception e) { ! throw new Components.CCMException(e.getMessage(), Components.CCMExceptionReason.CREATE_ERROR); } } --- 79,85 ---- %> } catch(Exception e) { ! throw new Components.CCMException( ! "assembly creation failed: "+e.getMessage(), ! Components.CCMExceptionReason.CREATE_ERROR, e); } } *************** *** 229,234 **** ccm_activate_ok = true; } catch(Exception e) { ! throw new Components.CCMException(e.getMessage(), ! Components.CCMExceptionReason.CREATE_ERROR); } } --- 231,237 ---- ccm_activate_ok = true; } catch(Exception e) { ! throw new Components.CCMException( ! "assembly configuration failed: "+e.getMessage(), ! Components.CCMExceptionReason.CREATE_ERROR, e); } } Index: ExceptionDefConstructor.jet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ExceptionDefConstructor.jet,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExceptionDefConstructor.jet 27 Jul 2006 14:19:55 -0000 1.2 --- ExceptionDefConstructor.jet 12 Apr 2007 15:24:13 -0000 1.3 *************** *** 6,10 **** public <%=exception.getIdentifier()%>(<%=exception.generateConstructorParameterList()%>) { ! super(REPOSITORY_ID); <% for(Iterator i=exception.getFields().iterator(); i.hasNext();) --- 6,10 ---- public <%=exception.getIdentifier()%>(<%=exception.generateConstructorParameterList()%>) { ! super(); <% for(Iterator i=exception.getFields().iterator(); i.hasNext();) *************** *** 18,24 **** } ! public <%=exception.getIdentifier()%>(String reason, <%=exception.generateConstructorParameterList()%>) { ! super(REPOSITORY_ID + " " + reason); <% for(Iterator i=exception.getFields().iterator(); i.hasNext();) --- 18,24 ---- } ! public <%=exception.getIdentifier()%>(String _reason, <%=exception.generateConstructorParameterList()%>) { ! super(_reason); <% for(Iterator i=exception.getFields().iterator(); i.hasNext();) Index: ExceptionDefReasonConstructor.jet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ExceptionDefReasonConstructor.jet,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExceptionDefReasonConstructor.jet 27 Jul 2006 14:19:54 -0000 1.3 --- ExceptionDefReasonConstructor.jet 12 Apr 2007 15:24:12 -0000 1.4 *************** *** 4,9 **** %> <% ExceptionDef exception = (ExceptionDef) argument; %> ! public <%=exception.getIdentifier()%>(String reason) { ! super(REPOSITORY_ID + " " + reason); } --- 4,9 ---- %> <% ExceptionDef exception = (ExceptionDef) argument; %> ! public <%=exception.getIdentifier()%>(String _reason) { ! super(_reason); } Index: ExceptionDefDefaultConstructor.jet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ExceptionDefDefaultConstructor.jet,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExceptionDefDefaultConstructor.jet 27 Jul 2006 14:19:55 -0000 1.3 --- ExceptionDefDefaultConstructor.jet 12 Apr 2007 15:24:12 -0000 1.4 *************** *** 6,10 **** public <%=exception.getIdentifier()%>() { ! super(REPOSITORY_ID); <% for(Iterator i=exception.getFields().iterator(); i.hasNext();) --- 6,10 ---- public <%=exception.getIdentifier()%>() { ! super(); <% for(Iterator i=exception.getFields().iterator(); i.hasNext();) Index: ExceptionDefImplementation.jet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ExceptionDefImplementation.jet,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ExceptionDefImplementation.jet 10 Jan 2007 16:19:15 -0000 1.5 --- ExceptionDefImplementation.jet 12 Apr 2007 15:24:13 -0000 1.6 *************** *** 17,22 **** extends Components.UserException { - private static final String REPOSITORY_ID = "<%=exception.generateRepositoryId()%>"; - <% for(Iterator i=exception.getFields().iterator(); i.hasNext();) --- 17,20 ---- |
|
From: Robert L. <rle...@us...> - 2007-04-12 15:24:20
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5682/src/ccmtools/generator/java/templates Modified Files: ComponentDefAssemblyClassTemplate.java ExceptionDefReasonConstructorTemplate.java ExceptionDefImplementationTemplate.java ExceptionDefConstructorTemplate.java ExceptionDefDefaultConstructorTemplate.java Log Message: *) UserException now calculates the repo-id *) all CCM-exceptions copy the message text to java.lang.Exception *) some small updates Index: ExceptionDefDefaultConstructorTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/ExceptionDefDefaultConstructorTemplate.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExceptionDefDefaultConstructorTemplate.java 27 Jul 2006 14:19:53 -0000 1.4 --- ExceptionDefDefaultConstructorTemplate.java 12 Apr 2007 15:24:15 -0000 1.5 *************** *** 17,21 **** protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; protected final String TEXT_1 = " public "; ! protected final String TEXT_2 = "() " + NL + " {" + NL + " super(REPOSITORY_ID);"; protected final String TEXT_3 = NL + " "; protected final String TEXT_4 = "("; --- 17,21 ---- protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; protected final String TEXT_1 = " public "; ! protected final String TEXT_2 = "() " + NL + " {" + NL + " super();"; protected final String TEXT_3 = NL + " "; protected final String TEXT_4 = "("; Index: ComponentDefAssemblyClassTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/ComponentDefAssemblyClassTemplate.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ComponentDefAssemblyClassTemplate.java 21 Mar 2007 12:29:52 -0000 1.11 --- ComponentDefAssemblyClassTemplate.java 12 Apr 2007 15:24:14 -0000 1.12 *************** *** 33,37 **** protected final String TEXT_16 = "Impl()" + NL + " throws Components.CCMException" + NL + " {" + NL + " \ttry {"; protected final String TEXT_17 = NL; ! protected final String TEXT_18 = " " + NL + " \t} catch(Exception e) {" + NL + " \t\tthrow new Components.CCMException(e.getMessage(), Components.CCMExceptionReason.CREATE_ERROR);" + NL + " \t}" + NL + " }" + NL + " " + NL + " " + NL + " /*" + NL + " * Components.ComponentDelegator implementation" + NL + " */" + NL + "\t" + NL + "\tpublic Object provide( String name ) throws Components.InvalidName" + NL + "\t{"; protected final String TEXT_19 = NL; protected final String TEXT_20 = " " + NL + "\t\tthrow new Components.InvalidName(\"unknown facet: \"+name);" + NL + "\t}" + NL + "" + NL + " public Components.Cookie connect( String name, Object connection )" + NL + "\t\tthrows Components.InvalidName, Components.InvalidConnection," + NL + " Components.AlreadyConnected, Components.ExceededConnectionLimit" + NL + " {"; --- 33,37 ---- protected final String TEXT_16 = "Impl()" + NL + " throws Components.CCMException" + NL + " {" + NL + " \ttry {"; protected final String TEXT_17 = NL; ! protected final String TEXT_18 = " " + NL + " \t} catch(Exception e) {" + NL + " \t\tthrow new Components.CCMException(" + NL + " \t\t\t\"assembly creation failed: \"+e.getMessage()," + NL + " \t\t\tComponents.CCMExceptionReason.CREATE_ERROR, e);" + NL + " \t}" + NL + " }" + NL + " " + NL + " " + NL + " /*" + NL + " * Components.ComponentDelegator implementation" + NL + " */" + NL + "\t" + NL + "\tpublic Object provide( String name ) throws Components.InvalidName" + NL + "\t{"; protected final String TEXT_19 = NL; protected final String TEXT_20 = " " + NL + "\t\tthrow new Components.InvalidName(\"unknown facet: \"+name);" + NL + "\t}" + NL + "" + NL + " public Components.Cookie connect( String name, Object connection )" + NL + "\t\tthrows Components.InvalidName, Components.InvalidConnection," + NL + " Components.AlreadyConnected, Components.ExceededConnectionLimit" + NL + " {"; *************** *** 53,57 **** protected final String TEXT_36 = NL + "\t\t\t"; protected final String TEXT_37 = "_.configuration_complete();"; ! protected final String TEXT_38 = NL + NL + "\t\t\tccm_activate_ok = true; " + NL + " \t} catch(Exception e) {" + NL + " \t\tthrow new Components.CCMException(e.getMessage()," + NL + " \t\t\tComponents.CCMExceptionReason.CREATE_ERROR);" + NL + " \t}" + NL + " }" + NL + "" + NL + " public void ccm_passivate() " + NL + " throws Components.CCMException" + NL + " {" + NL + " // Who calls this method?" + NL + " }" + NL + "" + NL + " public void ccm_remove() " + NL + " throws Components.CCMException" + NL + " {" + NL + " \ttry {"; protected final String TEXT_39 = NL + "\t\t\t"; protected final String TEXT_40 = "_.remove();"; --- 53,57 ---- protected final String TEXT_36 = NL + "\t\t\t"; protected final String TEXT_37 = "_.configuration_complete();"; ! protected final String TEXT_38 = NL + NL + "\t\t\tccm_activate_ok = true; " + NL + " \t} catch(Exception e) {" + NL + " \t\tthrow new Components.CCMException(" + NL + " \t\t\t\"assembly configuration failed: \"+e.getMessage()," + NL + " \t\t\tComponents.CCMExceptionReason.CREATE_ERROR, e);" + NL + " \t}" + NL + " }" + NL + "" + NL + " public void ccm_passivate() " + NL + " throws Components.CCMException" + NL + " {" + NL + " // Who calls this method?" + NL + " }" + NL + "" + NL + " public void ccm_remove() " + NL + " throws Components.CCMException" + NL + " {" + NL + " \ttry {"; protected final String TEXT_39 = NL + "\t\t\t"; protected final String TEXT_40 = "_.remove();"; Index: ExceptionDefConstructorTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/ExceptionDefConstructorTemplate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExceptionDefConstructorTemplate.java 27 Jul 2006 14:19:53 -0000 1.3 --- ExceptionDefConstructorTemplate.java 12 Apr 2007 15:24:14 -0000 1.4 *************** *** 18,28 **** protected final String TEXT_1 = " public "; protected final String TEXT_2 = "("; ! protected final String TEXT_3 = ") " + NL + " {" + NL + " super(REPOSITORY_ID);"; protected final String TEXT_4 = NL + " "; protected final String TEXT_5 = "("; protected final String TEXT_6 = ");"; protected final String TEXT_7 = NL + " }" + NL + " " + NL + " public "; ! protected final String TEXT_8 = "(String reason, "; ! protected final String TEXT_9 = ") " + NL + " {" + NL + " super(REPOSITORY_ID + \" \" + reason);"; protected final String TEXT_10 = NL + " "; protected final String TEXT_11 = "("; --- 18,28 ---- protected final String TEXT_1 = " public "; protected final String TEXT_2 = "("; ! protected final String TEXT_3 = ") " + NL + " {" + NL + " super();"; protected final String TEXT_4 = NL + " "; protected final String TEXT_5 = "("; protected final String TEXT_6 = ");"; protected final String TEXT_7 = NL + " }" + NL + " " + NL + " public "; ! protected final String TEXT_8 = "(String _reason, "; ! protected final String TEXT_9 = ") " + NL + " {" + NL + " super(_reason);"; protected final String TEXT_10 = NL + " "; protected final String TEXT_11 = "("; Index: ExceptionDefImplementationTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/ExceptionDefImplementationTemplate.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ExceptionDefImplementationTemplate.java 10 Jan 2007 16:19:14 -0000 1.6 --- ExceptionDefImplementationTemplate.java 12 Apr 2007 15:24:14 -0000 1.7 *************** *** 21,27 **** protected final String TEXT_4 = NL; protected final String TEXT_5 = NL + " " + NL + "public class "; ! protected final String TEXT_6 = " " + NL + " extends Components.UserException" + NL + "{" + NL + " private static final String REPOSITORY_ID = \""; ! protected final String TEXT_7 = "\";" + NL + " "; ! protected final String TEXT_8 = NL + " "; protected final String TEXT_9 = NL; protected final String TEXT_10 = NL; --- 21,27 ---- protected final String TEXT_4 = NL; protected final String TEXT_5 = NL + " " + NL + "public class "; ! protected final String TEXT_6 = " " + NL + " extends Components.UserException" + NL + "{"; ! protected final String TEXT_7 = NL + " "; ! protected final String TEXT_8 = NL; protected final String TEXT_9 = NL; protected final String TEXT_10 = NL; *************** *** 29,35 **** protected final String TEXT_12 = NL; protected final String TEXT_13 = NL; ! protected final String TEXT_14 = NL; ! protected final String TEXT_15 = NL + NL + "}"; ! protected final String TEXT_16 = NL; public String generate(Object argument) --- 29,34 ---- protected final String TEXT_12 = NL; protected final String TEXT_13 = NL; ! protected final String TEXT_14 = NL + NL + "}"; ! protected final String TEXT_15 = NL; public String generate(Object argument) *************** *** 47,52 **** stringBuffer.append( exception.getIdentifier() ); stringBuffer.append(TEXT_6); - stringBuffer.append(exception.generateRepositoryId()); - stringBuffer.append(TEXT_7); for(Iterator i=exception.getFields().iterator(); i.hasNext();) --- 46,49 ---- *************** *** 54,69 **** FieldDef field = (FieldDef)i.next(); ! stringBuffer.append(TEXT_8); stringBuffer.append(field.generateDeclaration()); } stringBuffer.append(TEXT_9); - stringBuffer.append(TEXT_10); stringBuffer.append(exception.generateDefaultConstructor()); stringBuffer.append(TEXT_11); - stringBuffer.append(TEXT_12); stringBuffer.append(exception.generateConstructor()); ! stringBuffer.append(TEXT_13); for(Iterator i=exception.getFields().iterator(); i.hasNext();) --- 51,66 ---- FieldDef field = (FieldDef)i.next(); ! stringBuffer.append(TEXT_7); stringBuffer.append(field.generateDeclaration()); } + stringBuffer.append(TEXT_8); stringBuffer.append(TEXT_9); stringBuffer.append(exception.generateDefaultConstructor()); + stringBuffer.append(TEXT_10); stringBuffer.append(TEXT_11); stringBuffer.append(exception.generateConstructor()); ! stringBuffer.append(TEXT_12); for(Iterator i=exception.getFields().iterator(); i.hasNext();) *************** *** 71,81 **** FieldDef field = (FieldDef)i.next(); ! stringBuffer.append(TEXT_14); stringBuffer.append(field.generateAccessors()); } stringBuffer.append(TEXT_15); - stringBuffer.append(TEXT_16); return stringBuffer.toString(); } --- 68,78 ---- FieldDef field = (FieldDef)i.next(); ! stringBuffer.append(TEXT_13); stringBuffer.append(field.generateAccessors()); } + stringBuffer.append(TEXT_14); stringBuffer.append(TEXT_15); return stringBuffer.toString(); } Index: ExceptionDefReasonConstructorTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/ExceptionDefReasonConstructorTemplate.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExceptionDefReasonConstructorTemplate.java 27 Jul 2006 14:19:53 -0000 1.4 --- ExceptionDefReasonConstructorTemplate.java 12 Apr 2007 15:24:14 -0000 1.5 *************** *** 16,20 **** protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; protected final String TEXT_1 = " public "; ! protected final String TEXT_2 = "(String reason) " + NL + " {" + NL + " super(REPOSITORY_ID + \" \" + reason);" + NL + " }"; protected final String TEXT_3 = NL; --- 16,20 ---- protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; protected final String TEXT_1 = " public "; ! protected final String TEXT_2 = "(String _reason) " + NL + " {" + NL + " super(_reason);" + NL + " }"; protected final String TEXT_3 = NL; |
|
From: Robert L. <rle...@us...> - 2007-04-12 15:24:18
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5682/src/ccmtools Modified Files: CcmtoolsException.java Log Message: *) UserException now calculates the repo-id *) all CCM-exceptions copy the message text to java.lang.Exception *) some small updates Index: CcmtoolsException.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CcmtoolsException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CcmtoolsException.java 14 Feb 2007 12:27:05 -0000 1.2 --- CcmtoolsException.java 12 Apr 2007 15:24:13 -0000 1.3 *************** *** 23,26 **** --- 23,28 ---- extends Exception { + private static final long serialVersionUID = 8213556447461784040L; + public CcmtoolsException(String message) { |
1 message has been excluded from this view by a project administrator.
