[FOray-commit] SF.net SVN: foray: [9961] trunk/foray

[<vic...@us...>]

Revision: 9961
          http://svn.sourceforge.net/foray/?rev=9961&view=rev
Author:   victormote
Date:     2007-07-09 13:44:13 -0700 (Mon, 09 Jul 2007)

Log Message:
-----------
Fix various issues related to moving the hyphenation directories around.

Modified Paths:
--------------
    trunk/foray/foray-hyphen/scripts/build.xml
    trunk/foray/foray-hyphen/src/java/org/foray/hyphen/FOrayHyphenationServer.java

Added Paths:
-----------
    trunk/foray/lib/foray-hyphen-0.3-rsrc.jar

Removed Paths:
-------------
    trunk/foray/lib/foray-hyphen-r-0.3-rsrc.jar

Modified: trunk/foray/foray-hyphen/scripts/build.xml
===================================================================
--- trunk/foray/foray-hyphen/scripts/build.xml	2007-07-09 20:26:12 UTC (rev 9960)
+++ trunk/foray/foray-hyphen/scripts/build.xml	2007-07-09 20:44:13 UTC (rev 9961)
@@ -9,7 +9,7 @@
   <!-- Initialization target                                               -->
   <!-- =================================================================== -->
   <target name="init" depends="env, common-init">
-    <property name="module" value="hyphen-r"/>
+    <property name="module" value="hyphen"/>
     <property name="module.dir" value="${foray.sandbox}/foray-${module}"/>
     <property name="src.dir" value="${module.dir}/src/java"/>
     <property name="build.dir" value="${module.dir}/build/ant"/>
@@ -20,7 +20,7 @@
     <property name="resource.dir" value="${module.dir}/resource"/>
     <property name="hyph.source" value="${resource.dir}/hyph-patterns"/>
     <property name="hyph.build"
-        value="${build.dir}/resource/org/foray/hyphenR/resource/patterns"/>
+        value="${build.dir}/resource/org/foray/hyphen/resource/patterns"/>
 
     <path id="libs-build-classpath">
       <fileset dir="${axsl.build}">
@@ -64,7 +64,7 @@
       <pathelement location="${classes.dir}"/>
     </path>
     <taskdef name="serHyph"
-        classname="org.foray.hyphenR.SerializeHyphPattern"
+        classname="org.foray.hyphen.SerializeHyphPattern"
         classpathref="hyph-classpath"/>
     <serHyph includes="*.xml"
              sourceDir="${hyph.source}"
@@ -74,7 +74,7 @@
     <property name="hyphen.resource.jar.file"
         location="${build.dir}/${name.lowercase}-${module}-${version}-rsrc.jar"/>
     <fileset id="foray-hyphen-resources"
-        dir="${foray.sandbox}/foray-hyphen-r/build/ant/resource">
+        dir="${foray.sandbox}/foray-hyphen/build/ant/resource">
       <include name="**"/>
     </fileset>
     <jar jarfile="${hyphen.resource.jar.file}">
@@ -119,7 +119,7 @@
       <format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
     </tstamp>
     <fileset id="foray-hyphen-classes"
-        dir="${foray.sandbox}/foray-hyphen-r/build/ant/classes">
+        dir="${foray.sandbox}/foray-hyphen/build/ant/classes">
       <include name="**"/>
     </fileset>
     <jar jarfile="${jar.file}">
@@ -139,7 +139,7 @@
     <echo message="Producing the javadoc files "/>
     <mkdir dir="${build.dir}/javadoc-api"/>
     <javadoc
-        packagenames="org.foray.hyphenR"
+        packagenames="org.foray.hyphen"
         sourcepath="${src.dir}/java"
         destdir="${build.dir}/javadoc-api"
         classpathref="libs-build-classpath"
@@ -148,7 +148,7 @@
         windowtitle="FOray Hyphenation API"
         doctitle="FOray Hyphenation API"
         bottom="Copyright &#169; 2004 The FOray Project. All Rights Reserved."
-        overview="${src.dir}/java/org/foray/hyphenR/overview.html"
+        overview="${src.dir}/java/org/foray/hyphen/overview.html"
         use="true"
         access="public"
         failonerror="true">

Modified: trunk/foray/foray-hyphen/src/java/org/foray/hyphen/FOrayHyphenationServer.java
===================================================================
--- trunk/foray/foray-hyphen/src/java/org/foray/hyphen/FOrayHyphenationServer.java	2007-07-09 20:26:12 UTC (rev 9960)
+++ trunk/foray/foray-hyphen/src/java/org/foray/hyphen/FOrayHyphenationServer.java	2007-07-09 20:44:13 UTC (rev 9961)
@@ -64,7 +64,7 @@
 
     /** The path to the hyphenation patterns. */
     public static final String PATTERN_RESOURCE_PATH =
-            "org/foray/hyphenR/resource/patterns";
+            "org/foray/hyphen/resource/patterns";
 
     /** Standard text for some user messages. */
     private static final String PATTERN_MISSING_TEXT =

Copied: trunk/foray/lib/foray-hyphen-0.3-rsrc.jar (from rev 9957, trunk/foray/lib/foray-hyphen-r-0.3-rsrc.jar)
===================================================================
(Binary files differ)

Deleted: trunk/foray/lib/foray-hyphen-r-0.3-rsrc.jar
===================================================================
(Binary files differ)


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