foray-commit Mailing List for FOray

Revision: 8265
          http://svn.sourceforge.net/foray/?rev=8265&view=rev
Author:   victormote
Date:     2006-09-30 16:17:17 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Stub implementations of new aXSL Panose-related methods.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
    trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java	2006-09-30 22:08:01 UTC (rev 8264)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java	2006-09-30 23:17:17 UTC (rev 8265)
@@ -525,4 +525,12 @@
         this.fontComplexity = fontComplexity;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte[] getPanose() {
+        /* TODO: Implement this. */
+        return null;
+    }
+
 }

Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java	2006-09-30 22:08:01 UTC (rev 8264)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java	2006-09-30 23:17:17 UTC (rev 8265)
@@ -31,6 +31,7 @@
 import org.axsl.fontR.Font;
 import org.axsl.fontR.FontConsumer;
 import org.axsl.fontR.FontException;
+import org.axsl.fontR.FontUse;
 import org.axsl.psR.Encoding;
 
 import org.apache.commons.logging.Log;
@@ -596,4 +597,13 @@
         this.encodingLatitude = (byte) encodingLatitude;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public FontUse selectFontPanose(final short[] panose, final int codePoint)
+            throws FontException {
+        /* TODO: Implement this. */
+        return null;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8264
          http://svn.sourceforge.net/foray/?rev=8264&view=rev
Author:   victormote
Date:     2006-09-30 15:08:01 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Update the build and runtime version numbers.

Modified Paths:
--------------
    trunk/foray/foray-core/src/java/org/foray/core/Application.java
    trunk/foray/scripts/build-common.xml

Modified: trunk/foray/foray-core/src/java/org/foray/core/Application.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/Application.java	2006-09-30 22:04:35 UTC (rev 8263)
+++ trunk/foray/foray-core/src/java/org/foray/core/Application.java	2006-09-30 22:08:01 UTC (rev 8264)
@@ -64,7 +64,7 @@
      * @return The current version of the application.
      */
     public static String getVersion() {
-        return "0.2";
+        return "0.3-dev";
     }
 
     /**

Modified: trunk/foray/scripts/build-common.xml
===================================================================
--- trunk/foray/scripts/build-common.xml	2006-09-30 22:04:35 UTC (rev 8263)
+++ trunk/foray/scripts/build-common.xml	2006-09-30 22:08:01 UTC (rev 8264)
@@ -37,7 +37,7 @@
     <property name="name.lowercase" value="foray"/>
     <property name="contact.info"
         value="The FOray project http://www.foray.org"/>
-    <property name="version" value="0.2"/>
+    <property name="version" value="0.3-dev"/>
     <property name="debug" value="on"/>
     <property name="optimize" value="off"/>
     <property name="deprecation" value="off"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8263
          http://svn.sourceforge.net/foray/?rev=8263&view=rev
Author:   victormote
Date:     2006-09-30 15:04:35 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Fix bad link.

Modified Paths:
--------------
    trunk/foray/doc/web/app/using/download.html

Modified: trunk/foray/doc/web/app/using/download.html
===================================================================
--- trunk/foray/doc/web/app/using/download.html	2006-09-30 22:02:01 UTC (rev 8262)
+++ trunk/foray/doc/web/app/using/download.html	2006-09-30 22:04:35 UTC (rev 8263)
@@ -21,7 +21,7 @@
 
 <p class="Warning">The current release of FOray (0.2) is not a mature product
 and may not be suitable for your needs.
-Please see the <a href="release.htm#0.2">Release Notes</a> for more
+Please see the <a href="release.html#0.2">Release Notes</a> for more
 information.</p>
 
 <p>The FOray application can be downloaded through from


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8262
          http://svn.sourceforge.net/foray/?rev=8262&view=rev
Author:   victormote
Date:     2006-09-30 15:02:01 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Add more release mechanics notes.

Modified Paths:
--------------
    trunk/foray/doc/web/dev/admin/release.html

Modified: trunk/foray/doc/web/dev/admin/release.html
===================================================================
--- trunk/foray/doc/web/dev/admin/release.html	2006-09-30 21:58:23 UTC (rev 8261)
+++ trunk/foray/doc/web/dev/admin/release.html	2006-09-30 22:02:01 UTC (rev 8262)
@@ -28,7 +28,7 @@
 release.</p>
 <h2><a name="before"/>Before</h2>
 <ol>
-  <li>Make sure that org.foray.common.Application.getVersion() has the correct
+  <li>Make sure that org.foray.core.Application.getVersion() has the correct
 version number.</li>
   <li>Make sure that the build script build-common has the correct value for the
   property "version".</li>
@@ -68,6 +68,8 @@
       <li>The foray-dev and foray-announce mailing lists.</li>
     </ol>
   </li>
+  <li>Update org.foray.core.Application.getVersion() and the build.common.xml
+  "version" property to the next release level, with a "-dev" suffix.</li>
 </ol>
 
 <!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8261
          http://svn.sourceforge.net/foray/?rev=8261&view=rev
Author:   victormote
Date:     2006-09-30 14:58:23 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Update build and release documentation.

Modified Paths:
--------------
    trunk/foray/doc/web/app/using/build.html
    trunk/foray/doc/web/app/using/download.html

Modified: trunk/foray/doc/web/app/using/build.html
===================================================================
--- trunk/foray/doc/web/app/using/build.html	2006-09-30 20:24:03 UTC (rev 8260)
+++ trunk/foray/doc/web/app/using/build.html	2006-09-30 21:58:23 UTC (rev 8261)
@@ -33,12 +33,14 @@
 
 <h2><a name="download-source">Downloading Source Code</a></h2>
 
-<p><!-- FOray source code can be downloaded through from
-<a rel="external" href="http://sourceforge.net/projects/foray/">FOray's
-SourceForge site</a>. -->
-FOray source code is currently available only from the <a rel="external"
-href="http://sourceforge.net/svn/?group_id=109663">source code
-repository</a>, maintained by SourceForge. Thank you SourceForge!</p>
+<p>FOray source code can be obtained two ways:</p>
+<ul>
+  <li>Current releases can be obtained from the <a href="download.html">FOray
+  download page</a>.</li>
+  <li>Up-to-the-minute source code can be obtained from the "trunk" of the
+  <a rel="external" href="http://sourceforge.net/svn/?group_id=109663">source
+  code repository.</a></li>
+</ul>
 
 <h2><a name="enviro">Setting Up Your Environment</a></h2>
 

Modified: trunk/foray/doc/web/app/using/download.html
===================================================================
--- trunk/foray/doc/web/app/using/download.html	2006-09-30 20:24:03 UTC (rev 8260)
+++ trunk/foray/doc/web/app/using/download.html	2006-09-30 21:58:23 UTC (rev 8261)
@@ -29,6 +29,33 @@
 SourceForge site</a>.
 Thank you SourceForge!</p>
 
+<p>There are three possible downloads:</p>
+<ul>
+  <li>"bin-all" contains all of the FOray class files in one jar file.
+  This is the recommended download for most users.</li>
+  <li>"bin-modules" contains all of the FOray class files, but they are placed
+  in one jar file per module.
+  This distribution is intended for those who wish to use only certain modules
+  from FOray and do not want to use the more bulky "bin-all" jar file.
+  Note also that FOray can be <a href="./build.html#subset">built as a
+  subset</a></li>
+  <li>"src" contains the entire contents of the trunk of the FOray source
+  code repository.</li>
+</ul>
+
+<p>After downloading the FOray "bin-all" distribution, you can check the
+basic usability of the download very easily:</p>
+<ol>
+  <li>Unzip the distribution.</li>
+  <li>Make sure your "JAVE_HOME" environment variable is set to a Java 1.4 or
+  higher runtime.</li>
+  <li>Change directory to the "scripts" directory in the distribution and run
+  either "foray-test.bat" (for Windows) or "foray-test.sh" (For Unix and Linux).
+  If all goes well, you should see output on the screen showing the startup and
+  successful completion of a FOray run, and a file "minimal.pdf" should be
+  created in the current directory.</li>
+</ol>
+
 <!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->
 </body>
 </html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8260
          http://svn.sourceforge.net/foray/?rev=8260&view=rev
Author:   victormote
Date:     2006-09-30 13:24:03 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Tag the 0.2 release.

Added Paths:
-----------
    tags/rel_0_2/

Copied: tags/rel_0_2 (from rev 8259, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8259
          http://svn.sourceforge.net/foray/?rev=8259&view=rev
Author:   victormote
Date:     2006-09-30 13:08:08 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Update the release notes.

Modified Paths:
--------------
    trunk/foray/doc/web/app/using/download.html
    trunk/foray/doc/web/app/using/release.html

Modified: trunk/foray/doc/web/app/using/download.html
===================================================================
--- trunk/foray/doc/web/app/using/download.html	2006-09-30 18:29:41 UTC (rev 8258)
+++ trunk/foray/doc/web/app/using/download.html	2006-09-30 20:08:08 UTC (rev 8259)
@@ -17,18 +17,15 @@
 
 <h1>FOray: Downloading the Application</h1>
 
-<ul>
-  <li><a href="#intro">Introduction</a></li>
-</ul>
-
 <h2><a name="intro">Introduction</a></h2>
 
-<p class="Warning">FOray does not currently have a usable version to download.
-We hope to have a beta site available by April 15, 2005. Please
-check the website from time to time for progress reports.</p>
+<p class="Warning">The current release of FOray (0.2) is not a mature product
+and may not be suitable for your needs.
+Please see the <a href="release.htm#0.2">Release Notes</a> for more
+information.</p>
 
 <p>The FOray application can be downloaded through from
-<a rel="external" href="http://sourceforge.net/projects/foray/">FOray’s
+<a rel="external" href="http://sourceforge.net/projects/foray/">FOray's
 SourceForge site</a>.
 Thank you SourceForge!</p>
 

Modified: trunk/foray/doc/web/app/using/release.html
===================================================================
--- trunk/foray/doc/web/app/using/release.html	2006-09-30 18:29:41 UTC (rev 8258)
+++ trunk/foray/doc/web/app/using/release.html	2006-09-30 20:08:08 UTC (rev 8259)
@@ -20,6 +20,7 @@
 <ul>
   <li><a href="#intro">Introduction</a></li>
   <li><a href="#unreleased">Unreleased Changes</a></li>
+  <li><a href="#0_2">Release 0.2</a></li>
   <li><a href="#0_1">Release 0.1</a></li>
 </ul>
 
@@ -32,7 +33,23 @@
 <p>Unreleased changes can be obtained from the root of the source code
 repository.</p>
 <h3>Unreleased changes of interest to Users</h3>
+<h3>Unreleased changes of interest to Developers</h3>
 
+<h2><a name="0_2">Release 0.2</a></h2>
+<h3>Release 0.2 changes of interest to Users</h3>
+<p class="warning">FOray 0.2 is primarily for developers and module users.
+Although many parts of FOray work well, and are usable as modules, the
+application as a whole has some general problems that require attention.</p>
+
+<p>Here are the more significant of the known issues:</p>
+<ul>
+  <li>The FO Tree does not parse all expressions properly. Valid FO syntax
+  is sometimes flagged as an error.</li>
+  <li>The Area Tree does not handle tables and lists properly in most cases.
+  Specifically, these items will likely not be placed in the proper place,
+  and may not even be placed in a reasonable place.</li>
+</ul>
+
 <h4>General Configuration Changes</h4>
 <ul>
   <li>The names of several configuration file entries have been changed for
@@ -139,7 +156,7 @@
   facilitate making these options available on the command line.</li>
   <li>A boolean configuration option <strong>cache-graphics</strong> was
 added.
-It defaults to “false�?.
+It defaults to "false"?.
 If set to true, graphic objects will be cached and can be reused, resulting in
 potential speed improvement.
 If set to false, graphic objects are not reused, resulting in potential memory
@@ -160,7 +177,7 @@
 file is now respected for CID fonts.</li>
   <li>PDF output for CID fonts now includes the ToUnicode CMap. This allows
 cut-and-paste, index, search, etc. to work correctly on PDF text for these
-fonts. This fixes FOP’s Bugzilla entry #5335.</li>
+fonts. This fixes FOP's Bugzilla entry #5335.</li>
   <li>Italic angle information is now parsed from PFM files.</li>
   <li>FontBBox and StemV (StdVW) information is now parsed from PFA and PFB
 files.</li>
@@ -220,14 +237,14 @@
 applications that built the font metrics files):</p>
 
 <ul>
-  <li><strong>font-resource</strong> (was the “-er�? [embed-resource]
+  <li><strong>font-resource</strong> (was the "-er"? [embed-resource]
 command-line option).
 Font files can be included in fop.jar when building fop. Both font-resource and
 font-file can be specified for the same font, but if font-file is specified and
 can be opened, it will take precedence over font-resource. Please note that the
 companion option -ef already exists in the font configuration file as
 <strong>embed-file</strong> (now called <strong>font-file</strong>).</li>
-  <li><strong>embed-name</strong> (was the “-fn�? command-line option). If
+  <li><strong>embed-name</strong> (was the "-fn"? command-line option). If
 embed-name is
 specified, it will be used as the name of the font in the output document, if
 the font is embedded in that document. This is sometimes useful when trying to
@@ -236,7 +253,7 @@
 <i>not </i>specified, FOray first
 attempts to extract and embed the name from the font itself. If that fails, it
 uses the configured attribute <strong>name</strong>.</li>
-  <li><strong>ttc-name</strong> (was the “-ttcname�? command-line option.
+  <li><strong>ttc-name</strong> (was the "-ttcname"? command-line option.
 If you are reading data from a TrueType Collection (.ttc
 file) you must specify which font from the collection you will read metrics
 from.</li>
@@ -252,7 +269,7 @@
 <strong>embed-resource</strong>. Since those attributes have been renamed to
 clarify their use,
 you must now explicitly state what embedding behavior is desired. Valid options
-are “all�?, “subset�?, and “none�?. The default is “none�?.</li>
+are "all"?, "subset"?, and "none"?. The default is "none"?.</li>
 </ul>
 
 <p>In addition, the following changes related to the direct parsing of font files
@@ -263,13 +280,13 @@
 configuration file. This is currently not used at all, except as a fallback
 name to be embedded in an output file if no other name can be found. Its main
 purpose is for reference in writing and parsing the configuration file, but it
-may be used as a “key�? for other configuration elements in the future.</li>
+may be used as a "key"? for other configuration elements in the future.</li>
       <li>The former attribute <strong>embed-file</strong> for the element
 <strong>font</strong> in the font
 configuration file, has been renamed to <strong>font-file</strong>.
 This change was made for clarity since, for some font types, the font file
 contains both the embedding information and the metrics information.</li>
-      <li>Note that the former TTFReader command-line option “-enc�? has no
+      <li>Note that the former TTFReader command-line option "-enc"? has no
 analog in the configuration file. The artifical reencoding that this option
 enabled is no longer necessary now that CID fonts are properly embedded in the
 PDF output (see change below regarding ToUnicode CMap).</li>
@@ -277,9 +294,9 @@
 
 <h4>Other Changes</h4>
 <ul>
-  <li>Since we have now obtained rights to the internet domain “foray.org�?, the
-package structure of all FOray module classes has been moved from “com.outfitr�?
-to “org.foray�?. The package structure for fop-maint remains unchanged.</li>
+  <li>Since we have now obtained rights to the internet domain "foray.org"?, the
+package structure of all FOray module classes has been moved from "com.outfitr"?
+to "org.foray"?. The package structure for fop-maint remains unchanged.</li>
   <li>Starting with Release 0.2, FOray requires a minimum java runtime
 environment of 1.4.</li>
   <li><em>All</em> properties should now be supported at the parse level,
@@ -288,7 +305,7 @@
 note that this does not mean that all properties are used or used properly by
 the layout or rendering systems.</li>
   <li>The class for running FOray from the command-line has been renamed
-“FOray�?.</li>
+"FOray"?.</li>
   <li>The outer-layer application API has changed significantly. This will
 not affect command-line users, but will affect anyone running FOray embedded
 within another application. Details of the new API can be found at <a
@@ -313,7 +330,14 @@
     for more information.</li>
 </ul>
 
-<h3>Unreleased changes of interest to Developers</h3>
+<h3>Release 0.2 changes of interest to Developers</h3>
+
+<h4>Modularity Changes</h4>
+<p>As of Release 0.2, all FOray modules are independent of each other, using
+the aXSL interfaces to achieve pluggability and interoperability.
+With the exception of dependencies on the utility-type modules (Common, Pretty,
+and PS), FOray modules now have no dependencies on other FOray modules.</p>
+
 <ul>
   <li>The following methods have been added to the FontConsumer interface to
 allow the client application to control what combinations of FreeStandingFonts
@@ -335,10 +359,10 @@
 and writing tasks concurrently, it should not use this method, as doing
 so will corrupt the logical connection between the glyph indices used to
 embed the font and those used to write the document contents. Please note that
-FOray’s reference FO processing implementation is currently unable to use this
+FOray's reference FO processing implementation is currently unable to use this
 method because of such concurrent processing.</li>
   <li>To assist in parsing Type1 fonts, FOray now has the modest beginnings of
-a PostScript interpreter emulation. It is included as part of the new “FOrayPS�?
+a PostScript interpreter emulation. It is included as part of the new "FOrayPS"?
 module. We hope to use this for future project such as embedding EPS files in
 PDF output.</li>
   <li>The filter and encoding classes that were part of the pdf module have
@@ -351,12 +375,9 @@
 and, with reasonable care, multiple instances should be manageable. A
 getFontServer() method has been added to the FontConsumer interface, as the
 FontConsumer must now know which FontServer it is using.</li>
-  <li>FOray has been split up into 12 isolated modules, each with its own
-well-defined dependencies. This greatly increases their reusability in other
-applications.</li>
   <li>Each of the Font, Graphic, and Text subsystems now has a Server class
 associated with it (e.g. GraphicServer). Instances of these servers may be
-passed to FOraySession’s constructor. If not, default instances will be created
+passed to FOraySession's constructor. If not, default instances will be created
 by FOraySession. This means that you can enhance your local system by extending
 these Server classes. Also, because the Servers live outside of the FOray
 application, they can conceivably persist for multiple Sessions.</li>
@@ -377,11 +398,12 @@
 </ul>
 
 <h2><a name="0_1">Release 0.1</a></h2>
-<p>Release 0.1 is currently in alpha testing. It can be obtained from the source
+<p>Release 0.1 can be obtained from the source
 code repository by using the tag <code>rel_0_1_branch</code>.</p>
 <p>Release 0.1 is totally oriented toward modularization of the system, and
 toward improvements to the font system.</p>
-<h3>Changes since FOP 0.20.5 of interest to Users</h3>
+
+<h3>Changes from FOP 0.20.5 to FOray 0.1 of interest to Users</h3>
 <p>Current work is deliberately focused on architecture, not features. However,
 the following improvements have resulted as side-effects of the architectural
 changes:</p>
@@ -407,7 +429,7 @@
 No other changes have been made to the way fonts are configured.</li>
 </ul>
 
-<h3>Changes since FOP 0.20.5 of interest to Developers</h3>
+<h3>Changes from FOP 0.20.5 to FOray 0.1 of interest to Developers</h3>
 <ul>
   <li>Font-related classes have been extracted into a separate module.</li>
   <li>Graphic and PDF-related classes have also been extracted into separate
@@ -418,13 +440,13 @@
 concepts has been clarified greatly (probably needs more work).</li>
   <li>Visibility on most Font-related classes has been reduced.</li>
   <li>The following methods in the forayFont class called Font (called
-fonts/FontMetrics in FOP’s HEAD) were returning values in millionths of a point:
+fonts/FontMetrics in FOP's HEAD) were returning values in millionths of a point:
 getAscender(), getDescender(), getCapHeight(), getXHeight(), and getCharWidth().
 Methods using values returned by these methods were typically dividing the
 returned values by 1000. The Font methods have been changed to return values in
 millipoints (1/1000 of a point), and the corresponding methods in fop-maint have
 been changed to <i>not </i>divide by 1000. Although this makes sense, it may be
-confusing to anyone trying to implement the forayFont module into FOP’s
+confusing to anyone trying to implement the forayFont module into FOP's
 HEAD.</li>
 </ul>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8258
          http://svn.sourceforge.net/foray/?rev=8258&view=rev
Author:   victormote
Date:     2006-09-30 11:29:41 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Update release mechanics documentation.

Modified Paths:
--------------
    trunk/foray/doc/web/dev/admin/release.html

Modified: trunk/foray/doc/web/dev/admin/release.html
===================================================================
--- trunk/foray/doc/web/dev/admin/release.html	2006-09-30 18:10:51 UTC (rev 8257)
+++ trunk/foray/doc/web/dev/admin/release.html	2006-09-30 18:29:41 UTC (rev 8258)
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>FOray: Developer Information</title>
+  <title>FOray: Release Mechanics</title>
   <meta name="content-revised"
     content="$Date$"/>
   <!--#include virtual="/00-rsrc/include/standard-head.html" -->
@@ -20,6 +20,7 @@
 <h2>Contents</h2>
 <ul>
   <li><a href="#before">Before</a></li>
+  <li><a href="#build">Build</a></li>
   <li><a href="#after">After</a></li>
 </ul>
 
@@ -29,16 +30,42 @@
 <ol>
   <li>Make sure that org.foray.common.Application.getVersion() has the correct
 version number.</li>
-  <li>Make sure that build scripts have the correct version number. Consider
-parameterizing the value.</li>
+  <li>Make sure that the build script build-common has the correct value for the
+  property "version".</li>
+  <li>Update the release notes.</li>
+  <li>Lock the repository or at least make a note of the repository revision
+  number which should be tagged.</li>
 </ol>
 
+<h2><a name="build"/>Build</h2>
+<ol>
+  <li>Run the "distribution" target of the build script. The distributable
+  output should be in build/distribution.</li>
+  <li>The output should contain three files:
+    <ul>
+      <li>foray-[version]-bin-all.zip</li>
+      <li>foray-[version]-bin-modules.zip</li>
+      <li>foray-[version]-src.zip</li>
+    </ul>
+  </li>
+  <li>Run the test-dist.sh shell script. This script looks for potential
+  problems in the distribution files. If any problems are reported, fix them
+  before proceeding.</li>
+  <li>Unzip the "bin-all" distribution file, and run both the foray-test.bat
+  batch file and foray-test.sh shell script to ensure basic runnability.</li>
+</ol>
+
 <h2><a name="after"/>After</h2>
 <ol>
+  <li>Tag the repository.</li>
+  <li>Unlock the repository, if it was locked above.</li>
+  <li>Upload distribution file to sourceforge.</li>
+  <li>Add link to release notes on sourceforge.</li>
+  <li>Publish website to get the new release notes updated.</li>
   <li>Announce the release at:
     <ol>
       <li>www.w3c.org</li>
-      <li>the fop-dev mailing list</li>
+      <li>The foray-dev and foray-announce mailing lists.</li>
     </ol>
   </li>
 </ol>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8257
          http://svn.sourceforge.net/foray/?rev=8257&view=rev
Author:   victormote
Date:     2006-09-30 11:10:51 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Make the SystemFont constructor private, to prevent a SystemFont from being created in a non-graphical environment.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java
    trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java	2006-09-30 18:09:59 UTC (rev 8256)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java	2006-09-30 18:10:51 UTC (rev 8257)
@@ -221,14 +221,7 @@
             return;
         }
         this.systemFontCreationCompleted = true;
-
-        try {
-            this.systemFont = new SystemFont(this);
-        } catch (final FontException e) {
-            /* This basically means that the SystemFont is unusable, so make
-             * sure we don't try to use it. */
-            this.systemFont = null;
-        }
+        this.systemFont = SystemFont.makeSystemFont(this);
     }
 
     /**

Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java	2006-09-30 18:09:59 UTC (rev 8256)
+++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java	2006-09-30 18:10:51 UTC (rev 8257)
@@ -28,6 +28,7 @@
 
 package org.foray.font;
 
+import org.foray.common.Environment;
 import org.foray.common.WKConstants;
 import org.foray.font.charset.CharSet;
 import org.foray.font.format.FontFileReader;
@@ -47,7 +48,7 @@
 /**
  * Handles interface of system (AWT) fonts to the client application.
  */
-class SystemFont extends org.foray.font.FOrayFont {
+final class SystemFont extends org.foray.font.FOrayFont {
 
     /** The logical font families used by AWT Fonts. */
     public static final String[] LOGICAL_FONT_FAMILIES = {
@@ -75,17 +76,39 @@
     private FontMetrics lastMetrics = null;
 
     /**
-     * Constructs a new SystemFont.
+     * Private constructor.
+     * To obtain a SystemFont instance, use
+     * {@link #makeSystemFont(RegisteredFont)}.
      * @param rf The parent RegisteredFont instance.
      * @throws FontException For error creating font.
      */
-    public SystemFont(final RegisteredFont rf) throws FontException {
+    private SystemFont(final RegisteredFont rf) throws FontException {
         super(rf);
         final Font newFont = createFont();
         this.lastMetrics = getGraphics().getFontMetrics(newFont);
     }
 
     /**
+     * Factory method that creates a new SystemFont instance.
+     * @param rf The parent RegisteredFont instance.
+     * @return The new SystemFont instance.
+     */
+    public static SystemFont makeSystemFont(final RegisteredFont rf) {
+        /* Don't allow the SystemFont to be created unless we are running in a
+         * graphical environment. Trying to create AWT fonts in a non-graphical
+         * environment will result in a runtime Error and will crash the
+         * system. */
+        if (! Environment.isGraphicalEnvironment()) {
+            return null;
+        }
+        try {
+            return new SystemFont(rf);
+        } catch (final FontException e) {
+            return null;
+        }
+    }
+
+    /**
      * {@inheritDoc}
      */
     public int getAscender(final int fontSize) {
@@ -234,7 +257,7 @@
     /**
      * {@inheritDoc}
      */
-    public final Kerning getKerning() {
+    public Kerning getKerning() {
         final FreeStandingFont relatedFSFont =
                 this.freeStandingFontManifestation();
         if (relatedFSFont == null) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8256
          http://svn.sourceforge.net/foray/?rev=8256&view=rev
Author:   victormote
Date:     2006-09-30 11:09:59 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Clean up startup scripts to be used from the distribution instead of a repository sandbox.

Modified Paths:
--------------
    trunk/foray/scripts/foray.sh

Modified: trunk/foray/scripts/foray.sh
===================================================================
--- trunk/foray/scripts/foray.sh	2006-09-30 17:32:29 UTC (rev 8255)
+++ trunk/foray/scripts/foray.sh	2006-09-30 18:09:59 UTC (rev 8256)
@@ -5,15 +5,6 @@
 # not work with a repository sandbox without modification unless the "foray"
 # jar files are built and added to the lib directory.
 
-# Constants
-FORAY_VERSION="0.2b1"
-
-if [ -z "$FORAY_HOME" ]
-then
-  echo "Environment Variable FORAY_HOME not set. Aborting."
-  exit 1
-fi
-
 JAVACMD=$JAVA_HOME/bin/java
 if [ ! -x "$JAVACMD" ] ; then
   echo "Error: JAVA_HOME is not defined correctly."
@@ -21,43 +12,26 @@
   exit
 fi
 
+FORAY_CP=""
 if [ -n "$CLASSPATH" ] ; then
-  LOCALCLASSPATH=$CLASSPATH
+  FORAY_CP=$CLASSPATH
 fi
 
-# add foray.jar, which resides in $FORAY_HOME/build
-FORAY_JAR=foray-$FORAY_VERSION.jar
-LOCALCLASSPATH=$FORAY_HOME/build/$FORAY_JAR:$LOCALCLASSPATH
+# Add the library jar files to the FOray classpath
+FORAY_LIB=../lib
 
-# If AXSL_HOME exists, add its build before the one in lib
-if [ -n "$AXSL_HOME" ]
-then
-  for I in `ls $AXSL_HOME/build/ant/*.jar`
-  do
-    LOCALCLASSPATH="$I":"$LOCALCLASSPATH"
-  done
-fi
-
-# add in the dependency .jar files
-DIRLIBS=${FORAY_HOME}/lib/*.jar
-for i in ${DIRLIBS}
+for i in `ls $FORAY_LIB/*.jar`
 do
-    # if the directory is empty, then it will return the input string
-    # this is stupid, so case for it
-    if [ "$i" != "${DIRLIBS}" ] ; then
-      if [ -z "$LOCALCLASSPATH" ] ; then
-        LOCALCLASSPATH=$i
-      else
-        LOCALCLASSPATH="$i":$LOCALCLASSPATH
-      fi
-    fi
+  FORAY_CP="$i":$FORAY_CP
 done
 
 $JAVACMD \
   $FORAY_JAVA_OPTIONS \
-  -classpath "$LOCALCLASSPATH" \
+  -classpath "$FORAY_CP" \
   $FORAY_OPTIONS \
   org.foray.app.FOray \
   $*
 
+unset FORAY_CP
+
 ##### Last Line of Script #####


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8255
          http://svn.sourceforge.net/foray/?rev=8255&view=rev
Author:   victormote
Date:     2006-09-30 10:32:29 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
1. Add shell script for basic runnability test.
2. Clean up startup scripts to be used from the distribution instead of a repository sandbox.
3. Make all scripts executable.

Modified Paths:
--------------
    trunk/foray/scripts/foray.bat
    trunk/foray/scripts/foray.sh

Added Paths:
-----------
    trunk/foray/scripts/foray-test.sh

Property Changed:
----------------
    trunk/foray/scripts/foray-test.bat
    trunk/foray/scripts/foray.bat


Property changes on: trunk/foray/scripts/foray-test.bat
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/foray/scripts/foray-test.sh
===================================================================
--- trunk/foray/scripts/foray-test.sh	                        (rev 0)
+++ trunk/foray/scripts/foray-test.sh	2006-09-30 17:32:29 UTC (rev 8255)
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# The purpose of this script is to run FOray on one file from the
+# distribution resources, just to ensure that it generally runs.
+
+./foray.sh -fo file:../resource/fo-examples/basic/minimal.fo -pdf minimal.pdf
\ No newline at end of file


Property changes on: trunk/foray/scripts/foray-test.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + LF

Modified: trunk/foray/scripts/foray.bat
===================================================================
--- trunk/foray/scripts/foray.bat	2006-09-30 16:52:19 UTC (rev 8254)
+++ trunk/foray/scripts/foray.bat	2006-09-30 17:32:29 UTC (rev 8255)
@@ -1,21 +1,31 @@
 echo off
 
-set FORAY_CP=%FORAY_HOME%\build\foray-0.2b1.jar
+rem The purpose of this script is to set the classpath needed to run FOray
+rem and to start it up.
+rem
+rem Note that this script is intended for use with FOray distributions. It will
+rem not work with a repository sandbox without modification unless the "foray"
+rem jar files are built and added to the lib directory.
 
-rem Add separate AXSL build in if it exists
-set FORAY_CP=%FORAY_CP%;%AXSL_HOME%\build\ant\axsl-0.2a.jar
+set FORAY_LIB=..\lib
 
-rem Add ICU4J in (not in lib yet)
-set FORAY_CP=%FORAY_CP%;D:\rsrc\icu4j\3_4_3\icu4j_3_4_3.jar
+set FORAY_CP=%FORAY_LIB%\avalon-framework-cvs-20020806.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\axsl-0.1.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\batik.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\commons-io-1.2.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\commons-logging.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\foray-0.2-all.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\foray-font-0.2-rsrc.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\foray-hyphen-r-0.2-rsrc.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\icu4j_3_4_3.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\servlet-2.2.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\stax-1.2.0_rc2-dev.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\stax-api-1.0.1.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\xalan-2.4.1.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\xml-apis-1.3.02.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\resolver.jar
+set FORAY_CP=%FORAY_CP%;%FORAY_LIB%\xercesImpl-2.7.1.jar
 
-rem Now add regular lib jar files
-set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\avalon-framework-cvs-20020806.jar
-set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\axsl-0.1.jar
-set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\batik.jar
-set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\commons-logging.jar
-set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\resolver.jar
-set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\xercesImpl-2.7.1.jar
-
 java -Xmx256m -classpath "%FORAY_CP%" org.foray.app.FOray %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 set FORAY_CP=


Property changes on: trunk/foray/scripts/foray.bat
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/foray/scripts/foray.sh
===================================================================
--- trunk/foray/scripts/foray.sh	2006-09-30 16:52:19 UTC (rev 8254)
+++ trunk/foray/scripts/foray.sh	2006-09-30 17:32:29 UTC (rev 8255)
@@ -1,6 +1,9 @@
-#! /bin/sh
+#!/bin/sh
 #
 # Shell script to run FOray.
+# Note that this script is intended for use with FOray distributions. It will
+# not work with a repository sandbox without modification unless the "foray"
+# jar files are built and added to the lib directory.
 
 # Constants
 FORAY_VERSION="0.2b1"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8254
          http://svn.sourceforge.net/foray/?rev=8254&view=rev
Author:   victormote
Date:     2006-09-30 09:52:19 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
1. Add a script that minimally tests whether FOray is working or not.
2. Add svn:eol-style keywords to all script files. This is needed to ensure that the line-endings are proper regardless of what platform was used to download the scripts.

Modified Paths:
--------------
    trunk/foray/scripts/build.bat

Added Paths:
-----------
    trunk/foray/scripts/foray-test.bat

Property Changed:
----------------
    trunk/foray/scripts/build.bat
    trunk/foray/scripts/build.sh
    trunk/foray/scripts/foray.bat
    trunk/foray/scripts/foray.sh
    trunk/foray/scripts/xalan.sh

Modified: trunk/foray/scripts/build.bat
===================================================================
--- trunk/foray/scripts/build.bat	2006-09-30 16:07:46 UTC (rev 8253)
+++ trunk/foray/scripts/build.bat	2006-09-30 16:52:19 UTC (rev 8254)
@@ -1,27 +1,27 @@
-@echo off
-
-echo "FOray Build System"
-echo "------------------"
-
-IF "%JAVA_HOME%" == "" GOTO JAVA_HOME_ERR
-IF "%ANT_HOME%" == "" GOTO ANT_HOME_ERR
-
-call %ANT_HOME%\bin\ant.bat %*
-
-GOTO END
-
-:JAVA_HOME_ERR
-  echo ERROR: JAVA_HOME not found in your environment.
-  echo
-  echo Please set the JAVA_HOME variable in your environment to match the
-  echo location of the Java Virtual Machine you want to use.
-GOTO END
-
-:ANT_HOME_ERR
-  echo ERROR: ANT_HOME not found in your environment.
-  echo
-  echo Please set the ANT_HOME variable in your environment to match the
-  echo location of the root of your ANT installation.
-GOTO END
-
-:END
+@echo off
+
+echo "FOray Build System"
+echo "------------------"
+
+IF "%JAVA_HOME%" == "" GOTO JAVA_HOME_ERR
+IF "%ANT_HOME%" == "" GOTO ANT_HOME_ERR
+
+call %ANT_HOME%\bin\ant.bat %*
+
+GOTO END
+
+:JAVA_HOME_ERR
+  echo ERROR: JAVA_HOME not found in your environment.
+  echo
+  echo Please set the JAVA_HOME variable in your environment to match the
+  echo location of the Java Virtual Machine you want to use.
+GOTO END
+
+:ANT_HOME_ERR
+  echo ERROR: ANT_HOME not found in your environment.
+  echo
+  echo Please set the ANT_HOME variable in your environment to match the
+  echo location of the root of your ANT installation.
+GOTO END
+
+:END


Property changes on: trunk/foray/scripts/build.bat
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF


Property changes on: trunk/foray/scripts/build.sh
___________________________________________________________________
Name: svn:eol-style
   - native
   + LF

Added: trunk/foray/scripts/foray-test.bat
===================================================================
--- trunk/foray/scripts/foray-test.bat	                        (rev 0)
+++ trunk/foray/scripts/foray-test.bat	2006-09-30 16:52:19 UTC (rev 8254)
@@ -0,0 +1,6 @@
+echo off
+
+rem The purpose of this script is to run FOray on one file from the
+rem distribution resources, just to ensure that it generally runs.
+
+foray.bat -fo file:../resource/fo-examples/basic/minimal.fo -pdf minimal.pdf
\ No newline at end of file


Property changes on: trunk/foray/scripts/foray-test.bat
___________________________________________________________________
Name: svn:eol-style
   + CRLF


Property changes on: trunk/foray/scripts/foray.bat
___________________________________________________________________
Name: svn:eol-style
   + CRLF


Property changes on: trunk/foray/scripts/foray.sh
___________________________________________________________________
Name: svn:eol-style
   - native
   + LF


Property changes on: trunk/foray/scripts/xalan.sh
___________________________________________________________________
Name: svn:eol-style
   - native
   + LF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8253
          http://svn.sourceforge.net/foray/?rev=8253&view=rev
Author:   victormote
Date:     2006-09-30 09:07:46 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Add script to test the distribution file contents.

Added Paths:
-----------
    trunk/foray/scripts/dist-test.sh

Added: trunk/foray/scripts/dist-test.sh
===================================================================
--- trunk/foray/scripts/dist-test.sh	                        (rev 0)
+++ trunk/foray/scripts/dist-test.sh	2006-09-30 16:07:46 UTC (rev 8253)
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# The purpose of this script is to test the contents of the distribution files
+# that were created by the build scripts.
+
+# Modify the following variable to the appropriate value before running this
+# script.
+FORAY_VERSION="0.2"
+
+TEMP_DIR=$HOME/tmp
+UNZIP_DIR=$TEMP_DIR/unzip
+FILE_1=$TEMP_DIR/foray-test-1.txt
+FILE_2=$TEMP_DIR/foray-test-2.txt
+FILE_3=$TEMP_DIR/foray-test-3.txt
+
+clear
+
+################################################################################
+# Make sure the content of the two binary distribution files is equivalent.
+################################################################################
+
+if [ ! -d $TEMP_DIR ]
+then
+  mkdir $TEMP_DIR
+fi
+
+mkdir $UNZIP_DIR
+
+# Unzip the "all" zip file
+unzip -q ../build/distribution/foray-$FORAY_VERSION-bin-all.zip -d $UNZIP_DIR
+
+# List and sort the contents of the foray jar files in it
+touch $FILE_1
+for I in `ls $UNZIP_DIR/foray-$FORAY_VERSION-bin-all/lib/foray*.jar`
+do
+  jar -tvf $I >> $FILE_1
+done
+# Pull out the differences due to duplicated directories and manifest files,
+# and sort the content.
+cat $FILE_1 | grep -v META-INF\/$ | grep -v META-INF\/MANIFEST.MF$ \
+    | grep -v org\/$ | grep -v org\/foray\/$ | sort > $FILE_3
+mv $FILE_3 $FILE_1
+rm -rf $UNZIP_DIR/*
+
+# Unzip the "modules" zip file
+unzip -q ../build/distribution/foray-$FORAY_VERSION-bin-modules.zip -d $UNZIP_DIR
+
+# List and sort the contents of the foray jar files in it
+touch $FILE_2
+for I in `ls $UNZIP_DIR/foray-$FORAY_VERSION-bin-modules/lib/foray*.jar`
+do
+  jar -tvf $I >> $FILE_2
+done
+# Pull out the differences due to duplicated directories and manifest files,
+# and sort the content.
+cat $FILE_2 | grep -v META-INF\/$ | grep -v META-INF\/MANIFEST.MF$ \
+    | grep -v org\/$ | grep -v org\/foray\/$ | sort > $FILE_3
+mv $FILE_3 $FILE_2
+
+# Now diff the two files.
+echo "Listing substantial differences between the distribution files"
+diff $FILE_1 $FILE_2 | more
+echo "End of differences"
+
+rm -rf $UNZIP_DIR
+rm $FILE_1
+rm $FILE_2
+
+##### Last Line of Script.


Property changes on: trunk/foray/scripts/dist-test.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + LF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8252
          http://svn.sourceforge.net/foray/?rev=8252&view=rev
Author:   victormote
Date:     2006-09-30 08:04:10 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Add the remainder of the distribution to the binary zip files.

Modified Paths:
--------------
    trunk/foray/scripts/build.xml

Modified: trunk/foray/scripts/build.xml
===================================================================
--- trunk/foray/scripts/build.xml	2006-09-30 01:11:25 UTC (rev 8251)
+++ trunk/foray/scripts/build.xml	2006-09-30 15:04:10 UTC (rev 8252)
@@ -218,6 +218,15 @@
       <fileset dir="${lib.dir}" includes="**"/>
     </copy>
 
+    <!-- Copy the ancillary distribution files into the staging area. -->
+    <copy todir="${bin.staging.dir}/${binary.dist.name}">
+      <fileset dir="${foray.home}" includes="config/**"/>
+      <fileset dir="${foray.home}" includes="doc/**"/>
+      <fileset dir="${foray.home}" includes="resource/**"/>
+      <fileset dir="${foray.home}" includes="scripts/**"/>
+      <fileset dir="${foray.home}" includes="readme.txt"/>
+    </copy>
+
     <!-- Create the zip file from the staging directory. -->
     <zip zipfile="${distrib.dir}/${binary.dist.name}.zip">
       <fileset dir="${bin.staging.dir}"/>
@@ -270,6 +279,15 @@
       <fileset dir="${lib.dir}" includes="**"/>
     </copy>
 
+    <!-- Copy the ancillary distribution files into the staging area. -->
+    <copy todir="${module.staging.dir}/${module.dist.name}">
+      <fileset dir="${foray.home}" includes="config/**"/>
+      <fileset dir="${foray.home}" includes="doc/**"/>
+      <fileset dir="${foray.home}" includes="resource/**"/>
+      <fileset dir="${foray.home}" includes="scripts/**"/>
+      <fileset dir="${foray.home}" includes="readme.txt"/>
+    </copy>
+
     <!-- Create the zip file from the staging directory. -->
     <zip zipfile="${distrib.dir}/${module.dist.name}.zip">
       <fileset dir="${module.staging.dir}"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8251
          http://svn.sourceforge.net/foray/?rev=8251&view=rev
Author:   victormote
Date:     2006-09-29 18:11:25 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Make each zip file unzip into a directory that corresponds to its own name.

Modified Paths:
--------------
    trunk/foray/scripts/build.xml

Modified: trunk/foray/scripts/build.xml
===================================================================
--- trunk/foray/scripts/build.xml	2006-09-30 00:24:17 UTC (rev 8250)
+++ trunk/foray/scripts/build.xml	2006-09-30 01:11:25 UTC (rev 8251)
@@ -201,22 +201,25 @@
   -->
   <target name="dist-bin" depends="package-all, dist-prepare">
     <echo message="Building the binary distribution files"/>
+    <property name="binary.dist.name"
+        value="${name.lowercase}-${version}-bin-all"/>
 
     <!-- Creating a staging directory in which to copy all of the needed
     pieces of this zip file. -->
     <property name="bin.staging.dir" location="${distrib.dir}/bin-staging"/>
-    <mkdir dir="${bin.staging.dir}/lib"/>
+    <property name="bin.staging.lib.dir"
+        location="${bin.staging.dir}/${binary.dist.name}/lib"/>
+    <mkdir dir="${bin.staging.lib.dir}"/>
 
     <!-- Copy the FOray jar file and the lib directory into the staging area.
     -->
-    <copy todir="${bin.staging.dir}/lib">
+    <copy todir="${bin.staging.lib.dir}">
       <fileset dir="${build.dir}" includes="foray*.jar"/>
       <fileset dir="${lib.dir}" includes="**"/>
     </copy>
 
     <!-- Create the zip file from the staging directory. -->
-    <property name="binary.zip.name" value="${name.lowercase}-${version}-bin-all.zip"/>
-    <zip zipfile="${distrib.dir}/${binary.zip.name}">
+    <zip zipfile="${distrib.dir}/${binary.dist.name}.zip">
       <fileset dir="${bin.staging.dir}"/>
     </zip>
 
@@ -233,15 +236,19 @@
   -->
   <target name="dist-modules" depends="package-all, dist-prepare">
     <echo message="Building the binary module distribution files"/>
+    <property name="module.dist.name"
+        value="${name.lowercase}-${version}-bin-modules"/>
 
     <!-- Creating a staging directory in which to copy all of the needed
     pieces of this zip file. -->
     <property name="module.staging.dir" location="${distrib.dir}/module-staging"/>
-    <mkdir dir="${module.staging.dir}/lib"/>
+    <property name="module.staging.lib.dir"
+        location="${module.staging.dir}/${module.dist.name}/lib"/>
+    <mkdir dir="${module.staging.lib.dir}"/>
 
     <!-- Copy the FOray module jar files and the lib directory into the staging
     area. -->
-    <copy todir="${module.staging.dir}/lib">
+    <copy todir="${module.staging.lib.dir}">
       <fileset dir="${foray.home}/foray-app/build/ant" includes="foray*.jar"/>
       <fileset dir="${foray.home}/foray-areatree/build/ant" includes="foray*.jar"/>
       <fileset dir="${foray.home}/foray-common/build/ant" includes="foray*.jar"/>
@@ -264,8 +271,7 @@
     </copy>
 
     <!-- Create the zip file from the staging directory. -->
-    <property name="module.zip.name" value="${name.lowercase}-${version}-bin-modules.zip"/>
-    <zip zipfile="${distrib.dir}/${module.zip.name}">
+    <zip zipfile="${distrib.dir}/${module.dist.name}.zip">
       <fileset dir="${module.staging.dir}"/>
     </zip>
 
@@ -281,12 +287,28 @@
   -->
   <target name="dist-src" depends="package-all, dist-prepare">
     <echo message="Building the source distribution files"/>
+    <property name="source.dist.name"
+        value="${name.lowercase}-${version}-src"/>
 
+    <!-- Creating a staging directory in which to copy all of the needed
+    pieces of this zip file. -->
+    <property name="source.staging.dir" location="${distrib.dir}/source-staging"/>
+    <property name="source.staging.root"
+        location="${source.staging.dir}/${source.dist.name}"/>
+    <mkdir dir="${source.staging.root}"/>
+
+    <!-- Copy the source directory to the staging area. -->
+    <copy todir="${source.staging.root}">
+      <fileset dir="${foray.home}" excludes="build/**"/>
+    </copy>
+
     <!-- Create zip file containing the source code. -->
-    <property name="source.zip.name" value="${name.lowercase}-${version}-src.zip"/>
-    <zip zipfile="${distrib.dir}/${source.zip.name}">
-      <fileset dir="${foray.home}" excludes="build/**"/>
+    <zip zipfile="${distrib.dir}/${source.dist.name}.zip">
+      <fileset dir="${source.staging.dir}"/>
     </zip>
+
+    <!-- Blow away the staging directory. -->
+    <delete dir="${source.staging.dir}"/>
   </target>
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8250
          http://svn.sourceforge.net/foray/?rev=8250&view=rev
Author:   victormote
Date:     2006-09-29 17:24:17 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Minor changes to the names of the build files.

Modified Paths:
--------------
    trunk/foray/scripts/build.xml

Modified: trunk/foray/scripts/build.xml
===================================================================
--- trunk/foray/scripts/build.xml	2006-09-30 00:15:53 UTC (rev 8249)
+++ trunk/foray/scripts/build.xml	2006-09-30 00:24:17 UTC (rev 8250)
@@ -215,7 +215,7 @@
     </copy>
 
     <!-- Create the zip file from the staging directory. -->
-    <property name="binary.zip.name" value="${name.lowercase}-${version}-bin.zip"/>
+    <property name="binary.zip.name" value="${name.lowercase}-${version}-bin-all.zip"/>
     <zip zipfile="${distrib.dir}/${binary.zip.name}">
       <fileset dir="${bin.staging.dir}"/>
     </zip>
@@ -264,7 +264,7 @@
     </copy>
 
     <!-- Create the zip file from the staging directory. -->
-    <property name="module.zip.name" value="${name.lowercase}-${version}-modules-bin.zip"/>
+    <property name="module.zip.name" value="${name.lowercase}-${version}-bin-modules.zip"/>
     <zip zipfile="${distrib.dir}/${module.zip.name}">
       <fileset dir="${module.staging.dir}"/>
     </zip>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8249
          http://svn.sourceforge.net/foray/?rev=8249&view=rev
Author:   victormote
Date:     2006-09-29 17:15:53 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Change the name of the jar file containing all FOray code to include "-all".

Modified Paths:
--------------
    trunk/foray/scripts/build.xml

Modified: trunk/foray/scripts/build.xml
===================================================================
--- trunk/foray/scripts/build.xml	2006-09-29 23:45:58 UTC (rev 8248)
+++ trunk/foray/scripts/build.xml	2006-09-30 00:15:53 UTC (rev 8249)
@@ -64,7 +64,7 @@
   <target name="package" depends="module-list"
       description="Generates a jar file for whatever targets have been built.">
 
-    <!-- If the "app" target has been run, file.subset = "". In all other
+    <!-- If the "app" target has been run, file.subset = "-all". In all other
     cases, we are creating some subset. -->
     <property name="file.subset" value="-subset"/>
     <property name="app.jar.name" value="${name.lowercase}-${version}${file.subset}.jar"/>
@@ -789,7 +789,7 @@
   <target name="app" depends="prepare, pretty, ps, graphic, mif, font, hyphen,
       text, pdf, fotree, areatree, pioneer, render, core">
     <property name="module.app" value=", app"/>
-    <property name="file.subset" value=""/>
+    <property name="file.subset" value="-all"/>
     <ant antfile="${foray.home}/foray-app/scripts/build.xml"
         inheritall="false"
         target="style">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8248
          http://svn.sourceforge.net/foray/?rev=8248&view=rev
Author:   victormote
Date:     2006-09-29 16:45:58 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Remove the afm files from the compiled class file jar.

Modified Paths:
--------------
    trunk/foray/foray-font/scripts/build.xml

Modified: trunk/foray/foray-font/scripts/build.xml
===================================================================
--- trunk/foray/foray-font/scripts/build.xml	2006-09-29 23:35:31 UTC (rev 8247)
+++ trunk/foray/foray-font/scripts/build.xml	2006-09-29 23:45:58 UTC (rev 8248)
@@ -124,10 +124,6 @@
            >
       <classpath refid="libs-build-classpath"/>
     </javac>
-    <!-- Copy the base-14 files into the build directory. -->
-    <copy todir="${classes.dir}/org/foray/font/resources/base-14">
-      <fileset dir="${module.dir}/resource/base-14" includes="**"/>
-    </copy>
   </target>
 
   <!-- =================================================================== -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8247
          http://svn.sourceforge.net/foray/?rev=8247&view=rev
Author:   victormote
Date:     2006-09-29 16:35:31 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
1. Change Eclipse class path to use the lib font resource jar file instead of the compiled font class file jar.
2. Change the path to match what is built, which is now a standard.

Modified Paths:
--------------
    trunk/foray/foray-font/.classpath
    trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java

Modified: trunk/foray/foray-font/.classpath
===================================================================
--- trunk/foray/foray-font/.classpath	2006-09-29 23:25:04 UTC (rev 8246)
+++ trunk/foray/foray-font/.classpath	2006-09-29 23:35:31 UTC (rev 8247)
@@ -11,8 +11,8 @@
 	<classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
 	<classpathentry kind="var" path="FORAY_LIB_ROOT/xercesImpl-2.7.1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/FOrayPretty"/>
-	<classpathentry kind="lib" path="D:/vic/foray/trunk/foray/foray-font/build/ant/foray-font-0.2.jar"/>
 	<classpathentry kind="var" path="FORAY_LIB_ROOT/commons-io-1.2.jar"/>
 	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
+	<classpathentry kind="var" path="FORAY_LIB_ROOT/foray-font-0.2-rsrc.jar"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java	2006-09-29 23:25:04 UTC (rev 8246)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java	2006-09-29 23:35:31 UTC (rev 8247)
@@ -430,7 +430,7 @@
      */
     private void registerBase14Font(final String fontName,
             final String fileName) {
-        final String resourceName = "org/foray/font/resources/base-14/"
+        final String resourceName = "org/foray/font/resource/base-14/"
                 + fileName;
         final ClassLoader loader = ClassLoader.getSystemClassLoader();
         final URL metricURL = loader.getResource(resourceName);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8246
          http://svn.sourceforge.net/foray/?rev=8246&view=rev
Author:   victormote
Date:     2006-09-29 16:25:04 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Add base-14 font jar file to standard libs.

Added Paths:
-----------
    trunk/foray/lib/foray-font-0.2-rsrc.jar

Added: trunk/foray/lib/foray-font-0.2-rsrc.jar
===================================================================
(Binary files differ)


Property changes on: trunk/foray/lib/foray-font-0.2-rsrc.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8245
          http://svn.sourceforge.net/foray/?rev=8245&view=rev
Author:   victormote
Date:     2006-09-29 16:21:45 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Change build to jar up the AFM files instead of the serialized parsed versions of them.

Modified Paths:
--------------
    trunk/foray/foray-font/scripts/build.xml

Modified: trunk/foray/foray-font/scripts/build.xml
===================================================================
--- trunk/foray/foray-font/scripts/build.xml	2006-09-29 22:44:14 UTC (rev 8244)
+++ trunk/foray/foray-font/scripts/build.xml	2006-09-29 23:21:45 UTC (rev 8245)
@@ -62,28 +62,39 @@
   Parse and serialize the Base-14 AFM files
   ==============================================================================
   -->
-  <target name="resources" depends="compile"
+  <target name="resources" depends="init"
       description="Parse and serialize the Base-14 AFM files">
     <delete dir="${resources.build}"/>
+    <delete file="${font.resource.jar.file}"/>
     <mkdir dir="${resources.build}"/>
     <path id="resources-classpath">
       <path refid="libs-build-classpath"/>
       <pathelement location="${classes.dir}"/>
     </path>
+
+    <!-- BEGIN SKIPPED CODE. -->
+    <!--
     <taskdef name="serializeMetrics"
         classname="org.foray.font.SerializeStandardFonts"
         classpathref="resources-classpath"/>
     <serializeMetrics includes="*.afm"
              sourceDir="${base14.source}"
              targetDir="${resources.build}" />
+    -->
+    <!-- END SKIPPED CODE. -->
 
     <!-- Put the compiled font metrics objects in a jar file. -->
+    <copy todir="${resources.build}">
+      <fileset dir="${base14.source}" includes="**"/>
+    </copy>
     <property name="font.resource.jar.file"
         location="${build.dir}/${name.lowercase}-${module}-${version}-rsrc.jar"/>
+
     <fileset id="foray-font-resources"
         dir="${foray.home}/${name.lowercase}-${module}/build/ant/resource">
       <include name="**"/>
     </fileset>
+
     <jar jarfile="${font.resource.jar.file}">
       <fileset refid="foray-font-resources"/>
       <manifest>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8244
          http://svn.sourceforge.net/foray/?rev=8244&view=rev
Author:   victormote
Date:     2006-09-29 15:44:14 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Blow away the old results each time.

Modified Paths:
--------------
    trunk/foray/foray-font/scripts/build.xml

Modified: trunk/foray/foray-font/scripts/build.xml
===================================================================
--- trunk/foray/foray-font/scripts/build.xml	2006-09-29 22:04:52 UTC (rev 8243)
+++ trunk/foray/foray-font/scripts/build.xml	2006-09-29 22:44:14 UTC (rev 8244)
@@ -64,6 +64,7 @@
   -->
   <target name="resources" depends="compile"
       description="Parse and serialize the Base-14 AFM files">
+    <delete dir="${resources.build}"/>
     <mkdir dir="${resources.build}"/>
     <path id="resources-classpath">
       <path refid="libs-build-classpath"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8243
          http://svn.sourceforge.net/foray/?rev=8243&view=rev
Author:   victormote
Date:     2006-09-29 15:04:52 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Add logic allowing the AFM files to be serialized and assembled in a jar file.

Modified Paths:
--------------
    trunk/foray/foray-font/scripts/build.xml
    trunk/foray/foray-font/src/java/org/foray/font/SerializeStandardFonts.java

Modified: trunk/foray/foray-font/scripts/build.xml
===================================================================
--- trunk/foray/foray-font/scripts/build.xml	2006-09-29 03:43:38 UTC (rev 8242)
+++ trunk/foray/foray-font/scripts/build.xml	2006-09-29 22:04:52 UTC (rev 8243)
@@ -17,11 +17,17 @@
     <property name="jar.file"
         location="${build.dir}/${name.lowercase}-${module}-${version}.jar"/>
 
+    <property name="resource.dir" value="${module.dir}/resource"/>
+    <property name="base14.source" value="${resource.dir}/base-14"/>
+    <property name="resources.build"
+        location="${build.dir}/resource/org/foray/font/resource/base-14"/>
+
     <path id="libs-build-classpath">
       <fileset dir="${axsl.build}">
         <include name="**/axsl*.jar"/>
       </fileset>
       <fileset dir="${lib.dir}">
+        <include name="avalon-framework*.jar"/>
         <include name="xercesImpl*.jar"/>
         <include name="axsl*.jar"/>
         <include name="commons-logging.jar"/>
@@ -50,6 +56,46 @@
     <mkdir dir="${classes.dir}"/>
   </target>
 
+
+  <!--
+  ==============================================================================
+  Parse and serialize the Base-14 AFM files
+  ==============================================================================
+  -->
+  <target name="resources" depends="compile"
+      description="Parse and serialize the Base-14 AFM files">
+    <mkdir dir="${resources.build}"/>
+    <path id="resources-classpath">
+      <path refid="libs-build-classpath"/>
+      <pathelement location="${classes.dir}"/>
+    </path>
+    <taskdef name="serializeMetrics"
+        classname="org.foray.font.SerializeStandardFonts"
+        classpathref="resources-classpath"/>
+    <serializeMetrics includes="*.afm"
+             sourceDir="${base14.source}"
+             targetDir="${resources.build}" />
+
+    <!-- Put the compiled font metrics objects in a jar file. -->
+    <property name="font.resource.jar.file"
+        location="${build.dir}/${name.lowercase}-${module}-${version}-rsrc.jar"/>
+    <fileset id="foray-font-resources"
+        dir="${foray.home}/${name.lowercase}-${module}/build/ant/resource">
+      <include name="**"/>
+    </fileset>
+    <jar jarfile="${font.resource.jar.file}">
+      <fileset refid="foray-font-resources"/>
+      <manifest>
+        <attribute name="Implementation-Title"
+            value="${name.lowercase}-${module}-rsrc"/>
+        <attribute name="Implementation-Version" value="${version}"/>
+        <attribute name="Implementation-Vendor"
+            value="${contact.info}"/>
+      </manifest>
+    </jar>
+  </target>
+
+
   <!-- =================================================================== -->
   <!-- Compiles the source directory                                       -->
   <!-- =================================================================== -->

Modified: trunk/foray/foray-font/src/java/org/foray/font/SerializeStandardFonts.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/SerializeStandardFonts.java	2006-09-29 03:43:38 UTC (rev 8242)
+++ trunk/foray/foray-font/src/java/org/foray/font/SerializeStandardFonts.java	2006-09-29 22:04:52 UTC (rev 8243)
@@ -102,7 +102,7 @@
      * @param filename The input file to be processed.
      */
     private void processFile(final String filename) {
-        final File infile = new File(sourceDir, filename + ".xml");
+        final File infile = new File(sourceDir, filename + ".afm");
         final File outfile = new File(targetDir, filename + "."
                 + FOrayConstants.BINARY_SERIALIZATION_EXTENSION);
         boolean startProcess = true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8242
          http://svn.sourceforge.net/foray/?rev=8242&view=rev
Author:   victormote
Date:     2006-09-28 20:43:38 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
Clean up some minor build problems.

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/scripts/build.xml
    trunk/foray/foray-text/scripts/build.xml

Modified: trunk/foray/foray-hyphen-r/scripts/build.xml
===================================================================
--- trunk/foray/foray-hyphen-r/scripts/build.xml	2006-09-29 03:27:50 UTC (rev 8241)
+++ trunk/foray/foray-hyphen-r/scripts/build.xml	2006-09-29 03:43:38 UTC (rev 8242)
@@ -48,7 +48,6 @@
     <echo message="Preparing the build directories"/>
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${classes.dir}"/>
-    <mkdir dir="${hyph.build}"/>
   </target>
 
 
@@ -59,6 +58,7 @@
   -->
   <target name="hyphenation" depends="compile"
       description="Parse and serialize the hyphenation patterns">
+    <mkdir dir="${hyph.build}"/>
     <path id="hyph-classpath">
       <path refid="libs-build-classpath"/>
       <pathelement location="${classes.dir}"/>
@@ -111,7 +111,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, hyphenation"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${jar.file}"/>
 

Modified: trunk/foray/foray-text/scripts/build.xml
===================================================================
--- trunk/foray/foray-text/scripts/build.xml	2006-09-29 03:27:50 UTC (rev 8241)
+++ trunk/foray/foray-text/scripts/build.xml	2006-09-29 03:43:38 UTC (rev 8242)
@@ -43,7 +43,6 @@
     <echo message="Preparing the build directories"/>
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${classes.dir}"/>
-    <mkdir dir="${hyph.build}"/>
   </target>
 
 
@@ -79,13 +78,8 @@
         dir="${foray.home}/foray-text/build/ant/classes">
       <include name="**"/>
     </fileset>
-    <fileset id="foray-text-resources"
-        dir="${foray.home}/foray-text/build/ant">
-      <include name="hyph/**"/>
-    </fileset>
     <jar jarfile="${jar.file}">
       <fileset refid="foray-text-classes"/>
-      <fileset refid="foray-text-resources"/>
       <manifest>
         <attribute name="Implementation-Title" value="${name}-${module}"/>
         <attribute name="Implementation-Version" value="${version}"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8241
          http://svn.sourceforge.net/foray/?rev=8241&view=rev
Author:   victormote
Date:     2006-09-28 20:27:50 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
Remove the build of hyphenation patterns from the standard builds and from the combined jar file.

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/scripts/build.xml
    trunk/foray/scripts/build.xml

Modified: trunk/foray/foray-hyphen-r/scripts/build.xml
===================================================================
--- trunk/foray/foray-hyphen-r/scripts/build.xml	2006-09-29 03:04:33 UTC (rev 8240)
+++ trunk/foray/foray-hyphen-r/scripts/build.xml	2006-09-29 03:27:50 UTC (rev 8241)
@@ -54,10 +54,11 @@
 
   <!--
   ==============================================================================
-  Compile and serialize the hyphenation patterns
+  Parse and serialize the hyphenation patterns
   ==============================================================================
   -->
-  <target name="hyphenation" depends="compile" >
+  <target name="hyphenation" depends="compile"
+      description="Parse and serialize the hyphenation patterns">
     <path id="hyph-classpath">
       <path refid="libs-build-classpath"/>
       <pathelement location="${classes.dir}"/>

Modified: trunk/foray/scripts/build.xml
===================================================================
--- trunk/foray/scripts/build.xml	2006-09-29 03:04:33 UTC (rev 8240)
+++ trunk/foray/scripts/build.xml	2006-09-29 03:27:50 UTC (rev 8241)
@@ -107,10 +107,6 @@
         dir="${foray.home}/foray-hyphen-r/build/ant/classes">
       <include name="**"/>
     </fileset>
-    <fileset id="foray-hyphen-resources"
-        dir="${foray.home}/foray-hyphen-r/build/ant/resource">
-      <include name="**"/>
-    </fileset>
     <fileset id="foray-text-classes"
         dir="${foray.home}/foray-text/build/ant/classes">
       <include name="**"/>
@@ -158,7 +154,6 @@
       <fileset refid="foray-pdf-classes"/>
       <fileset refid="foray-font-classes"/>
       <fileset refid="foray-hyphen-classes"/>
-      <fileset refid="foray-hyphen-resources"/>
       <fileset refid="foray-text-classes"/>
       <fileset refid="foray-fotree-classes"/>
       <fileset refid="foray-areatree-classes"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.