Menu
▾
▴
sandev-cvs — sandev cvs traffic
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(89) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(9) |
Feb
(6) |
Mar
(22) |
Apr
(34) |
May
(43) |
Jun
(48) |
Jul
(96) |
Aug
(64) |
Sep
(30) |
Oct
(12) |
Nov
(17) |
Dec
(21) |
| 2007 |
Jan
(61) |
Feb
(24) |
Mar
(51) |
Apr
(54) |
May
(41) |
Jun
(57) |
Jul
(16) |
Aug
(12) |
Sep
(29) |
Oct
(143) |
Nov
(57) |
Dec
(193) |
| 2008 |
Jan
(92) |
Feb
(54) |
Mar
(34) |
Apr
(50) |
May
(71) |
Jun
(3) |
Jul
(16) |
Aug
(16) |
Sep
(11) |
Oct
(13) |
Nov
(8) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(9) |
Apr
(36) |
May
(10) |
Jun
(2) |
Jul
(13) |
Aug
(15) |
Sep
(5) |
Oct
(2) |
Nov
(13) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(2) |
Mar
(6) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(24) |
Sep
(14) |
Oct
(8) |
Nov
(4) |
Dec
(9) |
| 2011 |
Jan
(4) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(2) |
Jul
(1) |
Aug
(4) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(1) |
|
From: Eric P. <th...@us...> - 2010-09-05 13:50:25
|
Update of /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14337 Modified Files: DataManagerInfoGenerator.java GeneratorCommon.java SandStringPersistConverterGenerator.java Log Message: Factored out getRootDirNameFromProjDir method to figure out how to get to the top level "sand" directory from a build project. See the method comments for details. Index: DataManagerInfoGenerator.java =================================================================== RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/DataManagerInfoGenerator.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DataManagerInfoGenerator.java 30 Nov 2005 04:10:04 -0000 1.1.1.1 --- DataManagerInfoGenerator.java 5 Sep 2010 13:50:16 -0000 1.2 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2005 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2005,2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 192,200 **** SandProject deployment=sbd.getBuildTrigger(); String prefix=deployment.getAntProject().getProperty("DeploymentPrefix"); ! String filename=projDir.toString(); ! if(filename.endsWith(File.separator)) { ! filename=filename.substring(0,filename.lastIndexOf(File.separator)); } ! while(!filename.endsWith("sand")) { ! filename=filename.substring(0,filename.lastIndexOf(File.separator)); } return filename + File.separator + "apps" + File.separator + "basics" + File.separator + "src" + File.separator + --- 192,196 ---- SandProject deployment=sbd.getBuildTrigger(); String prefix=deployment.getAntProject().getProperty("DeploymentPrefix"); ! String filename=getRootDirNameFromProjDir(projDir); return filename + File.separator + "apps" + File.separator + "basics" + File.separator + "src" + File.separator + Index: GeneratorCommon.java =================================================================== RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/GeneratorCommon.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** GeneratorCommon.java 31 Mar 2009 01:19:30 -0000 1.18 --- GeneratorCommon.java 5 Sep 2010 13:50:16 -0000 1.19 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2003-2009 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2003-2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 768,771 **** --- 768,802 ---- + /** + * Given a build project, return the root sand directory. This + * used to be done on a per-generator basis, usually by iterating + * upwards through the filename until it ends with "sand" and + * calling that the root. The reason for that was to allow for + * subproject builds. The need for supporting subprojects never + * materialized, but it would be nice to have the top level + * directory be able to be called something other than "sand", so + * this now works by assuming projDir is something like + * .../sand/deploy/someproject + * and then just doing a straight couple of substrings without + * actually looking for "sand". This is more flexible, but + * factoring the logic out into this method in case we need to + * revisit this in the future. + */ + protected String getRootDirNameFromProjDir(File projDir) + { + String filename=projDir.toString(); + //System.out.println("initial filename: " + filename); + //remove trailing slash if present + if(filename.endsWith(File.separator)) { + filename=filename.substring(0,filename.lastIndexOf(File.separator)); } + //now have something like "../sand/deploy/someproject" + filename=filename.substring(0,filename.lastIndexOf(File.separator)); + //now have something like ../sand/deploy + filename=filename.substring(0,filename.lastIndexOf(File.separator)); + //now have ../sand + return filename; + } + + //////////////////////////////////////// // Field management utilities Index: SandStringPersistConverterGenerator.java =================================================================== RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/SandStringPersistConverterGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SandStringPersistConverterGenerator.java 14 Jun 2007 03:20:20 -0000 1.2 --- SandStringPersistConverterGenerator.java 5 Sep 2010 13:50:16 -0000 1.3 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2005,2007 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2005,2007,2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 394,402 **** protected String getSPCFileName(File projDir) { ! String filename=projDir.toString(); ! if(filename.endsWith(File.separator)) { ! filename=filename.substring(0,filename.lastIndexOf(File.separator)); } ! while(!filename.endsWith("sand")) { ! filename=filename.substring(0,filename.lastIndexOf(File.separator)); } return filename + File.separator + "apps" + File.separator + "basics" + File.separator + "src" + File.separator + --- 394,398 ---- protected String getSPCFileName(File projDir) { ! String filename=getRootDirNameFromProjDir(projDir); return filename + File.separator + "apps" + File.separator + "basics" + File.separator + "src" + File.separator + |
|
From: Eric P. <th...@us...> - 2010-08-22 07:22:17
|
Update of /cvsroot/sandev/sand In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28250 Modified Files: readme.html Log Message: Removed mention of the SAND_HOME env variable. Index: readme.html =================================================================== RCS file: /cvsroot/sandev/sand/readme.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** readme.html 30 Jul 2008 22:07:11 -0000 1.7 --- readme.html 22 Aug 2010 07:22:09 -0000 1.8 *************** *** 54,58 **** of stub classes for symbol resolution when compiling the generators. In ! <code>SAND_HOME/apps/basics/build/generate/org/sandev/generator</code> create empty class declarations in the <code>com.sun.javadoc</code> package: <ol> --- 54,58 ---- of stub classes for symbol resolution when compiling the generators. In ! <code>sand/apps/basics/build/generate/org/sandev/generator</code> create empty class declarations in the <code>com.sun.javadoc</code> package: <ol> *************** *** 143,147 **** <code>sandbuild.jar</code> (custom tasks). Easiest thing to do is modify your CLASSPATH environment variable to include these (e.g ! <code>CLASSPATH=/Developer/Java/Ant/lib/ant.jar:$SAND_HOME/platform/sandbuild/env/sandbuild.jar...</code> More on sandbuild.jar later on. </p> --- 143,147 ---- <code>sandbuild.jar</code> (custom tasks). Easiest thing to do is modify your CLASSPATH environment variable to include these (e.g ! <code>CLASSPATH=/Developer/Java/Ant/lib/ant.jar:/general/sand/platform/sandbuild/env/sandbuild.jar...</code> More on sandbuild.jar later on. </p> *************** *** 166,172 **** </code></ul></p> ! <p>Then you can just update whenever you want to get the latest. Once you ! have the source, define the <code>SAND_HOME</code> environment variable to ! be the sand directory (e.g. <code>/general/sand</code>).</p> --- 166,170 ---- </code></ul></p> ! <p>Then you can just update whenever you want to get the latest. </p> *************** *** 178,182 **** <li><p>Verify the sandbuild.jar file with the custom Ant tasks is up to date: <ul><code> ! cd $SAND_HOME/platform/sandbuild/build <br/> ant </ul></code></p> --- 176,180 ---- <li><p>Verify the sandbuild.jar file with the custom Ant tasks is up to date: <ul><code> ! cd sand/platform/sandbuild/build <br/> ant </ul></code></p> *************** *** 193,197 **** <li><p>Build the sample TaskHeapDemo application: <ul><code> ! cd $SAND_HOME/deploy/TaskHeapDemo/build <br/> ant </ul></code></p> --- 191,195 ---- <li><p>Build the sample TaskHeapDemo application: <ul><code> ! cd sand/deploy/TaskHeapDemo/build <br/> ant </ul></code></p> *************** *** 210,214 **** <li><p>Verify the demo app comes up: <ol> ! <li>open the generated <code>$SAND_HOME/docs/index.html</code> <li>click the "TaskHeapDemo" link in the upper left <li>click the "localhost TaskHeap webapp user interface" link in the --- 208,212 ---- <li><p>Verify the demo app comes up: <ol> ! <li>open the generated <code>sand/docs/index.html</code> <li>click the "TaskHeapDemo" link in the upper left <li>click the "localhost TaskHeap webapp user interface" link in the *************** *** 235,239 **** <p><ul><code> ! cd $SAND_HOME/deploy/TaskHeapDemo/build <br/> ant scrub <br/> ant -f initproj.xml --- 233,237 ---- <p><ul><code> ! cd sand/deploy/TaskHeapDemo/build <br/> ant scrub <br/> ant -f initproj.xml |
|
From: Eric P. <th...@us...> - 2010-08-22 07:21:32
|
Update of /cvsroot/sandev/sand/platform/tools/src/org/sandev/tools/HTTP In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28171 Modified Files: XHTMLFormEditor.java Log Message: Replaced reference to SAND_HOME environment variable with an optional reference to SAND_HELP_ROOT. Otherwise te default of one level up from the current directory is used. Index: XHTMLFormEditor.java =================================================================== RCS file: /cvsroot/sandev/sand/platform/tools/src/org/sandev/tools/HTTP/XHTMLFormEditor.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** XHTMLFormEditor.java 13 Mar 2007 20:09:26 -0000 1.8 --- XHTMLFormEditor.java 22 Aug 2010 07:21:24 -0000 1.9 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2003,2007 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2003,2007,2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 308,312 **** String root=".."; try { ! root=EnvGrabber.getEnvVar("SAND_HOME"); } catch(IOException e) { System.out.println("HTTPConfigEditorNode couldn't find help root: " + e); --- 308,314 ---- String root=".."; try { ! //can define this env var to make sure we consistently ! //reach help even from offbeat doc locations. ! root=EnvGrabber.getEnvVar("SAND_HELP_ROOT"); } catch(IOException e) { System.out.println("HTTPConfigEditorNode couldn't find help root: " + e); |
|
From: Eric P. <th...@us...> - 2010-08-22 07:20:22
|
Update of /cvsroot/sandev/sand/platform/tools/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27980 Modified Files: Control.html Log Message: removed reference to SAND_HOME from comment Index: Control.html =================================================================== RCS file: /cvsroot/sandev/sand/platform/tools/docs/Control.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Control.html 5 Dec 2005 15:47:00 -0000 1.2 --- Control.html 22 Aug 2010 07:20:14 -0000 1.3 *************** *** 51,55 **** deployment WAR is created from the build result files: <ul> <li><code>THD_TaskHeapDemo.war</code> is unpacked into ! <code>%SAND_HOME%\platform\tools\build\wardeploy</code> <li>The <code>.jar</code> files are copied into a <code>lib</code> subdirectory. --- 51,55 ---- deployment WAR is created from the build result files: <ul> <li><code>THD_TaskHeapDemo.war</code> is unpacked into ! <code>sand/platform/tools/build/wardeploy</code> <li>The <code>.jar</code> files are copied into a <code>lib</code> subdirectory. |
|
From: Eric P. <th...@us...> - 2010-08-22 07:19:06
|
Update of /cvsroot/sandev/sand/platform/tools/build/generate/org/sandev/generator In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27788 Modified Files: ProjectIndexGenerator.java Log Message: Changed comment references to SAND_HOME to just "sand" as part of removing dependence on any environment variables to build. Also changed this in the generated doc output. Index: ProjectIndexGenerator.java =================================================================== RCS file: /cvsroot/sandev/sand/platform/tools/build/generate/org/sandev/generator/ProjectIndexGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ProjectIndexGenerator.java 8 Mar 2008 00:52:28 -0000 1.3 --- ProjectIndexGenerator.java 22 Aug 2010 07:18:58 -0000 1.4 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2003,2008 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2003,2008,2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 43,52 **** /** ! * Write out a navigable web of documentation through interlinked index ! * pages. The index pages have a navigable tree of the build, with ! * SAND_HOME as the root. The index.html file for a given project is ! * regenerated if any structs or nodes have been added or deleted, but ! * this generator does not track changes in documentation source. If ! * you delete the index.html file, it will be rebuilt. <BR> * * <P>Index page construction hooks: <UL> --- 43,53 ---- /** ! * Write out a navigable web of documentation through interlinked ! * index pages. The index pages have a navigable tree of the build, ! * with the top level sand directory as the root. The index.html file ! * for a given project is regenerated if any structs or nodes have ! * been added or deleted, but this generator does not track changes in ! * documentation source. If you delete the index.html file, it will ! * be rebuilt. <BR> * * <P>Index page construction hooks: <UL> *************** *** 57,61 **** * <LI><CODE>loclink.html</CODE> is used to create the local links for * any given project. ! * <LI><CODE>SAND_HOME/docs/globlink.html</CODE> is used to create the * global links for all projects. * </UL> --- 58,62 ---- * <LI><CODE>loclink.html</CODE> is used to create the local links for * any given project. ! * <LI><CODE>sand/docs/globlink.html</CODE> is used to create the * global links for all projects. * </UL> *************** *** 138,156 **** /** ! * Holds all the navtree elements as a list of canonical paths. ! * The paths all start with SAND_HOME and use forward slash notation. ! * The elements are then manipulated at display time to write out the ! * tree in HTML. An example value: <UL><CODE> ! * [0] "SAND_HOME/docs/index.html" ! * [1] "SAND_HOME/apps/docs/index.html" ! * [2] "SAND_HOME/apps/basics/docs/index.html" ! * [3] "SAND_HOME/apps/TaskHeap/docs/index.html" ! * [4] "SAND_HOME/deploy/docs/index.html" ! * [5] "SAND_HOME/deploy/TaskHeapDemo/docs/index.html" ! * [6] "SAND_HOME/platform/docs/index.html" ! * [7] "SAND_HOME/platform/tools/docs/index.html" * </CODE></UL> - * - * <P>Where "SAND_HOME" will vary depending on the environment. <BR> */ protected String[] webelems; --- 139,156 ---- /** ! * Holds all the navtree elements as a list of canonical paths. ! * The paths all start with the top level sand directory and use ! * forward slash notation. The elements are then manipulated at ! * display time to write out the tree in HTML. An example value: ! * <UL><CODE> ! * [0] "sand/docs/index.html" ! * [1] "sand/apps/docs/index.html" ! * [2] "sand/apps/basics/docs/index.html" ! * [3] "sand/apps/TaskHeap/docs/index.html" ! * [4] "sand/deploy/docs/index.html" ! * [5] "sand/deploy/TaskHeapDemo/docs/index.html" ! * [6] "sand/platform/docs/index.html" ! * [7] "sand/platform/tools/docs/index.html" * </CODE></UL> */ protected String[] webelems; *************** *** 165,169 **** /** ! * The directory specification for SAND_HOME. */ protected String sandhome; --- 165,169 ---- /** ! * The name of the top level sand directory used for build. */ protected String sandhome; *************** *** 175,181 **** /** ! * Starting from SAND_HOME, update the index pages according to the ! * mode specified. This method is used by both SandGenerator interface ! * methods, but may also be called directly. */ public void writeSandWeb(int mode,File baseDir) --- 175,182 ---- /** ! * Starting from the top level sand directory, update the index ! * pages according to the mode specified. This method is used by ! * both SandGenerator interface methods, but may also be called ! * directly. */ public void writeSandWeb(int mode,File baseDir) *************** *** 203,209 **** /** ! * Return the SAND_HOME directory with no trailing file separator. * This method assumes we are being called from the platform/tools ! * project, so baseDir is SAND_HOME/platform/tools/build and we * just need to walk upwards three levels. */ --- 204,210 ---- /** ! * Return the top level sand directory with no trailing file separator. * This method assumes we are being called from the platform/tools ! * project, so baseDir is sand/platform/tools/build and we * just need to walk upwards three levels. */ *************** *** 283,289 **** /** * Given a canonical webelem specification, return a platform ! * appropriate filename. Since the SAND_HOME portion of the web ! * element is set, this pretty much means changing the path ! * separator characters from forward slash to backslash if windoze. */ protected String getFileNameForWebElem(String elem) { --- 284,291 ---- /** * Given a canonical webelem specification, return a platform ! * appropriate filename. Since the top level sand directory name ! * portion of the web element is set, this pretty much means ! * changing the path separator characters from forward slash to ! * backslash if windoze. */ protected String getFileNameForWebElem(String elem) { *************** *** 352,356 **** retval=retval.substring(0,retval.lastIndexOf(indexfile)); if(retval.equals("")) { ! retval="SAND_HOME"; } return retval; } --- 354,358 ---- retval=retval.substring(0,retval.lastIndexOf(indexfile)); if(retval.equals("")) { ! retval="sand"; } return retval; } *************** *** 403,407 **** String currentry=getCoreSpec(i); if(currentry.equals("")) { ! currentry="SAND_HOME"; } else { currdepth=countSlashes(currentry)+1; --- 405,409 ---- String currentry=getCoreSpec(i); if(currentry.equals("")) { ! currentry="sand"; } else { currdepth=countSlashes(currentry)+1; *************** *** 464,470 **** /** ! * Return the relative path from a current element to SAND_HOME. ! * This will return ".." or "../.." or "../../.." since each element ! * starts in the /docs directory. */ protected String getRelSandHome(int elemindex) { --- 466,472 ---- /** ! * Return the relative path from a current element to the top ! * level sand directory. This will return ".." or "../.." or ! * "../../.." since each element starts in the /docs directory. */ protected String getRelSandHome(int elemindex) { *************** *** 485,489 **** /** * Count the number of forward slashes in the given String. Used for ! * computing the depth of a directory off of SAND_HOME. */ protected int countSlashes(String val) { --- 487,491 ---- /** * Count the number of forward slashes in the given String. Used for ! * computing the depth of a directory off of the top level sand dir. */ protected int countSlashes(String val) { *************** *** 526,530 **** /** ! * Write the global links. These are from SAND_HOME/docs/globlink.html * which we fetch from disk and dump out here. We need to translate * this contents relative to each page, so we read it each time. --- 528,532 ---- /** ! * Write the global links. These are from sand/docs/globlink.html * which we fetch from disk and dump out here. We need to translate * this contents relative to each page, so we read it each time. *************** *** 540,544 **** BufferedReader br=new BufferedReader(new FileReader(globlink)); for(String line=br.readLine();line!=null;line=br.readLine()) { ! String homesym="${SAND_HOME}"; int symindex=line.indexOf(homesym); if(symindex>=0) { --- 542,546 ---- BufferedReader br=new BufferedReader(new FileReader(globlink)); for(String line=br.readLine();line!=null;line=br.readLine()) { ! String homesym="../../.."; int symindex=line.indexOf(homesym); if(symindex>=0) { *************** *** 725,729 **** { String title=getCoreSpec(elemindex); ! String sandHomeTitle="SAND_HOME"; if(title.equals("")) { title=sandHomeTitle; } --- 727,731 ---- { String title=getCoreSpec(elemindex); ! String sandHomeTitle="sand"; if(title.equals("")) { title=sandHomeTitle; } |
|
From: Eric P. <th...@us...> - 2010-08-22 07:18:13
|
Update of /cvsroot/sandev/sand/platform/tools/build In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27722 Modified Files: build.xml Log Message: Replaced ${SAND_HOME} with ../../... Index: build.xml =================================================================== RCS file: /cvsroot/sandev/sand/platform/tools/build/build.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** build.xml 31 Jul 2008 18:37:34 -0000 1.18 --- build.xml 22 Aug 2010 07:18:05 -0000 1.19 *************** *** 314,318 **** <antcall target="w3.dtd.verify"> <param name="exedir" ! value="${SAND_HOME}/deploy/${deploymentname}/build"/> </antcall> <copy todir="${runenv.TOMCAT_HOME}/webapps"> --- 314,318 ---- <antcall target="w3.dtd.verify"> <param name="exedir" ! value="../../../deploy/${deploymentname}/build"/> </antcall> <copy todir="${runenv.TOMCAT_HOME}/webapps"> |
|
From: Eric P. <th...@us...> - 2010-08-22 07:17:03
|
Update of /cvsroot/sandev/sand/platform/sandbuild/src/org/sandev/sandbuild In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27633 Modified Files: SandProject.java Log Message: removed reference to SAND_HOME from comment Index: SandProject.java =================================================================== RCS file: /cvsroot/sandev/sand/platform/sandbuild/src/org/sandev/sandbuild/SandProject.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SandProject.java 30 Nov 2005 04:11:04 -0000 1.1.1.1 --- SandProject.java 22 Aug 2010 07:16:55 -0000 1.2 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2003 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2003,2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 682,688 **** /** ! * Return the SAND project name. This is the directory off SAND_HOME ! * (eg "apps" or "deploy"), followed by a forward slash, followed by ! * the name of the project. So for example "apps/basics". */ public String getSandName() { --- 682,689 ---- /** ! * Return the SAND project name. This is the project directory ! * off the top level sand directory (eg "apps" or "deploy"), ! * followed by a forward slash, followed by the name of the ! * project. So for example "apps/basics". */ public String getSandName() { |
|
From: Eric P. <th...@us...> - 2010-08-22 07:16:25
|
Update of /cvsroot/sandev/sand/platform/sandbuild/src/org/sandev/sandbuild In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27560 Modified Files: SandBuildDriver.java Log Message: replaced SAND_HOME ant property retrieval with getSandRootDirName Index: SandBuildDriver.java =================================================================== RCS file: /cvsroot/sandev/sand/platform/sandbuild/src/org/sandev/sandbuild/SandBuildDriver.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SandBuildDriver.java 30 Nov 2005 18:03:35 -0000 1.2 --- SandBuildDriver.java 22 Aug 2010 07:16:17 -0000 1.3 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2004 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2004,2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 143,147 **** /** ! * mutator for buildRoot. If buildRoot is null, and is being set * to something other than null, and buildTrigger is null, then set * buildTrigger as well. --- 143,147 ---- /** ! * Mutator for buildRoot. If buildRoot is null, and is being set * to something other than null, and buildTrigger is null, then set * buildTrigger as well. *************** *** 154,157 **** --- 154,185 ---- + /** + * A reference to the canonical name of the root sand directory. + * The default value is calculated off the current running root + * which is assumed to be xxx/sand/deploy/yyy/build + */ + protected static String sandRootDirName=null; + /** accessor for sandRootDirName */ + public static String getSandRootDirName() + { + try { + File file=new File("."); + String canpath=file.getCanonicalPath(); + canpath=canpath.substring(0,canpath.lastIndexOf(File.separator)); + canpath=canpath.substring(0,canpath.lastIndexOf(File.separator)); + canpath=canpath.substring(0,canpath.lastIndexOf(File.separator)); + sandRootDirName=canpath; + } catch(Exception e) { + e.printStackTrace(); + } + return sandRootDirName; + } + /** mutator for sandRootDirName */ + public static void setSandRootDirName(String rootDirName) + { + sandRootDirName=rootDirName; + } + + //////////////////////////////////////// // buildTrigger access *************** *** 598,603 **** ArrayList nodes=new ArrayList(); initSandDecls(root,allGens,structs,nodes); ! String declFiles=getDeclFiles(structs,nodes, ! root.getAntProject().getProperty("SAND_HOME")); String genPath=getGenPath(root); ArrayList all=new ArrayList(structs); --- 626,630 ---- ArrayList nodes=new ArrayList(); initSandDecls(root,allGens,structs,nodes); ! String declFiles=getDeclFiles(structs,nodes,getSandRootDirName()); String genPath=getGenPath(root); ArrayList all=new ArrayList(structs); *************** *** 925,944 **** /** ! * Use the given project to look up the SAND_HOME property from Ant. ! * Remove any trailing file separator character from the result. */ public static String getSandHome(SandProject proj) throws SandBuildException { ! if(proj==null) { ! throw new SandBuildException("SandBuildDriver.getSandHome: proj is null."); } ! if(proj.getAntProject()==null) { ! throw new SandBuildException("SandBuildDriver.getSandHome: proj.getAntProject() is null."); } ! String home=proj.getAntProject().getProperty("SAND_HOME"); ! if((home==null)||(home.equals(""))) { ! throw new SandBuildException("SandBuildDriver.getSandHome: unable to find SAND_HOME property."); } ! if((home.endsWith("/"))||(home.endsWith("\\"))) { ! home=home.substring(0,home.length()-1); } ! return home; } --- 952,962 ---- /** ! * This used to look up a root property from the current project, ! * now it just calls through to getSandRootDirName */ public static String getSandHome(SandProject proj) throws SandBuildException { ! return getSandRootDirName(); } |
|
From: Eric P. <th...@us...> - 2010-08-22 07:15:33
|
Update of /cvsroot/sandev/sand/platform/sandbuild/src/org/sandev/sandbuild In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27429 Modified Files: RequiredProject.java Log Message: Removed reference to SAND_HOME in code comment. Index: RequiredProject.java =================================================================== RCS file: /cvsroot/sandev/sand/platform/sandbuild/src/org/sandev/sandbuild/RequiredProject.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** RequiredProject.java 30 Nov 2005 04:11:00 -0000 1.1.1.1 --- RequiredProject.java 22 Aug 2010 07:15:25 -0000 1.2 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2003 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2003,2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 41,48 **** /** ! * This is the directory specification of the required project based ! * off of SAND_HOME. Use forward slashes as separators and don't ! * put any slashes ahead of the specification. So for example, the ! * basics project would be specified as "apps/basics". */ protected String sandDir=null; --- 41,49 ---- /** ! * This is the directory specification of the required project ! * based off of the top level sand directory. Use forward slashes ! * as separators and don't put any slashes ahead of the ! * specification. So for example, the basics project would be ! * specified as "apps/basics". */ protected String sandDir=null; |
|
From: Eric P. <th...@us...> - 2010-08-22 07:13:31
|
Update of /cvsroot/sandev/sand/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27230 Modified Files: globlink.html Log Message: Replaced ${SAND_HOME} with ../../.. Index: globlink.html =================================================================== RCS file: /cvsroot/sandev/sand/docs/globlink.html,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** globlink.html 30 Nov 2005 04:10:54 -0000 1.1.1.1 --- globlink.html 22 Aug 2010 07:13:23 -0000 1.2 *************** *** 1,2 **** ! <li><a href="${SAND_HOME}/apps/basics/build/genjavadoc/org/sandev/generator/tags/package-summary.html">basic @tags</a></li> ! <li><a href="${SAND_HOME}/platform/sandbuild/docs/javadoc/org/sandev/sandbuild/package-summary.html">sandbuild</a></li> --- 1,2 ---- ! <li><a href="../../../apps/basics/build/genjavadoc/org/sandev/generator/tags/package-summary.html">basic @tags</a></li> ! <li><a href="../../../platform/sandbuild/docs/javadoc/org/sandev/sandbuild/package-summary.html">sandbuild</a></li> |
|
From: Eric P. <th...@us...> - 2010-08-22 07:12:55
|
Update of /cvsroot/sandev/sand/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27101 Modified Files: dirmap.html Log Message: Removed reference to SAND_HOME. Index: dirmap.html =================================================================== RCS file: /cvsroot/sandev/sand/docs/dirmap.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dirmap.html 5 Dec 2005 15:50:11 -0000 1.2 --- dirmap.html 22 Aug 2010 07:12:47 -0000 1.3 *************** *** 20,25 **** <P><B><A Name="overview">project structure overview: </B><BR> ! <P>From the SAND_HOME directory (<CODE>/sand</CODE>), there are three ! primary directories: <UL> <LI><B>apps</B> for reusable struct/node applications <LI><B>deploy</B> for application deployments --- 20,25 ---- <P><B><A Name="overview">project structure overview: </B><BR> ! <P>From the top level <CODE>sand</CODE> directory, there are three ! primary subdirectories: <UL> <LI><B>apps</B> for reusable struct/node applications <LI><B>deploy</B> for application deployments *************** *** 95,99 **** <LI><B>docs/intro.html</B> the body contents of this file (if found) is pulled into the index.html to provide an overview. ! <LI><B>docs/globlink.html</B> (in SAND_HOME/docs only) is used to provide global links accessible from all index.html files. <LI><B>docs/loclink.html</B> is used to provide links accessible from --- 95,99 ---- <LI><B>docs/intro.html</B> the body contents of this file (if found) is pulled into the index.html to provide an overview. ! <LI><B>docs/globlink.html</B> (in top level sand/docs only) is used to provide global links accessible from all index.html files. <LI><B>docs/loclink.html</B> is used to provide links accessible from |
|
From: Eric P. <th...@us...> - 2010-08-22 07:12:25
|
Update of /cvsroot/sandev/sand/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27034 Modified Files: Deploy.html Log Message: Removed reference to SAND_HOME. Calling this the "top level sand directory" instead Index: Deploy.html =================================================================== RCS file: /cvsroot/sandev/sand/docs/Deploy.html,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Deploy.html 30 Nov 2005 04:10:54 -0000 1.1.1.1 --- Deploy.html 22 Aug 2010 07:12:16 -0000 1.2 *************** *** 19,31 **** <P><B><A Name="#deploydef">deployment definition: </B><BR> ! <P>An <I>application</I> is a project defined off the <CODE>apps</CODE> ! subdirectory of <CODE>SAND_HOME</CODE>. Applications are platform and ! technology neutral implementations of business logic, typically ! implemented using only standard Java. <BR> ! <P>A <I>deployment</I> is a project defined off the <CODE>deploy</CODE> ! subdirectory of <CODE>SAND_HOME</CODE>. A deployment typically requires ! one or more applications, which provide the message and node definitions ! to be instantiated as a working system. <BR> <P>The node instances (and other parameters necessary for deployment) are --- 19,33 ---- <P><B><A Name="#deploydef">deployment definition: </B><BR> ! <P>An <I>application</I> is a project defined off ! the <CODE>apps</CODE> subdirectory of the top level <CODE>sand</CODE> ! directory. Applications are platform and technology neutral ! implementations of business logic, typically implemented using only ! standard Java. <BR> ! <P>A <I>deployment</I> is a project defined off ! the <CODE>deploy</CODE> subdirectory of the top ! level <CODE>sand</CODE> directory. A deployment typically requires ! one or more applications, which provide the message and node ! definitions to be instantiated as a working system. <BR> <P>The node instances (and other parameters necessary for deployment) are |
|
From: Eric P. <th...@us...> - 2010-08-22 07:11:32
|
Update of /cvsroot/sandev/sand/deploy/TaskHeapDemo/build In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26947 Modified Files: initproj.xml Log Message: Replaced myriad references to ${runenv.SAND_HOME} with ../../.. Index: initproj.xml =================================================================== RCS file: /cvsroot/sandev/sand/deploy/TaskHeapDemo/build/initproj.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** initproj.xml 30 Jul 2008 22:08:04 -0000 1.8 --- initproj.xml 22 Aug 2010 07:11:24 -0000 1.9 *************** *** 50,55 **** <echo message=""/> <echo message="Initialization complete. Project directories"/> ! <echo message=" ${runenv.SAND_HOME}/apps/${projcode}"/> ! <echo message=" ${runenv.SAND_HOME}/deploy/${projcode}Main"/> <echo message="have been set up. Persistency assumed a local Postgres db"/> <echo message="named ${projcode} accessed by user 'postgres' pasword"/> --- 50,55 ---- <echo message=""/> <echo message="Initialization complete. Project directories"/> ! <echo message=" ../../../apps/${projcode}"/> ! <echo message=" ../../../deploy/${projcode}Main"/> <echo message="have been set up. Persistency assumed a local Postgres db"/> <echo message="named ${projcode} accessed by user 'postgres' pasword"/> *************** *** 58,62 **** <echo message="deployment build directory to compile/run. Access the"/> <echo message="deployed application from the docsite at"/> ! <echo message="${runenv.SAND_HOME}/index.html admin logon:"/> <echo message=" username: admin"/> <echo message=" password: changethis"/> --- 58,62 ---- <echo message="deployment build directory to compile/run. Access the"/> <echo message="deployed application from the docsite at"/> ! <echo message="../../../index.html admin logon:"/> <echo message=" username: admin"/> <echo message=" password: changethis"/> *************** *** 65,139 **** <target name="initApp"> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/build"/> ! <copy file="${runenv.SAND_HOME}/apps/TaskHeap/build/build.xml" ! todir="${runenv.SAND_HOME}/apps/${projcode}/build"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/build/build.xml"> <replacefilter token="TaskHeap" value="${projcode}"/> </replace> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/docs"/> <available property="appintro.html.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/docs/intro.html"/> <antcall target="write.appintro.html"/> <available property="objective.html.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/docs/Objective.html"/> <antcall target="write.objective.html"/> <available property="userstories.html.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/docs/UserStories.html"/> <antcall target="write.userstories.html"/> <available property="uireqs.html.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/docs/UIReqs.html"/> <antcall target="write.uireqs.html"/> <available property="apploclink.html.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/docs/loclink.html"/> <antcall target="write.apploclink.html"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/env"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/src"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs"/> <available property="UserStruct.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/${userclass}Struct.java"/> <antcall target="write.UserStruct.java"/> <available property="SystemStatusStruct.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/SystemStatusStruct.java"/> <antcall target="write.SystemStatusStruct.java"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI"/> <available property="SiteUINodeDecl.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINodeDecl.java"/> <antcall target="write.SiteUINodeDecl.java"/> <available property="SiteUINode.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINode.java"/> <antcall target="write.SiteUINode.java"/> <available property="UIActionHandler.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UIActionHandler.java"/> <antcall target="write.UIActionHandler.java"/> <available property="UINodeNameLookup.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UINodeNameLookup.java"/> <antcall target="write.UINodeNameLookup.java"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager"/> <available property="UpdateManagerNodeDecl.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNodeDecl.java"/> <antcall target="write.UpdateManagerNodeDecl.java"/> <available property="UpdateManagerNode.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNode.java"/> <antcall target="write.UpdateManagerNode.java"/> <available property="UpdateManagerException.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerException.java"/> <antcall target="write.UpdateManagerException.java"/> ! <mkdir dir="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup"/> <available property="UserLookupNodeDecl.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNodeDecl.java"/> <antcall target="write.UserLookupNodeDecl.java"/> <available property="UserLookupNode.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNode.java"/> <antcall target="write.UserLookupNode.java"/> <available property="AuthorizationException.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthorizationException.java"/> <antcall target="write.AuthorizationException.java"/> <available property="AuthFilterTMP.java.exists" ! file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthFilter${projcode}.java"/> <antcall target="write.AuthFilterTMP.java"/> </target> --- 65,139 ---- <target name="initApp"> ! <mkdir dir="../../../apps/${projcode}"/> ! <mkdir dir="../../../apps/${projcode}/build"/> ! <copy file="../../../apps/TaskHeap/build/build.xml" ! todir="../../../apps/${projcode}/build"/> ! <replace file="../../../apps/${projcode}/build/build.xml"> <replacefilter token="TaskHeap" value="${projcode}"/> </replace> ! <mkdir dir="../../../apps/${projcode}/docs"/> <available property="appintro.html.exists" ! file="../../../apps/${projcode}/docs/intro.html"/> <antcall target="write.appintro.html"/> <available property="objective.html.exists" ! file="../../../apps/${projcode}/docs/Objective.html"/> <antcall target="write.objective.html"/> <available property="userstories.html.exists" ! file="../../../apps/${projcode}/docs/UserStories.html"/> <antcall target="write.userstories.html"/> <available property="uireqs.html.exists" ! file="../../../apps/${projcode}/docs/UIReqs.html"/> <antcall target="write.uireqs.html"/> <available property="apploclink.html.exists" ! file="../../../apps/${projcode}/docs/loclink.html"/> <antcall target="write.apploclink.html"/> ! <mkdir dir="../../../apps/${projcode}/env"/> ! <mkdir dir="../../../apps/${projcode}/src"/> ! <mkdir dir="../../../apps/${projcode}/src/${topdom}"/> ! <mkdir dir="../../../apps/${projcode}/src/${topdom}/${subdom}"/> ! <mkdir dir="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}"/> ! <mkdir dir="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs"/> <available property="UserStruct.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/${userclass}Struct.java"/> <antcall target="write.UserStruct.java"/> <available property="SystemStatusStruct.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/SystemStatusStruct.java"/> <antcall target="write.SystemStatusStruct.java"/> ! <mkdir dir="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI"/> <available property="SiteUINodeDecl.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINodeDecl.java"/> <antcall target="write.SiteUINodeDecl.java"/> <available property="SiteUINode.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINode.java"/> <antcall target="write.SiteUINode.java"/> <available property="UIActionHandler.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UIActionHandler.java"/> <antcall target="write.UIActionHandler.java"/> <available property="UINodeNameLookup.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UINodeNameLookup.java"/> <antcall target="write.UINodeNameLookup.java"/> ! <mkdir dir="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager"/> <available property="UpdateManagerNodeDecl.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNodeDecl.java"/> <antcall target="write.UpdateManagerNodeDecl.java"/> <available property="UpdateManagerNode.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNode.java"/> <antcall target="write.UpdateManagerNode.java"/> <available property="UpdateManagerException.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerException.java"/> <antcall target="write.UpdateManagerException.java"/> ! <mkdir dir="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup"/> <available property="UserLookupNodeDecl.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNodeDecl.java"/> <antcall target="write.UserLookupNodeDecl.java"/> <available property="UserLookupNode.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNode.java"/> <antcall target="write.UserLookupNode.java"/> <available property="AuthorizationException.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthorizationException.java"/> <antcall target="write.AuthorizationException.java"/> <available property="AuthFilterTMP.java.exists" ! file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthFilter${projcode}.java"/> <antcall target="write.AuthFilterTMP.java"/> </target> *************** *** 141,149 **** <target name="initDeployment"> ! <mkdir dir="${runenv.SAND_HOME}/deploy/${projcode}Main"/> ! <mkdir dir="${runenv.SAND_HOME}/deploy/${projcode}Main/build"/> ! <copy file="${runenv.SAND_HOME}/deploy/TaskHeapDemo/build/build.xml" ! todir="${runenv.SAND_HOME}/deploy/${projcode}Main/build"/> ! <replace file="${runenv.SAND_HOME}/deploy/${projcode}Main/build/build.xml"> <replacefilter token="TaskHeapDemo" value="${projcode}Main"/> --- 141,149 ---- <target name="initDeployment"> ! <mkdir dir="../../../deploy/${projcode}Main"/> ! <mkdir dir="../../../deploy/${projcode}Main/build"/> ! <copy file="../../../deploy/TaskHeapDemo/build/build.xml" ! todir="../../../deploy/${projcode}Main/build"/> ! <replace file="../../../deploy/${projcode}Main/build/build.xml"> <replacefilter token="TaskHeapDemo" value="${projcode}Main"/> *************** *** 165,194 **** value="${userclass}"/> </replace> ! <mkdir dir="${runenv.SAND_HOME}/deploy/${projcode}Main/docs"/> <available property="depintro.html.exists" ! file="${runenv.SAND_HOME}/deploy/${projcode}Main/docs/intro.html"/> <antcall target="write.depintro.html"/> ! <mkdir dir="${runenv.SAND_HOME}/deploy/${projcode}Main/env"/> <available property="TMPFormHelpMessages.properties.exists" ! file="${runenv.SAND_HOME}/deploy/${projcode}Main/env/TMPFormHelpMessages.properties"/> <antcall target="write.TMPFormHelpMessages.properties"/> <available property="config.xml.exists" ! file="${runenv.SAND_HOME}/deploy/${projcode}Main/env/config.xml"/> <antcall target="write.config.xml"/> <available property="TMPMainSandUI.xml.exists" ! file="${runenv.SAND_HOME}/deploy/${projcode}Main/env/${projcode}MainSandUI.xml"/> <antcall target="write.TMPMainSandUI.xml"/> ! <mkdir dir="${runenv.SAND_HOME}/deploy/${projcode}Main/webapp"/> ! <mkdir dir="${runenv.SAND_HOME}/deploy/${projcode}Main/webapp/images"/> ! <copy todir="${runenv.SAND_HOME}/deploy/${projcode}Main/webapp/images"> ! <fileset dir="${runenv.SAND_HOME}/docs/projtmpl/deploy/webapp/images"/> </copy> ! <mkdir dir="${runenv.SAND_HOME}/deploy/${projcode}Main/webapp/docs"/> ! <copy todir="${runenv.SAND_HOME}/deploy/${projcode}Main/webapp/docs"> ! <fileset dir="${runenv.SAND_HOME}/docs/projtmpl/deploy/webapp/docs"/> </copy> ! <mkdir dir="${runenv.SAND_HOME}/deploy/${projcode}Main/webapp/templates"/> ! <copy todir="${runenv.SAND_HOME}/deploy/${projcode}Main/webapp/templates"> ! <fileset dir="${runenv.SAND_HOME}/docs/projtmpl/deploy/webapp/templates"/> </copy> </target> --- 165,194 ---- value="${userclass}"/> </replace> ! <mkdir dir="../../../deploy/${projcode}Main/docs"/> <available property="depintro.html.exists" ! file="../../../deploy/${projcode}Main/docs/intro.html"/> <antcall target="write.depintro.html"/> ! <mkdir dir="../../../deploy/${projcode}Main/env"/> <available property="TMPFormHelpMessages.properties.exists" ! file="../../../deploy/${projcode}Main/env/TMPFormHelpMessages.properties"/> <antcall target="write.TMPFormHelpMessages.properties"/> <available property="config.xml.exists" ! file="../../../deploy/${projcode}Main/env/config.xml"/> <antcall target="write.config.xml"/> <available property="TMPMainSandUI.xml.exists" ! file="../../../deploy/${projcode}Main/env/${projcode}MainSandUI.xml"/> <antcall target="write.TMPMainSandUI.xml"/> ! <mkdir dir="../../../deploy/${projcode}Main/webapp"/> ! <mkdir dir="../../../deploy/${projcode}Main/webapp/images"/> ! <copy todir="../../../deploy/${projcode}Main/webapp/images"> ! <fileset dir="../../../docs/projtmpl/deploy/webapp/images"/> </copy> ! <mkdir dir="../../../deploy/${projcode}Main/webapp/docs"/> ! <copy todir="../../../deploy/${projcode}Main/webapp/docs"> ! <fileset dir="../../../docs/projtmpl/deploy/webapp/docs"/> </copy> ! <mkdir dir="../../../deploy/${projcode}Main/webapp/templates"/> ! <copy todir="../../../deploy/${projcode}Main/webapp/templates"> ! <fileset dir="../../../docs/projtmpl/deploy/webapp/templates"/> </copy> </target> *************** *** 198,202 **** <antcall target="writeHTMLFile"> <param name="filename" ! value="${runenv.SAND_HOME}/apps/${projcode}/docs/intro.html"/> <param name="title" value="${projcode} application description"/> </antcall> --- 198,202 ---- <antcall target="writeHTMLFile"> <param name="filename" ! value="../../../apps/${projcode}/docs/intro.html"/> <param name="title" value="${projcode} application description"/> </antcall> *************** *** 207,211 **** <antcall target="writeHTMLFile"> <param name="filename" ! value="${runenv.SAND_HOME}/apps/${projcode}/docs/Objective.html"/> <param name="title" value="${projcode} application objective"/> </antcall> --- 207,211 ---- <antcall target="writeHTMLFile"> <param name="filename" ! value="../../../apps/${projcode}/docs/Objective.html"/> <param name="title" value="${projcode} application objective"/> </antcall> *************** *** 216,220 **** <antcall target="writeHTMLFile"> <param name="filename" ! value="${runenv.SAND_HOME}/apps/${projcode}/docs/UserStories.html"/> <param name="title" value="${projcode} User Stories"/> </antcall> --- 216,220 ---- <antcall target="writeHTMLFile"> <param name="filename" ! value="../../../apps/${projcode}/docs/UserStories.html"/> <param name="title" value="${projcode} User Stories"/> </antcall> *************** *** 225,229 **** <antcall target="writeHTMLFile"> <param name="filename" ! value="${runenv.SAND_HOME}/apps/${projcode}/docs/UIReqs.html"/> <param name="title" value="${projcode} User Interface Requirements"/> </antcall> --- 225,229 ---- <antcall target="writeHTMLFile"> <param name="filename" ! value="../../../apps/${projcode}/docs/UIReqs.html"/> <param name="title" value="${projcode} User Interface Requirements"/> </antcall> *************** *** 234,239 **** a link to it in the application docs --> <target name="write.apploclink.html" unless="apploclink.html.exists"> ! <echo message="writing ${runenv.SAND_HOME}/apps/${projcode}/docs/loclink.html"/> ! <echo file="${runenv.SAND_HOME}/apps/${projcode}/docs/loclink.html"> <li><a href="javadoc/${topdom}/${subdom}/${projcode}/util/package-summary.html">util</a></li> </echo> --- 234,239 ---- a link to it in the application docs --> <target name="write.apploclink.html" unless="apploclink.html.exists"> ! <echo message="writing ../../../apps/${projcode}/docs/loclink.html"/> ! <echo file="../../../apps/${projcode}/docs/loclink.html"> <li><a href="javadoc/${topdom}/${subdom}/${projcode}/util/package-summary.html">util</a></li> </echo> *************** *** 242,248 **** <target name="write.UserStruct.java" unless="UserStruct.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/structs/UserStruct.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/${userclass}Struct.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/${userclass}Struct.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 242,248 ---- <target name="write.UserStruct.java" unless="UserStruct.java.exists"> ! <copy file="../../../docs/projtmpl/structs/UserStruct.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/${userclass}Struct.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/${userclass}Struct.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 254,260 **** <target name="write.SystemStatusStruct.java" unless="SystemStatusStruct.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/structs/SystemStatusStruct.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/SystemStatusStruct.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/SystemStatusStruct.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 254,260 ---- <target name="write.SystemStatusStruct.java" unless="SystemStatusStruct.java.exists"> ! <copy file="../../../docs/projtmpl/structs/SystemStatusStruct.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/SystemStatusStruct.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/structs/SystemStatusStruct.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 266,272 **** <target name="write.SiteUINodeDecl.java" unless="SiteUINodeDecl.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/SiteUI/SiteUINodeDecl.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINodeDecl.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINodeDecl.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 266,272 ---- <target name="write.SiteUINodeDecl.java" unless="SiteUINodeDecl.java.exists"> ! <copy file="../../../docs/projtmpl/SiteUI/SiteUINodeDecl.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINodeDecl.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINodeDecl.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 278,284 **** <target name="write.SiteUINode.java" unless="SiteUINode.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/SiteUI/SiteUINode.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINode.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINode.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 278,284 ---- <target name="write.SiteUINode.java" unless="SiteUINode.java.exists"> ! <copy file="../../../docs/projtmpl/SiteUI/SiteUINode.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINode.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINode.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 289,293 **** </replace> <!-- second pass to fix overzealous replacement --> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINode.java"> <replacefilter token="call${userclass}Query" value="callAccountQuery"/> --- 289,293 ---- </replace> <!-- second pass to fix overzealous replacement --> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/SiteUINode.java"> <replacefilter token="call${userclass}Query" value="callAccountQuery"/> *************** *** 297,303 **** <target name="write.UIActionHandler.java" unless="UIActionHandler.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/SiteUI/UIActionHandler.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UIActionHandler.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UIActionHandler.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 297,303 ---- <target name="write.UIActionHandler.java" unless="UIActionHandler.java.exists"> ! <copy file="../../../docs/projtmpl/SiteUI/UIActionHandler.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UIActionHandler.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UIActionHandler.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 311,317 **** <target name="write.UINodeNameLookup.java" unless="UINodeNameLookup.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/SiteUI/UINodeNameLookup.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UINodeNameLookup.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UINodeNameLookup.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 311,317 ---- <target name="write.UINodeNameLookup.java" unless="UINodeNameLookup.java.exists"> ! <copy file="../../../docs/projtmpl/SiteUI/UINodeNameLookup.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UINodeNameLookup.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/SiteUI/UINodeNameLookup.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 321,327 **** <target name="write.UpdateManagerNodeDecl.java" unless="UpdateManagerNodeDecl.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/UpdateManager/UpdateManagerNodeDecl.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNodeDecl.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNodeDecl.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 321,327 ---- <target name="write.UpdateManagerNodeDecl.java" unless="UpdateManagerNodeDecl.java.exists"> ! <copy file="../../../docs/projtmpl/UpdateManager/UpdateManagerNodeDecl.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNodeDecl.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNodeDecl.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 333,339 **** <target name="write.UpdateManagerNode.java" unless="UpdateManagerNode.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/UpdateManager/UpdateManagerNode.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNode.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNode.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 333,339 ---- <target name="write.UpdateManagerNode.java" unless="UpdateManagerNode.java.exists"> ! <copy file="../../../docs/projtmpl/UpdateManager/UpdateManagerNode.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNode.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNode.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 342,346 **** </replace> <!-- second pass to fix overzealous replacement --> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNode.java"> <replacefilter token="call${userclass}Query" value="callAccountQuery"/> --- 342,346 ---- </replace> <!-- second pass to fix overzealous replacement --> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerNode.java"> <replacefilter token="call${userclass}Query" value="callAccountQuery"/> *************** *** 350,356 **** <target name="write.UpdateManagerException.java" unless="UpdateManagerException.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/UpdateManager/UpdateManagerException.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerException.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerException.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 350,356 ---- <target name="write.UpdateManagerException.java" unless="UpdateManagerException.java.exists"> ! <copy file="../../../docs/projtmpl/UpdateManager/UpdateManagerException.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerException.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UpdateManager/UpdateManagerException.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 360,366 **** <target name="write.UserLookupNodeDecl.java" unless="UserLookupNodeDecl.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/UserLookup/UserLookupNodeDecl.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNodeDecl.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNodeDecl.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 360,366 ---- <target name="write.UserLookupNodeDecl.java" unless="UserLookupNodeDecl.java.exists"> ! <copy file="../../../docs/projtmpl/UserLookup/UserLookupNodeDecl.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNodeDecl.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNodeDecl.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 372,378 **** <target name="write.UserLookupNode.java" unless="UserLookupNode.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/UserLookup/UserLookupNode.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNode.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNode.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 372,378 ---- <target name="write.UserLookupNode.java" unless="UserLookupNode.java.exists"> ! <copy file="../../../docs/projtmpl/UserLookup/UserLookupNode.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNode.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNode.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 381,385 **** </replace> <!-- second pass to fix overzealous replacement --> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNode.java"> <replacefilter token="call${userclass}Query" value="callAccountQuery"/> --- 381,385 ---- </replace> <!-- second pass to fix overzealous replacement --> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/UserLookupNode.java"> <replacefilter token="call${userclass}Query" value="callAccountQuery"/> *************** *** 389,395 **** <target name="write.AuthorizationException.java" unless="AuthorizationException.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/UserLookup/AuthorizationException.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthorizationException.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthorizationException.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 389,395 ---- <target name="write.AuthorizationException.java" unless="AuthorizationException.java.exists"> ! <copy file="../../../docs/projtmpl/UserLookup/AuthorizationException.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthorizationException.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthorizationException.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 399,405 **** <target name="write.AuthFilterTMP.java" unless="AuthFilterTMP.java.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/UserLookup/AuthFilterTMP.java" ! tofile="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthFilter${projcode}.java"/> ! <replace file="${runenv.SAND_HOME}/apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthFilter${projcode}.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> --- 399,405 ---- <target name="write.AuthFilterTMP.java" unless="AuthFilterTMP.java.exists"> ! <copy file="../../../docs/projtmpl/UserLookup/AuthFilterTMP.java" ! tofile="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthFilter${projcode}.java"/> ! <replace file="../../../apps/${projcode}/src/${topdom}/${subdom}/${projcode}/UserLookup/AuthFilter${projcode}.java"> <replacefilter token="org.sandev.projtmpl" value="${topdom}.${subdom}.${projcode}"/> *************** *** 413,434 **** <target name="write.depintro.html" unless="depintro.html.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/deploy/docs/intro.html" ! tofile="${runenv.SAND_HOME}/deploy/${projcode}Main/docs/intro.html"/> ! <replace file="${runenv.SAND_HOME}/deploy/${projcode}Main/docs/intro.html"> <replacefilter token="Template" value="${projcode}"/> </replace> ! <mkdir dir="${runenv.SAND_HOME}/deploy/${projcode}Main/docs/images"/> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/deploy/docs/images/deploy.ins" ! tofile="${runenv.SAND_HOME}/deploy/${projcode}Main/docs/images/deploy.ins"/> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/deploy/docs/images/deploy.gif" ! tofile="${runenv.SAND_HOME}/deploy/${projcode}Main/docs/images/deploy.gif"/> </target> <target name="write.TMPFormHelpMessages.properties" unless="TMPFormHelpMessages.properties.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/deploy/env/TMPFormHelpMessages.properties" ! tofile="${runenv.SAND_HOME}/deploy/${projcode}Main/env/${projcode}FormHelpMessages.properties"/> ! <replace file="${runenv.SAND_HOME}/deploy/${projcode}Main/env/${projcode}FormHelpMessages.properties"> <replacefilter token="TMP" value="${projcode}"/> --- 413,434 ---- <target name="write.depintro.html" unless="depintro.html.exists"> ! <copy file="../../../docs/projtmpl/deploy/docs/intro.html" ! tofile="../../../deploy/${projcode}Main/docs/intro.html"/> ! <replace file="../../../deploy/${projcode}Main/docs/intro.html"> <replacefilter token="Template" value="${projcode}"/> </replace> ! <mkdir dir="../../../deploy/${projcode}Main/docs/images"/> ! <copy file="../../../docs/projtmpl/deploy/docs/images/deploy.ins" ! tofile="../../../deploy/${projcode}Main/docs/images/deploy.ins"/> ! <copy file="../../../docs/projtmpl/deploy/docs/images/deploy.gif" ! tofile="../../../deploy/${projcode}Main/docs/images/deploy.gif"/> </target> <target name="write.TMPFormHelpMessages.properties" unless="TMPFormHelpMessages.properties.exists"> ! <copy file="../../../docs/projtmpl/deploy/env/TMPFormHelpMessages.properties" ! tofile="../../../deploy/${projcode}Main/env/${projcode}FormHelpMessages.properties"/> ! <replace file="../../../deploy/${projcode}Main/env/${projcode}FormHelpMessages.properties"> <replacefilter token="TMP" value="${projcode}"/> *************** *** 438,447 **** <target name="write.config.xml" unless="config.xml.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/deploy/env/config.xml" ! tofile="${runenv.SAND_HOME}/deploy/${projcode}Main/env/config.xml"/> <taskdef name="passgen" classname="org.sandev.sandbuild.PassGen"/> <passgen name="intcommpw" length="32"/> <passgen name="guestpw" length="32"/> ! <replace file="${runenv.SAND_HOME}/deploy/${projcode}Main/env/config.xml"> <replacefilter token="org.sandev.basics.Authorizer.DummyAuthFilter" value="${topdom}.${subdom}.${projcode}.UserLookup.AuthFilter${projcode}"/> --- 438,447 ---- <target name="write.config.xml" unless="config.xml.exists"> ! <copy file="../../../docs/projtmpl/deploy/env/config.xml" ! tofile="../../../deploy/${projcode}Main/env/config.xml"/> <taskdef name="passgen" classname="org.sandev.sandbuild.PassGen"/> <passgen name="intcommpw" length="32"/> <passgen name="guestpw" length="32"/> ! <replace file="../../../deploy/${projcode}Main/env/config.xml"> <replacefilter token="org.sandev.basics.Authorizer.DummyAuthFilter" value="${topdom}.${subdom}.${projcode}.UserLookup.AuthFilter${projcode}"/> *************** *** 464,468 **** </replace> <!-- second pass to fix overzealous replacements --> ! <replace file="${runenv.SAND_HOME}/deploy/${projcode}Main/env/config.xml"> <replacefilter token="outgoingSync${userclass}Query" value="outgoingSyncAccountQuery"/> --- 464,468 ---- </replace> <!-- second pass to fix overzealous replacements --> ! <replace file="../../../deploy/${projcode}Main/env/config.xml"> <replacefilter token="outgoingSync${userclass}Query" value="outgoingSyncAccountQuery"/> *************** *** 472,478 **** <target name="write.TMPMainSandUI.xml" unless="TMPMainSandUI.xml.exists"> ! <copy file="${runenv.SAND_HOME}/docs/projtmpl/deploy/env/TMPMainSandUI.xml" ! tofile="${runenv.SAND_HOME}/deploy/${projcode}Main/env/${projcode}MainSandUI.xml"/> ! <replace file="${runenv.SAND_HOME}/deploy/${projcode}Main/env/${projcode}MainSandUI.xml"> <replacefilter token="TMP" value="${projcode}"/> --- 472,478 ---- <target name="write.TMPMainSandUI.xml" unless="TMPMainSandUI.xml.exists"> ! <copy file="../../../docs/projtmpl/deploy/env/TMPMainSandUI.xml" ! tofile="../../../deploy/${projcode}Main/env/${projcode}MainSandUI.xml"/> ! <replace file="../../../deploy/${projcode}Main/env/${projcode}MainSandUI.xml"> <replacefilter token="TMP" value="${projcode}"/> |
|
From: Eric P. <th...@us...> - 2010-08-22 07:09:09
|
Update of /cvsroot/sandev/sand/apps/basics/build In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26587 Modified Files: mainbuild.xml Log Message: removed SAND_HOME property previously set to ${runenv.SAND_HOME} modified scrubgen and other targets to use ../../.. rather than ${SANDHOME} as the base directory reference. Index: mainbuild.xml =================================================================== RCS file: /cvsroot/sandev/sand/apps/basics/build/mainbuild.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mainbuild.xml 19 Aug 2010 23:38:35 -0000 1.27 --- mainbuild.xml 22 Aug 2010 07:09:00 -0000 1.28 *************** *** 151,156 **** **************************************** --> - <!-- main root for referencing between dependent projects --> - <property name="SAND_HOME" value="${runenv.SAND_HOME}"/> <!-- need tools for code generators --> <property name="JAVA_LIB" value="${runenv.JAVA_HOME}/lib"/> --- 151,154 ---- *************** *** 509,526 **** ! <!-- Hard clean just the generator output. If you get into a circular ! build problem due to a partially compiled generator tag, use this ! target to scrub just the generator classes so you can get back to ! work. This solves the problem where some partially compiled generator ! classes are out of sync with others and the build doesn't make it ! through the initial setup it needs. --> <target name="scrubgen" depends="checkenv"> ! <delete dir="${SAND_HOME}/apps/basics/build/genclasses"/> ! <delete dir="${SAND_HOME}/apps/ui/build/genclasses"/> ! <delete file="${SAND_HOME}/apps/basics/build/env/basics_gen.jar" failonerror="false"/> ! <delete file="${SAND_HOME}/apps/basics/build/env/ui_gen.jar" failonerror="false"/> </target> --- 507,527 ---- ! <!-- Hard clean just the generator output. If your build get stuck ! due to a partially compiled generator tag, and you can't build or ! scrub, use this target to scrub just the generator classes so you can ! get back to work. This solves the problem where some partially ! compiled generator classes are out of sync with others and the build ! doesn't make it through the initial setup it needs. ! ! This assumes that we are in sand/apps/basics/build (or ! sand/xxx/xxx/xxx), and it only cleans out generators from basics or ui --> <target name="scrubgen" depends="checkenv"> ! <delete file="../../../apps/basics/build/env/basics_gen.jar" failonerror="false"/> ! <delete file="../../../apps/basics/build/env/ui_gen.jar" failonerror="false"/> + <delete dir="../../../apps/basics/build/genclasses"/> + <delete dir="../../../apps/ui/build/genclasses"/> </target> *************** *** 667,708 **** <scp todir="${publish.username}:${publish.password}@${publish.server}:${publish.remotedir}" trust="true"> ! <fileset dir="${SAND_HOME}"> <include name="sand.zip"/> </fileset> </scp> ! <delete file="${SAND_HOME}/sand.zip"/> <!-- Unpack the docs on the server --> <get src="http://${publish.server}/cgi-bin/unzip.cgi" ! dest="${SAND_HOME}/unused.foo" verbose="true"/> ! <delete file="${SAND_HOME}/unused.foo"/> </target> <!-- Zip everything except CVS files and FTP the result to sourceforge --> <target name="publish.release" depends="publish.release.zip"> ! <echo message="FTP is no longer supported by sourceforge. Use web upload."/> ! <!-- ! <taskdef name="ftp" classname="org.apache.tools.ant.taskdefs.optional.net.FTP"/> ! <ftp server="upload.sourceforge.net" ! userid="anonymous" ! password="bu...@sa..." ! remotedir="incoming" ! depends="yes" ! passive="yes" ! ignoreNoncriticalErrors="yes" ! > ! <fileset dir="${SAND_HOME}/../"> ! <include name="${publish.releasename}.zip"/> ! </fileset> ! </ftp> ! <delete file="${SAND_HOME}/../${publish.releasename}.zip"/> ! <echo message="don't forget to update publish.releasename in mainbuild.xml"/> ! --> </target> <!-- Zip all the open source code minus the CVS files --> <target name="publish.release.zip" depends="scrub"> ! <zip destfile="${SAND_HOME}/../${publish.releasename}.zip"> ! <fileset dir="${SAND_HOME}/../"> <include name="sand/readme.html"/> <include name="sand/apps/basics/**/*.*"/> --- 668,692 ---- <scp todir="${publish.username}:${publish.password}@${publish.server}:${publish.remotedir}" trust="true"> ! <fileset dir="../../../"> <include name="sand.zip"/> </fileset> </scp> ! <delete file="../../../sand.zip"/> <!-- Unpack the docs on the server --> <get src="http://${publish.server}/cgi-bin/unzip.cgi" ! dest="../../../unused.foo" verbose="true"/> ! <delete file="../../../unused.foo"/> </target> <!-- Zip everything except CVS files and FTP the result to sourceforge --> <target name="publish.release" depends="publish.release.zip"> ! <echo message="Upload ${publish.releasename}.zip using the sourceforge admin interface."/> </target> <!-- Zip all the open source code minus the CVS files --> <target name="publish.release.zip" depends="scrub"> ! <zip destfile="../../../../${publish.releasename}.zip"> ! <fileset dir="../../../../"> <include name="sand/readme.html"/> <include name="sand/apps/basics/**/*.*"/> *************** *** 721,726 **** <!-- zip only the open source docs into SAND_HOME/sand.zip --> <target name="release.zip.docs" depends="checkenv"> ! <zip destfile="${SAND_HOME}/sand.zip"> ! <fileset dir="${SAND_HOME}/../"> <include name="sand/*.html"/> <include name="sand/docs/**/*.*"/> --- 705,710 ---- <!-- zip only the open source docs into SAND_HOME/sand.zip --> <target name="release.zip.docs" depends="checkenv"> ! <zip destfile="../../../sand.zip"> ! <fileset dir="../../../../"> <include name="sand/*.html"/> <include name="sand/docs/**/*.*"/> *************** *** 745,750 **** <!-- zip all the docs into SAND_HOME/sand.zip --> <target name="zip.docs" depends="checkenv"> ! <zip destfile="${SAND_HOME}/sand.zip"> ! <fileset dir="${SAND_HOME}/../"> <include name="sand/**/docs/**/*.*"/> <include name="sand/**/genjavadoc/**/*.*"/> --- 729,734 ---- <!-- zip all the docs into SAND_HOME/sand.zip --> <target name="zip.docs" depends="checkenv"> ! <zip destfile="../../../sand.zip"> ! <fileset dir="../../../../"> <include name="sand/**/docs/**/*.*"/> <include name="sand/**/genjavadoc/**/*.*"/> *************** *** 761,766 **** <!-- zip all the executable .jar/.war/.sar files into SAND_HOME/sandexe.zip --> <target name="zip.exe" depends="checkenv"> ! <zip destfile="${SAND_HOME}/sandexe.zip"> ! <fileset dir="${SAND_HOME}/platform/tools/env"> <include name="*.jar"/> <include name="*.war"/> --- 745,750 ---- <!-- zip all the executable .jar/.war/.sar files into SAND_HOME/sandexe.zip --> <target name="zip.exe" depends="checkenv"> ! <zip destfile="../../../sandexe.zip"> ! <fileset dir="../../../platform/tools/env"> <include name="*.jar"/> <include name="*.war"/> |
|
From: Eric P. <th...@us...> - 2010-08-22 07:07:44
|
Update of /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26478 Modified Files: PackageHTMLGenerator.java Log Message: Reworded comment to not mention SAND_HOME Index: PackageHTMLGenerator.java =================================================================== RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/PackageHTMLGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PackageHTMLGenerator.java 31 Jul 2008 17:27:14 -0000 1.3 --- PackageHTMLGenerator.java 22 Aug 2010 07:07:36 -0000 1.4 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2003,2006 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2003,2006,2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 257,265 **** * <li>We are in the package-summary.html file for a node definition. * This has the format ! * SAND_HOME/apps/SOMEAPP/docs/javadoc/DOMAINCLASS/DOMAIN/APPNAME/NODENAME/package-summary.html ! * so ../../../../../../../.. is the relative path to SAND_HOME * <li>Everything after and including the first occurrence of "/apps/" * in the target docfile can be appended to the relative path for ! * SAND_HOME to form a relative link URL. * </ol> */ --- 257,266 ---- * <li>We are in the package-summary.html file for a node definition. * This has the format ! * sand/apps/SOMEAPP/docs/javadoc/DOMAINCLASS/DOMAIN/APPNAME/NODENAME/package-summary.html ! * so ../../../../../../../.. is the relative path to the top ! * level sand directory. * <li>Everything after and including the first occurrence of "/apps/" * in the target docfile can be appended to the relative path for ! * the root sand directory to form a relative link URL. * </ol> */ |
|
From: Eric P. <th...@us...> - 2010-08-22 07:07:01
|
Update of /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26342 Modified Files: FuncSpecGenerator.java Log Message: Reworded comment to not mention SAND_HOME Index: FuncSpecGenerator.java =================================================================== RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/FuncSpecGenerator.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** FuncSpecGenerator.java 31 Mar 2009 01:19:30 -0000 1.10 --- FuncSpecGenerator.java 22 Aug 2010 07:06:52 -0000 1.11 *************** *** 1,5 **** /* * SAND development/deployment environment ! * Copyright (C) 2004-2006,2008-2009 SAND Services Inc. * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* * SAND development/deployment environment ! * Copyright (C) 2004-2006,2008-2010 SAND Services Inc. * * This library is free software; you can redistribute it and/or *************** *** 148,155 **** extra=extra.replace('/','\\'); } String sandhome=baseDir.toString(); ! //start off in something like SAND_HOME/deploy/TaskHeapDemo/build sandhome=sandhome.substring(0,sandhome.lastIndexOf(File.separator)); sandhome=sandhome.substring(0,sandhome.lastIndexOf(File.separator)); sandhome=sandhome.substring(0,sandhome.lastIndexOf(File.separator)+1); String appdocs=sandhome + extra + File.separator + "docs"; String depdocs=baseDir.toString(); --- 148,156 ---- extra=extra.replace('/','\\'); } String sandhome=baseDir.toString(); ! //start off in something like sand/deploy/TaskHeapDemo/build sandhome=sandhome.substring(0,sandhome.lastIndexOf(File.separator)); sandhome=sandhome.substring(0,sandhome.lastIndexOf(File.separator)); sandhome=sandhome.substring(0,sandhome.lastIndexOf(File.separator)+1); + //now up 3 levels to something like sand/ String appdocs=sandhome + extra + File.separator + "docs"; String depdocs=baseDir.toString(); |
|
From: Eric P. <th...@us...> - 2010-08-19 23:39:50
|
Update of /cvsroot/sandev/sand/platform/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30021 Modified Files: ReleaseProcess.html Log Message: Updated the release steps a bit to reflect changes to sourceforge and how we work. Index: ReleaseProcess.html =================================================================== RCS file: /cvsroot/sandev/sand/platform/docs/ReleaseProcess.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ReleaseProcess.html 14 Aug 2010 17:39:20 -0000 1.4 --- ReleaseProcess.html 19 Aug 2010 23:39:42 -0000 1.5 *************** *** 30,48 **** <li>Make sure the TaskHeapDemo UI comes up </ul> ! <li>Tag the tree in CVS as sandev_x_y (select sand, ! Modify|Create a tag on selection) <li><code>ant publish.docs</code> (publishes the release documentation) ! <li><code>ant publish.release</code> (srubs and creates the release file) ! <li>Log on to sourceforge and create the release. Post the ! <a href="release.txt">release text</a> into the release notes and ! a corresponding news item. Preserve the preformatted text so the ! line breaks come through. ! <li>After the files all post (it can take a few minutes for them to show ! up), verify the news is readable and download the release file onto ! a clean box. Build and run to make sure nothing was lost in transit ! except the CVS directories. <li>Update the <code>publish.releasename</code> property in <CODE>mainbuild.xml</CODE> with the next release number, then clear out <CODE>release.txt</CODE> to ready for the next release. </ol></p> --- 30,58 ---- <li>Make sure the TaskHeapDemo UI comes up </ul> ! <li>Tag the tree in CVS as sandev_x_y ! <!-- Used to publish docs to sandev.org but nobody reads it so it is not ! worth doing anymore <li><code>ant publish.docs</code> (publishes the release documentation) ! --> ! <li><code>ant publish.release</code> (scrubs and then creates the ! release file leaving it above the top level sand directory). ! Upload the release file to sourceforge using their admin interface. ! ! <!-- It doesn't seem like this is part of the sourceforge interface ! anymore, or at least it wasn't easily accessible and the download ! link was created automatically. If this gets to be part of their ! process again then uncomment this step. ! <li>Create the release, pasting the <a href="release.txt">release text</a> ! into the release notes and a corresponding news item. Preserve the ! preformatted text so the line breaks come through. ! --> ! ! <li>Download and verify the release file contents. Should have everything ! required to build without any CVS directories. ! <li>Update the <code>publish.releasename</code> property in <CODE>mainbuild.xml</CODE> with the next release number, then clear out <CODE>release.txt</CODE> to ready for the next release. + </ol></p> |
|
From: Eric P. <th...@us...> - 2010-08-19 23:38:43
|
Update of /cvsroot/sandev/sand/apps/basics/build In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29901 Modified Files: mainbuild.xml Log Message: Ready next release version. Index: mainbuild.xml =================================================================== RCS file: /cvsroot/sandev/sand/apps/basics/build/mainbuild.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** mainbuild.xml 14 Aug 2010 17:33:26 -0000 1.26 --- mainbuild.xml 19 Aug 2010 23:38:35 -0000 1.27 *************** *** 103,107 **** <property name="main.webappdir" value="../webapp"/> <!-- release number for the next release of sandev --> ! <property name="publish.releasename" value="sandev_1_32"/> <property name="taglets" value= --- 103,107 ---- <property name="main.webappdir" value="../webapp"/> <!-- release number for the next release of sandev --> ! <property name="publish.releasename" value="sandev_1_33"/> <property name="taglets" value= |
|
From: Eric P. <th...@us...> - 2010-08-19 21:50:22
|
Update of /cvsroot/sandev/sand/apps/TaskHeap/src/org/sandev/TaskHeap/TaskHeapUI In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15696 Modified Files: UIActionHandler.java Log Message: Slightly improved log warning verbiage. Index: UIActionHandler.java =================================================================== RCS file: /cvsroot/sandev/sand/apps/TaskHeap/src/org/sandev/TaskHeap/TaskHeapUI/UIActionHandler.java,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** UIActionHandler.java 3 Apr 2009 02:47:00 -0000 1.65 --- UIActionHandler.java 19 Aug 2010 21:50:15 -0000 1.66 *************** *** 469,473 **** dp.setViewMode(ha.getDefaultView()); } } catch(Exception e) { ! owner.log(LOGWARN,"Error setting default view mode from " + "HeapAttributes: " + e); //not critical. Keep going. --- 469,474 ---- dp.setViewMode(ha.getDefaultView()); } } catch(Exception e) { ! owner.log(LOGWARN,"UIActionHandler.initDisplayParams " + ! "error setting default view mode from " + "HeapAttributes: " + e); //not critical. Keep going. |
|
From: Eric P. <th...@us...> - 2010-08-19 21:49:07
|
Update of /cvsroot/sandev/sand/apps/TaskHeap/src/org/sandev/TaskHeap/HeapCalculator In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15482 Modified Files: HeapCalculatorNode.java Log Message: Initially collapse all but the first top level plan. With a large heap the amount of data transfer makes the display slow. Index: HeapCalculatorNode.java =================================================================== RCS file: /cvsroot/sandev/sand/apps/TaskHeap/src/org/sandev/TaskHeap/HeapCalculator/HeapCalculatorNode.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** HeapCalculatorNode.java 22 Feb 2008 02:00:53 -0000 1.12 --- HeapCalculatorNode.java 19 Aug 2010 21:48:59 -0000 1.13 *************** *** 96,99 **** --- 96,100 ---- HeapAssociation assoc=hd.getAssociation(); AuthUser user=getUserForID(assoc.getAccount()); + DisplayParams params=hd.getDisplayParams(); HeapAttributes ha=(HeapAttributes)getInstance( "HeapAttributes",assoc.getHeap(),user); *************** *** 104,108 **** AuthUser intcomm=getUserForID(INTERNALCOMMSID); root=createTree(ha.getUniqueID(),intcomm); ! ha.setHeap(root); } IntReference currPlanMark=new IntReference(); currPlanMark.setValue(PlanTreeElement.CURRPLANOFFSET_BEFORE); --- 105,110 ---- AuthUser intcomm=getUserForID(INTERNALCOMMSID); root=createTree(ha.getUniqueID(),intcomm); ! ha.setHeap(root); ! initialCollapse(ha,params); } IntReference currPlanMark=new IntReference(); currPlanMark.setValue(PlanTreeElement.CURRPLANOFFSET_BEFORE); *************** *** 110,114 **** user.getUniqueID() + " (" + user.getUsername() + ")"); //abbreviate to new root if drilldown - DisplayParams params=hd.getDisplayParams(); if(params.getDisplayMode()==DisplayParams.DISPLAYMODE_SUBROOT) { PlanTreeElement subroot=findRoot(root,params.getRootPlan()); --- 112,115 ---- *************** *** 357,360 **** --- 358,384 ---- + /** + * Collapse all but the first main plan, so the initial display + * doesn't take forever with a significant size heap. + */ + protected void initialCollapse(HeapAttributes ha,DisplayParams dp) + { + PlanTreeElement root=ha.getHeap(); + if(root!=null) { + log(LOGDEBUG,"initialCollapse root: " + + root.getPlanComponentID() + " " + root.getName()); + PlanTreeElement[] children=root.getChildren(); + for(int i=1;i<children.length;i++) { //collapse all but 1st + int NONPLAN=PlanTreeElement.PLANSTATUS_NONPLAN; + int COLLAPSED=PlanTreeElement.ITEMEXPANSION_COLLAPSED; + PlanTreeElement pte=children[i]; + if(pte.getPlanStatus()!=NONPLAN) { + //pte.setItemExpansion(COLLAPSED); + dp.addCollapsed(pte.getPlanComponentID()); } } } + else { + log(LOGDEBUG,"initialCollapse root null"); } + } + + //////////////////////////////////////// // utility methods |
|
From: Eric P. <th...@us...> - 2010-08-19 21:44:33
|
Update of /cvsroot/sandev/sand/docs/projtmpl/deploy/webapp/templates In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14860 Modified Files: allpages.xsl Log Message: Expanded comment to explain what is going on with the general removal of xhtml:code tags transform. Index: allpages.xsl =================================================================== RCS file: /cvsroot/sandev/sand/docs/projtmpl/deploy/webapp/templates/allpages.xsl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** allpages.xsl 5 Apr 2008 04:05:21 -0000 1.5 --- allpages.xsl 19 Aug 2010 21:44:25 -0000 1.6 *************** *** 91,95 **** <!-- ! * remove any enclosing code tags by default to avoid ugly font syndrome --> <xsl:template match="xhtml:code"> --- 91,99 ---- <!-- ! * Remove any enclosing code tags by default to avoid ugly font syndrome. ! * The SAND interface dumps out values enclosed in a code tags. Without ! * this rule, all the values produced come out looking like fixed format ! * computer code font. If actually want this effect in some text ! * somewhere, try using the dfn, samp, kbd or var tags. --> <xsl:template match="xhtml:code"> |
|
From: Eric P. <th...@us...> - 2010-08-14 17:41:03
|
Update of /cvsroot/sandev/sand/deploy/TaskHeapDemo/webapp/templates In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21241 Modified Files: appsettings.xsl Log Message: About time to refresh the copyright here.e Index: appsettings.xsl =================================================================== RCS file: /cvsroot/sandev/sand/deploy/TaskHeapDemo/webapp/templates/appsettings.xsl,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** appsettings.xsl 14 May 2008 19:37:58 -0000 1.30 --- appsettings.xsl 14 Aug 2010 17:40:55 -0000 1.31 *************** *** 93,97 **** <a href="docs/PrivacyNotice.html">Privacy Notice</a> | <a href="docs/TermsOfUse.html">Terms of Use</a> <br/> ! Copyright © 2008 SAND Services Inc. </div> </td> --- 93,97 ---- <a href="docs/PrivacyNotice.html">Privacy Notice</a> | <a href="docs/TermsOfUse.html">Terms of Use</a> <br/> ! Copyright © 2010 SAND Services Inc. </div> </td> |
|
From: Eric P. <th...@us...> - 2010-08-14 17:39:28
|
Update of /cvsroot/sandev/sand/platform/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21001 Modified Files: ReleaseProcess.html Log Message: Minor verbiage improvements and adjustments. Index: ReleaseProcess.html =================================================================== RCS file: /cvsroot/sandev/sand/platform/docs/ReleaseProcess.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReleaseProcess.html 19 Aug 2006 20:58:30 -0000 1.3 --- ReleaseProcess.html 14 Aug 2010 17:39:20 -0000 1.4 *************** *** 8,12 **** <p><center><h1>sandev release process</H1></center></p> ! <p>Here's what we currently do when creating a release: <ol> <li>Verify all work for the release is complete and tested. <li>Verify we are using recent Ant and container releases. --- 8,18 ---- <p><center><h1>sandev release process</H1></center></p> ! <p>Here's the complete process for creating a release. The steps here ! are all from things that have bitten us at one point or another. If ! you do all the steps, then the chance of a fully functional release ! that can be installed and used by other people is pretty good. If you ! skip some of the steps then you run the risk of potential problems. </p> ! ! <ol> <li>Verify all work for the release is complete and tested. <li>Verify we are using recent Ant and container releases. *************** *** 36,41 **** a clean box. Build and run to make sure nothing was lost in transit except the CVS directories. ! <li>Update <CODE>mainbuild.xml</CODE> with the next release number, and ! reset release.txt for the next release. </ol></p> --- 42,48 ---- a clean box. Build and run to make sure nothing was lost in transit except the CVS directories. ! <li>Update the <code>publish.releasename</code> property in ! <CODE>mainbuild.xml</CODE> with the next release number, then clear ! out <CODE>release.txt</CODE> to ready for the next release. </ol></p> |
|
From: Eric P. <th...@us...> - 2010-08-14 17:34:54
|
Update of /cvsroot/sandev/sand/platform/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20574 Modified Files: release.txt Log Message: Changed release version to minor number. Index: release.txt =================================================================== RCS file: /cvsroot/sandev/sand/platform/docs/release.txt,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** release.txt 31 Jul 2008 21:47:51 -0000 1.26 --- release.txt 14 Aug 2010 17:34:46 -0000 1.27 *************** *** 13,19 **** customized or replaced. ! SANDev 1.3 includes the following updates and changes: ! - ! - Other minor bug fixes and improvements. We welcome your feedback and participation. For more information, --- 13,18 ---- customized or replaced. ! SANDev 1.32 includes the following updates and changes: ! - Minor bug fixes and improvements. We welcome your feedback and participation. For more information, |
|
From: Eric P. <th...@us...> - 2010-08-14 17:33:34
|
Update of /cvsroot/sandev/sand/apps/basics/build In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20310 Modified Files: mainbuild.xml Log Message: Switched to a 100s range minor release number rather than a 10s range. For a significant dot change we can still go up to the next 10 base, but for totally minor bug fixes we don't have to sweat running out of numbers. Index: mainbuild.xml =================================================================== RCS file: /cvsroot/sandev/sand/apps/basics/build/mainbuild.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** mainbuild.xml 2 Sep 2008 15:54:14 -0000 1.25 --- mainbuild.xml 14 Aug 2010 17:33:26 -0000 1.26 *************** *** 102,109 **** <property name="main.javadocdir" value="../docs/javadoc"/> <property name="main.webappdir" value="../webapp"/> ! <!-- next release of sandev. Not sure if this will be a minor rev or ! a full release so going with a minor rev number for now. ! --> ! <property name="publish.releasename" value="sandev_1_4"/> <property name="taglets" value= --- 102,107 ---- <property name="main.javadocdir" value="../docs/javadoc"/> <property name="main.webappdir" value="../webapp"/> ! <!-- release number for the next release of sandev --> ! <property name="publish.releasename" value="sandev_1_32"/> <property name="taglets" value= |
