Thread: [FOray-commit] SF.net SVN: foray:[10997] trunk/foray (Page 5)
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit
|
From: <vic...@us...> - 2010-05-04 22:11:55
|
Revision: 10997
http://foray.svn.sourceforge.net/foray/?rev=10997&view=rev
Author: victormote
Date: 2010-05-04 22:11:47 +0000 (Tue, 04 May 2010)
Log Message:
-----------
Move source directories to standard maven configuration.
Added Paths:
-----------
trunk/foray/foray-app/src/main/java/
trunk/foray/foray-app/src/test/java/
trunk/foray/foray-areatree/src/main/java/
trunk/foray/foray-areatree/src/test/java/
trunk/foray/foray-common/src/main/java/
trunk/foray/foray-common/src/test/java/
trunk/foray/foray-core/src/main/
trunk/foray/foray-core/src/main/java/
trunk/foray/foray-font/src/main/java/
trunk/foray/foray-font/src/test/java/
trunk/foray/foray-fotree/src/main/java/
trunk/foray/foray-fotree/src/test/java/
trunk/foray/foray-graphic/src/main/java/
trunk/foray/foray-graphic/src/test/java/
trunk/foray/foray-hyphen/src/main/java/
trunk/foray/foray-hyphen/src/test/java/
trunk/foray/foray-layout/src/main/java/
trunk/foray/foray-mif/src/main/java/
trunk/foray/foray-output/src/main/
trunk/foray/foray-output/src/main/java/
trunk/foray/foray-pdf/src/main/java/
trunk/foray/foray-pioneer/src/main/java/
trunk/foray/foray-ps/src/main/java/
trunk/foray/foray-ps/src/test/java/
trunk/foray/foray-render/src/main/java/
trunk/foray/foray-render/src/test/java/
trunk/foray/foray-speech/src/main/java/
trunk/foray/foray-text/src/main/java/
trunk/foray/foray-xml/src/main/java/
Removed Paths:
-------------
trunk/foray/foray-app/src/java/
trunk/foray/foray-app/src/javatest/
trunk/foray/foray-areatree/src/java/
trunk/foray/foray-areatree/src/javatest/
trunk/foray/foray-common/src/java/
trunk/foray/foray-common/src/javatest/
trunk/foray/foray-core/src/java/
trunk/foray/foray-core/src/test/
trunk/foray/foray-font/src/java/
trunk/foray/foray-font/src/javatest/
trunk/foray/foray-fotree/src/java/
trunk/foray/foray-fotree/src/javatest/
trunk/foray/foray-graphic/src/java/
trunk/foray/foray-graphic/src/javatest/
trunk/foray/foray-hyphen/src/java/
trunk/foray/foray-hyphen/src/javatest/
trunk/foray/foray-layout/src/java/
trunk/foray/foray-layout/src/test/
trunk/foray/foray-mif/src/java/
trunk/foray/foray-output/src/java/
trunk/foray/foray-output/src/test/
trunk/foray/foray-pdf/src/java/
trunk/foray/foray-pioneer/src/java/
trunk/foray/foray-ps/src/java/
trunk/foray/foray-ps/src/javatest/
trunk/foray/foray-render/src/java/
trunk/foray/foray-render/src/javatest/
trunk/foray/foray-speech/src/java/
trunk/foray/foray-text/src/java/
trunk/foray/foray-xml/src/java/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-05-04 22:29:38
|
Revision: 10998
http://foray.svn.sourceforge.net/foray/?rev=10998&view=rev
Author: victormote
Date: 2010-05-04 22:29:31 +0000 (Tue, 04 May 2010)
Log Message:
-----------
Adjust eclipse classpath files and other files dependent on the location of the source code. (Skipping ant files for now).
Modified Paths:
--------------
trunk/foray/foray-all/scripts/checkstyle-config.xml
trunk/foray/foray-all/scripts/checkstyle-suppressions.xml
trunk/foray/foray-app/.classpath
trunk/foray/foray-areatree/.classpath
trunk/foray/foray-common/.classpath
trunk/foray/foray-core/.classpath
trunk/foray/foray-font/.classpath
trunk/foray/foray-fotree/.classpath
trunk/foray/foray-graphic/.classpath
trunk/foray/foray-hyphen/.classpath
trunk/foray/foray-layout/.classpath
trunk/foray/foray-mif/.classpath
trunk/foray/foray-output/.classpath
trunk/foray/foray-pdf/.classpath
trunk/foray/foray-pioneer/.classpath
trunk/foray/foray-ps/.classpath
trunk/foray/foray-render/.classpath
trunk/foray/foray-speech/.classpath
trunk/foray/foray-text/.classpath
trunk/foray/foray-xml/.classpath
Modified: trunk/foray/foray-all/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/foray-all/scripts/checkstyle-config.xml 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-all/scripts/checkstyle-config.xml 2010-05-04 22:29:31 UTC (rev 10998)
@@ -13,7 +13,7 @@
<!-- Reference the file with suppression information. -->
<module name="SuppressionFilter">
- <property name="file" value="${foray.sandbox}/scripts/checkstyle-suppressions.xml"/>
+ <property name="file" value="${foray.sandbox}/foray-all/scripts/checkstyle-suppressions.xml"/>
</module>
<module name="FileTabCharacter">
@@ -21,7 +21,7 @@
</module>
<module name="RegexpHeader">
- <property name="headerFile" value="${foray.sandbox}/scripts/checkstyle-header-java.txt"/>
+ <property name="headerFile" value="${foray.sandbox}/foray-all/scripts/checkstyle-header-java.txt"/>
</module>
<!-- Make sure each package has javadoc package.html -->
Modified: trunk/foray/foray-all/scripts/checkstyle-suppressions.xml
===================================================================
--- trunk/foray/foray-all/scripts/checkstyle-suppressions.xml 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-all/scripts/checkstyle-suppressions.xml 2010-05-04 22:29:31 UTC (rev 10998)
@@ -9,18 +9,18 @@
<!-- Permanently suppress Javadoc check for "illegal catch" in FOrayURLStreamHandler. Catching
class "Error" here is the only way to get the needed information. -->
<suppress checks="IllegalCatch"
- files="src.java.org.foray.common.url.FOrayURLStreamHandler.*"/>
+ files="src.main.java.org.foray.common.url.FOrayURLStreamHandler.*"/>
<!-- Permanently suppress certain tests in the PatGen class. This class attempts to mimic exactly the content of the
original Pascal WEB file, and does not conform to our usual coding standards. -->
<suppress checks="DeclarationOrder"
- files="src.java.org.foray.hyphen.PatGen.*"/>
+ files="src.main.java.org.foray.hyphen.PatGen.*"/>
<!-- Permanently suppress Javadoc package documentation for test directories. -->
<suppress checks="JavadocPackage"
- files="src.javatest.*"/>
+ files="src.test.java.*"/>
<!-- Permanently suppress Magic Number check for test directories. -->
<suppress checks="MagicNumber"
- files="src.javatest.*"/>
+ files="src.test.java.*"/>
</suppressions>
Modified: trunk/foray/foray-app/.classpath
===================================================================
--- trunk/foray/foray-app/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-app/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/javatest"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="src" path="/FOrayFont"/>
<classpathentry kind="src" path="/FOrayGraphic"/>
Modified: trunk/foray/foray-areatree/.classpath
===================================================================
--- trunk/foray/foray-areatree/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-areatree/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/javatest"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="lib" path="/FOray Lib/svg-1.1.jar" sourcepath="/FOray Lib-Build/svg/svg-1.1-src.zip"/>
Modified: trunk/foray/foray-common/.classpath
===================================================================
--- trunk/foray/foray-common/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-common/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/javatest"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit-4.4.jar" sourcepath="/FOray Lib-Build/junit/junit-4.4-src.jar"/>
<classpathentry kind="lib" path="/FOray Lib/commons-io-1.4.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.4-sources.jar"/>
Modified: trunk/foray/foray-core/.classpath
===================================================================
--- trunk/foray/foray-core/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-core/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar" sourcepath="/FOray Lib-Build/xerces/Xerces-J-src.2.7.1.zip"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
Modified: trunk/foray/foray-font/.classpath
===================================================================
--- trunk/foray/foray-font/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-font/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/javatest"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayXml"/>
<classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar" sourcepath="/FOray Lib-Build/xerces/Xerces-J-src.2.7.1.zip"/>
Modified: trunk/foray/foray-fotree/.classpath
===================================================================
--- trunk/foray/foray-fotree/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-fotree/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="/FOrayCommon"/>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/javatest"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="lib" path="/FOray Lib/svg-1.1.jar" sourcepath="/FOray Lib-Build/svg/svg-1.1-src.zip"/>
<classpathentry kind="lib" path="/FOray Lib/mathml-2.0.jar" sourcepath="/FOray Lib-Build/mathml/mathml-2.0-src.zip"/>
Modified: trunk/foray/foray-graphic/.classpath
===================================================================
--- trunk/foray/foray-graphic/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-graphic/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/javatest"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="lib" path="/FOray Lib/svg-1.1.jar" sourcepath="/FOray Lib-Build/svg/svg-1.1-src.zip"/>
Modified: trunk/foray/foray-hyphen/.classpath
===================================================================
--- trunk/foray/foray-hyphen/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-hyphen/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/javatest"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar" sourcepath="/FOray Lib-Build/xerces/Xerces-J-src.2.7.1.zip"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
Modified: trunk/foray/foray-layout/.classpath
===================================================================
--- trunk/foray/foray-layout/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-layout/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: trunk/foray/foray-mif/.classpath
===================================================================
--- trunk/foray/foray-mif/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-mif/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: trunk/foray/foray-output/.classpath
===================================================================
--- trunk/foray/foray-output/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-output/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: trunk/foray/foray-pdf/.classpath
===================================================================
--- trunk/foray/foray-pdf/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-pdf/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="lib" path="/FOray Lib/svg-1.1.jar" sourcepath="/FOray Lib-Build/svg/svg-1.1-src.zip"/>
Modified: trunk/foray/foray-pioneer/.classpath
===================================================================
--- trunk/foray/foray-pioneer/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-pioneer/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayLayout"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
Modified: trunk/foray/foray-ps/.classpath
===================================================================
--- trunk/foray/foray-ps/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-ps/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/javatest"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit-4.4.jar" sourcepath="/FOray Lib-Build/junit/junit-4.4-src.jar"/>
Modified: trunk/foray/foray-render/.classpath
===================================================================
--- trunk/foray/foray-render/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-render/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/javatest"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="src" path="/FOrayOutput"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
Modified: trunk/foray/foray-speech/.classpath
===================================================================
--- trunk/foray/foray-speech/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-speech/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry combineaccessrules="false" kind="src" path="/axsl-speech"/>
<classpathentry kind="output" path="build/eclipse"/>
Modified: trunk/foray/foray-text/.classpath
===================================================================
--- trunk/foray/foray-text/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-text/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/java"/>
+ <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: trunk/foray/foray-xml/.classpath
===================================================================
--- trunk/foray/foray-xml/.classpath 2010-05-04 22:11:47 UTC (rev 10997)
+++ trunk/foray/foray-xml/.classpath 2010-05-04 22:29:31 UTC (rev 10998)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/resolver.jar"/>
<classpathentry kind="lib" path="/FOray Lib/stax-api-1.0.1.jar" sourcepath="/FOray Lib-Build/stax/stax-src-1.2.0.zip"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-05-05 01:01:39
|
Revision: 10999
http://foray.svn.sourceforge.net/foray/?rev=10999&view=rev
Author: victormote
Date: 2010-05-05 01:01:32 +0000 (Wed, 05 May 2010)
Log Message:
-----------
1. Add dependencies to poms.
2. Add "target" to list of svn-ignored directories.
Modified Paths:
--------------
trunk/foray/foray-app/pom.xml
trunk/foray/foray-areatree/pom.xml
trunk/foray/foray-common/pom.xml
trunk/foray/foray-core/pom.xml
trunk/foray/foray-font/pom.xml
trunk/foray/foray-fotree/pom.xml
trunk/foray/foray-graphic/pom.xml
trunk/foray/foray-hyphen/pom.xml
trunk/foray/foray-layout/pom.xml
trunk/foray/foray-mif/pom.xml
trunk/foray/foray-output/pom.xml
trunk/foray/foray-pdf/pom.xml
trunk/foray/foray-pioneer/pom.xml
trunk/foray/foray-ps/pom.xml
trunk/foray/foray-render/pom.xml
trunk/foray/foray-speech/pom.xml
trunk/foray/foray-text/pom.xml
trunk/foray/foray-xml/pom.xml
Property Changed:
----------------
trunk/foray/foray-app/
trunk/foray/foray-areatree/
trunk/foray/foray-common/
trunk/foray/foray-core/
trunk/foray/foray-font/
trunk/foray/foray-fotree/
trunk/foray/foray-graphic/
trunk/foray/foray-hyphen/
trunk/foray/foray-layout/
trunk/foray/foray-mif/
trunk/foray/foray-output/
trunk/foray/foray-pdf/
trunk/foray/foray-pioneer/
trunk/foray/foray-ps/
trunk/foray/foray-render/
trunk/foray/foray-speech/
trunk/foray/foray-text/
trunk/foray/foray-xml/
Property changes on: trunk/foray/foray-app
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-app/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -17,4 +17,174 @@
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.4.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-areatree</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-core</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-font</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-fotree</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-graphic</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-hyphen</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-layout</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-mif</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-output</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-pdf</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-pioneer</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-ps</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-render</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-speech</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-text</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-areatree
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-areatree/pom.xml
===================================================================
--- trunk/foray/foray-areatree/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-areatree/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -17,4 +17,42 @@
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-area</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-galley</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-common
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-common/pom.xml
===================================================================
--- trunk/foray/foray-common/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-common/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -16,5 +16,56 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-common</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-ps</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
Property changes on: trunk/foray/foray-core
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-core/pom.xml
===================================================================
--- trunk/foray/foray-core/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-core/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -16,5 +16,109 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <!-- TODO: This project has a runtime dependency on foray-common-0.4-dev-rsrc.jar which has not yet been accounted
+ for in this POM. -->
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-area</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-common</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-fo</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-font</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-galley</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-graphic</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-hyphen</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-layout</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-output</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-speech</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-text</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-font
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-font/pom.xml
===================================================================
--- trunk/foray/foray-font/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-font/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -17,4 +17,76 @@
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-common</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-font</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-xml</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-fotree
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-fotree/pom.xml
===================================================================
--- trunk/foray/foray-fotree/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-fotree/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -17,4 +17,35 @@
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-fo</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-graphic
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-graphic/pom.xml
===================================================================
--- trunk/foray/foray-graphic/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-graphic/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -17,4 +17,162 @@
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-bridge</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-gvt</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-parser</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-script</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-svg-dom</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-dom</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-xml</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-css</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-awt-util</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-svggen</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jeuclid</groupId>
+ <artifactId>jeuclid-core</artifactId>
+ <version>3.0.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-graphic</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-pdf</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-hyphen
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-hyphen/pom.xml
===================================================================
--- trunk/foray/foray-hyphen/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-hyphen/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -17,4 +17,62 @@
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-hyphen</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-layout
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-layout/pom.xml
===================================================================
--- trunk/foray/foray-layout/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-layout/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -17,4 +17,28 @@
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-layout</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-mif
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-mif/pom.xml
===================================================================
--- trunk/foray/foray-mif/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-mif/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -17,4 +17,28 @@
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-mif</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-output
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-output/pom.xml
===================================================================
--- trunk/foray/foray-output/pom.xml 2010-05-04 22:29:31 UTC (rev 10998)
+++ trunk/foray/foray-output/pom.xml 2010-05-05 01:01:32 UTC (rev 10999)
@@ -17,4 +17,42 @@
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-output</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-mif</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-fo</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
</project>
Property changes on: trunk/foray/foray-pdf
___________________________________________________________________
Modified: svn:ignore
- build
zzlocal
+ build
target
zzlocal
Modified: trunk/foray/foray-pdf/pom.xml
===================================================================...
[truncated message content] |
|
From: <vic...@us...> - 2010-05-05 12:22:32
|
Revision: 11001
http://foray.svn.sourceforge.net/foray/?rev=11001&view=rev
Author: victormote
Date: 2010-05-05 12:22:23 +0000 (Wed, 05 May 2010)
Log Message:
-----------
Turn configuration of the eclipse projects over to maven.
Removed Paths:
-------------
trunk/foray/foray-app/.checkstyle
trunk/foray/foray-app/.classpath
trunk/foray/foray-app/.project
trunk/foray/foray-app/.settings/
trunk/foray/foray-areatree/.checkstyle
trunk/foray/foray-areatree/.classpath
trunk/foray/foray-areatree/.project
trunk/foray/foray-areatree/.settings/
trunk/foray/foray-common/.checkstyle
trunk/foray/foray-common/.classpath
trunk/foray/foray-common/.project
trunk/foray/foray-common/.settings/
trunk/foray/foray-core/.checkstyle
trunk/foray/foray-core/.classpath
trunk/foray/foray-core/.project
trunk/foray/foray-core/.settings/
trunk/foray/foray-font/.checkstyle
trunk/foray/foray-font/.classpath
trunk/foray/foray-font/.project
trunk/foray/foray-font/.settings/
trunk/foray/foray-fotree/.checkstyle
trunk/foray/foray-fotree/.classpath
trunk/foray/foray-fotree/.project
trunk/foray/foray-fotree/.settings/
trunk/foray/foray-graphic/.checkstyle
trunk/foray/foray-graphic/.classpath
trunk/foray/foray-graphic/.project
trunk/foray/foray-graphic/.settings/
trunk/foray/foray-hyphen/.checkstyle
trunk/foray/foray-hyphen/.classpath
trunk/foray/foray-hyphen/.project
trunk/foray/foray-hyphen/.settings/
trunk/foray/foray-layout/.checkstyle
trunk/foray/foray-layout/.classpath
trunk/foray/foray-layout/.project
trunk/foray/foray-layout/.settings/
trunk/foray/foray-mif/.checkstyle
trunk/foray/foray-mif/.classpath
trunk/foray/foray-mif/.project
trunk/foray/foray-mif/.settings/
trunk/foray/foray-output/.checkstyle
trunk/foray/foray-output/.classpath
trunk/foray/foray-output/.project
trunk/foray/foray-output/.settings/
trunk/foray/foray-pdf/.checkstyle
trunk/foray/foray-pdf/.classpath
trunk/foray/foray-pdf/.project
trunk/foray/foray-pdf/.settings/
trunk/foray/foray-pioneer/.checkstyle
trunk/foray/foray-pioneer/.classpath
trunk/foray/foray-pioneer/.project
trunk/foray/foray-pioneer/.settings/
trunk/foray/foray-ps/.checkstyle
trunk/foray/foray-ps/.classpath
trunk/foray/foray-ps/.project
trunk/foray/foray-ps/.settings/
trunk/foray/foray-render/.checkstyle
trunk/foray/foray-render/.classpath
trunk/foray/foray-render/.project
trunk/foray/foray-render/.settings/
trunk/foray/foray-speech/.checkstyle
trunk/foray/foray-speech/.classpath
trunk/foray/foray-speech/.project
trunk/foray/foray-speech/.settings/
trunk/foray/foray-text/.checkstyle
trunk/foray/foray-text/.classpath
trunk/foray/foray-text/.project
trunk/foray/foray-text/.settings/
trunk/foray/foray-xml/.checkstyle
trunk/foray/foray-xml/.classpath
trunk/foray/foray-xml/.project
trunk/foray/foray-xml/.settings/
Property Changed:
----------------
trunk/foray/foray-app/
trunk/foray/foray-areatree/
trunk/foray/foray-common/
trunk/foray/foray-core/
trunk/foray/foray-font/
trunk/foray/foray-fotree/
trunk/foray/foray-graphic/
trunk/foray/foray-hyphen/
trunk/foray/foray-layout/
trunk/foray/foray-mif/
trunk/foray/foray-output/
trunk/foray/foray-pdf/
trunk/foray/foray-pioneer/
trunk/foray/foray-ps/
trunk/foray/foray-render/
trunk/foray/foray-speech/
trunk/foray/foray-text/
trunk/foray/foray-xml/
Property changes on: trunk/foray/foray-app
___________________________________________________________________
Modified: svn:ignore
- build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
build
target
zzlocal
Deleted: trunk/foray/foray-app/.checkstyle
===================================================================
--- trunk/foray/foray-app/.checkstyle 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-app/.checkstyle 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
Deleted: trunk/foray/foray-app/.classpath
===================================================================
--- trunk/foray/foray-app/.classpath 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-app/.classpath 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="src" path="/FOrayCommon"/>
- <classpathentry kind="src" path="/FOrayFont"/>
- <classpathentry kind="src" path="/FOrayGraphic"/>
- <classpathentry kind="src" path="/FOrayRender"/>
- <classpathentry kind="src" path="/FOrayAreaTree"/>
- <classpathentry kind="src" path="/FOrayPioneer"/>
- <classpathentry kind="src" path="/FOrayOutput"/>
- <classpathentry kind="src" path="/FOrayText"/>
- <classpathentry kind="src" path="/FOrayFOTree"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FOrayPDF"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FOrayLayout"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FOrayCore"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FOrayHyphen"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FOrayPS"/>
- <classpathentry kind="lib" path="/FOray Lib/resolver.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/servlet-2.2.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/xalan-2.4.1.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar" sourcepath="/FOray Lib-Build/xerces/Xerces-J-src.2.7.1.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FOraySpeech"/>
- <classpathentry kind="lib" path="/FOray Lib-Build/ant/ant.jar" sourcepath="/FOray Lib-Build/ant/ant-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib-Build/junit/junit-4.4.jar" sourcepath="/FOray Lib-Build/junit/junit-4.4-src.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-io-1.4.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.4-sources.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FOrayMIF"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-cli-1.2.jar" sourcepath="/FOray Lib-Build/commons-cli/commons-cli-1.2-sources.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-area"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-common"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-fo"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-font"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-galley"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-graphic"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-hyphen"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-layout"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-mif"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-output"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-pdf"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-ps"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-speech"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-text"/>
- <classpathentry kind="output" path="build/eclipse"/>
-</classpath>
Deleted: trunk/foray/foray-app/.project
===================================================================
--- trunk/foray/foray-app/.project 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-app/.project 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>FOrayApp</name>
- <comment></comment>
- <projects>
- <project>FOrayCommon</project>
- <project>FOrayFont</project>
- <project>FOrayFOTree</project>
- <project>FOrayGraphic</project>
- <project>FOrayPDF</project>
- <project>FOrayPS</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
Property changes on: trunk/foray/foray-areatree
___________________________________________________________________
Modified: svn:ignore
- build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
build
target
zzlocal
Deleted: trunk/foray/foray-areatree/.checkstyle
===================================================================
--- trunk/foray/foray-areatree/.checkstyle 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-areatree/.checkstyle 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
Deleted: trunk/foray/foray-areatree/.classpath
===================================================================
--- trunk/foray/foray-areatree/.classpath 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-areatree/.classpath 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="src" path="/FOrayCommon"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/svg-1.1.jar" sourcepath="/FOray Lib-Build/svg/svg-1.1-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib-Build/junit/junit-4.4.jar" sourcepath="/FOray Lib-Build/junit/junit-4.4-src.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-area"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-common"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-fo"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-font"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-galley"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-graphic"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-text"/>
- <classpathentry kind="output" path="build/eclipse"/>
-</classpath>
Deleted: trunk/foray/foray-areatree/.project
===================================================================
--- trunk/foray/foray-areatree/.project 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-areatree/.project 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>FOrayAreaTree</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
Property changes on: trunk/foray/foray-common
___________________________________________________________________
Modified: svn:ignore
- build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
build
target
zzlocal
Deleted: trunk/foray/foray-common/.checkstyle
===================================================================
--- trunk/foray/foray-common/.checkstyle 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-common/.checkstyle 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
Deleted: trunk/foray/foray-common/.classpath
===================================================================
--- trunk/foray/foray-common/.classpath 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-common/.classpath 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib-Build/junit/junit-4.4.jar" sourcepath="/FOray Lib-Build/junit/junit-4.4-src.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-io-1.4.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.4-sources.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/axsl-all-0.3.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar" sourcepath="/FOray Lib-Build/xerces/Xerces-J-src.2.7.1.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/stax-api-1.0.1.jar" sourcepath="/FOray Lib-Build/stax/stax-src-1.2.0.zip"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-common"/>
- <classpathentry kind="output" path="build/eclipse"/>
-</classpath>
Deleted: trunk/foray/foray-common/.project
===================================================================
--- trunk/foray/foray-common/.project 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-common/.project 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>FOrayCommon</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
Property changes on: trunk/foray/foray-core
___________________________________________________________________
Modified: svn:ignore
- build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
build
target
zzlocal
Deleted: trunk/foray/foray-core/.checkstyle
===================================================================
--- trunk/foray/foray-core/.checkstyle 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-core/.checkstyle 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
Deleted: trunk/foray/foray-core/.classpath
===================================================================
--- trunk/foray/foray-core/.classpath 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-core/.classpath 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
- <classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar" sourcepath="/FOray Lib-Build/xerces/Xerces-J-src.2.7.1.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/foray-common-0.4-dev-rsrc.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-area"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-common"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-fo"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-font"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-galley"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-graphic"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-hyphen"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-layout"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-output"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-speech"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-text"/>
- <classpathentry kind="output" path="build/eclipse"/>
-</classpath>
Deleted: trunk/foray/foray-core/.project
===================================================================
--- trunk/foray/foray-core/.project 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-core/.project 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>FOrayCore</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
Property changes on: trunk/foray/foray-font
___________________________________________________________________
Modified: svn:ignore
- build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
build
target
zzlocal
Deleted: trunk/foray/foray-font/.checkstyle
===================================================================
--- trunk/foray/foray-font/.checkstyle 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-font/.checkstyle 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
Deleted: trunk/foray/foray-font/.classpath
===================================================================
--- trunk/foray/foray-font/.classpath 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-font/.classpath 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="src" path="/FOrayCommon"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FOrayXml"/>
- <classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar" sourcepath="/FOray Lib-Build/xerces/Xerces-J-src.2.7.1.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib-Build/ant/ant.jar"/>
- <classpathentry kind="lib" path="/FOray Lib-Build/junit/junit-4.4.jar" sourcepath="/FOray Lib-Build/junit/junit-4.4-src.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-io-1.4.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.4-sources.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-discovery-0.4.jar" sourcepath="/FOray Lib-Build/commons-discovery"/>
- <classpathentry kind="lib" path="/FOray Lib/foray-font-0.4-rsrc.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-common"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-font"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-ps"/>
- <classpathentry kind="output" path="build/eclipse"/>
-</classpath>
Deleted: trunk/foray/foray-font/.project
===================================================================
--- trunk/foray/foray-font/.project 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-font/.project 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>FOrayFont</name>
- <comment></comment>
- <projects>
- <project>FOrayCommon</project>
- <project>FOrayPS</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
Property changes on: trunk/foray/foray-fotree
___________________________________________________________________
Modified: svn:ignore
- build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
build
target
zzlocal
Deleted: trunk/foray/foray-fotree/.checkstyle
===================================================================
--- trunk/foray/foray-fotree/.checkstyle 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-fotree/.checkstyle 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
Deleted: trunk/foray/foray-fotree/.classpath
===================================================================
--- trunk/foray/foray-fotree/.classpath 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-fotree/.classpath 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="/FOrayCommon"/>
- <classpathentry excluding=".#*" kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/svg-1.1.jar" sourcepath="/FOray Lib-Build/svg/svg-1.1-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/mathml-2.0.jar" sourcepath="/FOray Lib-Build/mathml/mathml-2.0-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib-Build/junit/junit-4.4.jar" sourcepath="/FOray Lib-Build/junit/junit-4.4-src.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-common"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-fo"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-font"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-graphic"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-speech"/>
- <classpathentry combineaccessrules="false" kind="src" path="/axsl-text"/>
- <classpathentry kind="output" path="build/eclipse"/>
-</classpath>
Deleted: trunk/foray/foray-fotree/.project
===================================================================
--- trunk/foray/foray-fotree/.project 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-fotree/.project 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>FOrayFOTree</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
Property changes on: trunk/foray/foray-graphic
___________________________________________________________________
Modified: svn:ignore
- build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
build
target
zzlocal
Deleted: trunk/foray/foray-graphic/.checkstyle
===================================================================
--- trunk/foray/foray-graphic/.checkstyle 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-graphic/.checkstyle 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
Deleted: trunk/foray/foray-graphic/.classpath
===================================================================
--- trunk/foray/foray-graphic/.classpath 2010-05-05 12:07:32 UTC (rev 11000)
+++ trunk/foray/foray-graphic/.classpath 2010-05-05 12:22:23 UTC (rev 11001)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="src" path="/FOrayCommon"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/svg-1.1.jar" sourcepath="/FOray Lib-Build/svg/svg-1.1-src.zip"/>
- <classpathentry exported="true" kind="lib" path="/FOray Lib/mathml-2.0.jar" sourcepath="/FOray Lib-Build/mathml/mathml-2.0-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-bridge.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-gvt.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-parser.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-script.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-transcoder.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-util.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-svg-dom.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-dom.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-xml.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-css.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-awt-util.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-ext.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/batik-1.6-svggen.jar" sourcepath="/FOray Lib-Build/batik/batik-1.6-sources.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/jeuclid-core-3.0.1.jar" sourcepath="/FOray Lib-Build/jeuclid/jeuclid-3.0.1-source.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/xmlgraphics-commons-1.2.jar" sourcepath="/FOray Lib-Build/xmlgraphics-commons/xmlgraphics-commons-1.2-src.zip"/>
- <classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar" sourcepath="/FOray Lib-Build/xerces/Xerces-J-src.2.7.1.zip"/>
- <classpathentry kind="lib" path="/FOray Lib-Build/junit/junit-4.4.jar" sourcepath="/FOray Lib-Build/junit/junit-4.4-src.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/commons-io-1.4.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.4-sources.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry combineaccessrules...
[truncated message content] |
|
From: <vic...@us...> - 2010-05-05 13:12:53
|
Revision: 11002
http://foray.svn.sourceforge.net/foray/?rev=11002&view=rev
Author: victormote
Date: 2010-05-05 13:12:46 +0000 (Wed, 05 May 2010)
Log Message:
-----------
1. Clean up ignored items.
2. Remove eclipse projects for the lib and lib-build directories.
Removed Paths:
-------------
trunk/foray/lib/.project
trunk/foray/lib-build/.project
Property Changed:
----------------
trunk/foray/foray-app/
trunk/foray/foray-areatree/
trunk/foray/foray-common/
trunk/foray/foray-core/
trunk/foray/foray-font/
trunk/foray/foray-fotree/
trunk/foray/foray-graphic/
trunk/foray/foray-hyphen/
trunk/foray/foray-layout/
trunk/foray/foray-mif/
trunk/foray/foray-output/
trunk/foray/foray-pdf/
trunk/foray/foray-pioneer/
trunk/foray/foray-ps/
trunk/foray/foray-render/
trunk/foray/foray-speech/
trunk/foray/foray-text/
trunk/foray/foray-xml/
Property changes on: trunk/foray/foray-app
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-areatree
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-common
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-core
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-font
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-fotree
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-graphic
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-hyphen
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-layout
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-mif
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-output
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-pdf
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-pioneer
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-ps
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-render
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-speech
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-text
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Property changes on: trunk/foray/foray-xml
___________________________________________________________________
Modified: svn:ignore
- .checkstyle
.classpath
.project
.settings
build
target
zzlocal
+ .checkstyle
.classpath
.project
.settings
target
Deleted: trunk/foray/lib/.project
===================================================================
--- trunk/foray/lib/.project 2010-05-05 12:22:23 UTC (rev 11001)
+++ trunk/foray/lib/.project 2010-05-05 13:12:46 UTC (rev 11002)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>FOray Lib</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
Deleted: trunk/foray/lib-build/.project
===================================================================
--- trunk/foray/lib-build/.project 2010-05-05 12:22:23 UTC (rev 11001)
+++ trunk/foray/lib-build/.project 2010-05-05 13:12:46 UTC (rev 11002)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>FOray Lib-Build</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-08-07 20:54:29
|
Revision: 11004
http://foray.svn.sourceforge.net/foray/?rev=11004&view=rev
Author: victormote
Date: 2010-08-07 20:54:15 +0000 (Sat, 07 Aug 2010)
Log Message:
-----------
1. Convert "code" html elements in javadoc to the @code taglet.
2. Enforce this policy with a checkstyle check.
Modified Paths:
--------------
trunk/foray/foray-all/scripts/checkstyle-config.xml
trunk/foray/foray-app/src/main/java/org/foray/app/FOray.java
trunk/foray/foray-app/src/main/java/org/foray/app/PrintStarter.java
trunk/foray/foray-app/src/main/java/org/foray/demo/servlet/AbstractDemoServlet.java
trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java
trunk/foray/foray-app/src/test/java/org/foray/app/fo/AbstractFoTreeTest.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/FOLinkageMarker.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/FOLinkageNormal.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRA.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRA.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
trunk/foray/foray-common/src/main/java/org/foray/common/AbstractOrderedTreeNode.java
trunk/foray/foray-common/src/main/java/org/foray/common/ByteVector.java
trunk/foray/foray-common/src/main/java/org/foray/common/ByteVectorPacked.java
trunk/foray/foray-common/src/main/java/org/foray/common/CharSequenceSubset.java
trunk/foray/foray-common/src/main/java/org/foray/common/CharVector.java
trunk/foray/foray-common/src/main/java/org/foray/common/ColorUtil.java
trunk/foray/foray-common/src/main/java/org/foray/common/Configuration.java
trunk/foray/foray-common/src/main/java/org/foray/common/ConfigurationException.java
trunk/foray/foray-common/src/main/java/org/foray/common/NumberUtil.java
trunk/foray/foray-common/src/main/java/org/foray/common/OrderedTreeNode.java
trunk/foray/foray-common/src/main/java/org/foray/common/RandomInput.java
trunk/foray/foray-common/src/main/java/org/foray/common/RandomReader.java
trunk/foray/foray-common/src/main/java/org/foray/common/RandomReaderRAFile.java
trunk/foray/foray-common/src/main/java/org/foray/common/StringUtil.java
trunk/foray/foray-common/src/main/java/org/foray/common/TernaryTreeMap.java
trunk/foray/foray-common/src/main/java/org/foray/common/UnicodeChar.java
trunk/foray/foray-common/src/main/java/org/foray/common/WKConstants.java
trunk/foray/foray-common/src/main/java/org/foray/common/XMLCharacter.java
trunk/foray/foray-common/src/main/java/org/foray/common/url/FOrayURLStreamHandlerFactory.java
trunk/foray/foray-common/src/main/java/org/foray/common/url/PropertyProtocolRegistration.java
trunk/foray/foray-common/src/main/java/org/foray/common/url/ProtocolRegistrationBroker.java
trunk/foray/foray-common/src/main/java/org/foray/common/url/ProtocolRegistrationStrategy.java
trunk/foray/foray-common/src/main/java/org/foray/common/url/URLFactory.java
trunk/foray/foray-common/src/main/java/org/foray/common/url/URLUtil.java
trunk/foray/foray-common/src/main/java/org/foray/common/url/classpath/Handler.java
trunk/foray/foray-core/src/main/java/org/foray/core/ConfigurationParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/Font4a.java
trunk/foray/foray-font/src/main/java/org/foray/font/FontConsumer4a.java
trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java
trunk/foray/foray-font/src/main/java/org/foray/font/RegisteredFontFamily.java
trunk/foray/foray-font/src/main/java/org/foray/font/SerializeStandardFonts.java
trunk/foray/foray-font/src/main/java/org/foray/font/Subset.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/Kerning.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/Panose.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/TTFFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/TTFMtxEntry.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/TTFSubSetFile.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/TTFTableCMAP.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/TTFTableDirectory.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/TTFTableHMTX.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/TTFTablePOST.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/Type1File.java
trunk/foray/foray-font/src/main/java/org/foray/font/output/FontOutput4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/DescendantIterator.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXML.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Property.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObject.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslValue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObject.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoValue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Declarations.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowMap.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowSourceList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Root.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteOffset.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorder.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractKeep.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMargin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPadding.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPageDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextDecoration.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObject.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/SvgObject.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthBPIPDirection.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/AbstractXmlProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/XmlProperty.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/BMPGraphic.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EPSGraphic.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GIFGraphic.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/Graphic4a.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/JPEGGraphic.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/MathGraphic4a.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PDFGraphic.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PNGGraphic.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/SVGGraphic.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/TIFFGraphic.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PSGraphics2D.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/GraphicFactory.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/GraphicOutputFactory.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/Hyphenation4a.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationServer4a.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationTree.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/MorphHyphenation.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/PatGen.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/PatternConsumer.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/PatternSerializer.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/NaturalLanguage.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/WordList.java
trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PDFCIDFont.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PDFColor.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PDFDocument.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PDFFont.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PDFRoot.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePL.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FONodePL.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLS.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/Status.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/PsArray.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/PsDictionary.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/PsInterpreter4a.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/PsObject.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/PsOperator.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/PsPath.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/PsStack.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/PsSystemDict4a.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CMap04.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CMap04Entry.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CMap12.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CMap12Entry.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSet4a.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/GlyphList4a.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/filter/AsciiHexEncodeFilter.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/filter/PSFilter.java
trunk/foray/foray-ps/src/test/java/org/foray/ps/TestPsSystemDict.java
trunk/foray/foray-render/src/main/java/org/foray/render/awt/viewer/Command.java
trunk/foray/foray-render/src/main/java/org/foray/render/awt/viewer/IconToolBar.java
trunk/foray/foray-render/src/main/java/org/foray/render/awt/viewer/MessagesDialog.java
trunk/foray/foray-render/src/main/java/org/foray/render/awt/viewer/SecureResourceBundle.java
trunk/foray/foray-render/src/main/java/org/foray/render/awt/viewer/Translator.java
trunk/foray/foray-render/src/main/java/org/foray/render/awt/viewer/UserMessage.java
trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PDFRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/svg/SVGRenderer.java
trunk/foray/foray-text/src/main/java/org/foray/text/line/LineBreaker.java
trunk/foray/foray-xml/src/main/java/org/foray/xml/FOrayPretty.java
trunk/foray/foray-xml/src/main/java/org/foray/xml/FOrayXDiff.java
Modified: trunk/foray/foray-all/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/foray-all/scripts/checkstyle-config.xml 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-all/scripts/checkstyle-config.xml 2010-08-07 20:54:15 UTC (rev 11004)
@@ -283,6 +283,12 @@
<property name="message" value="Return a more specific type when cloning."/>
</module>
+ <module name="RegexpSinglelineJava">
+ <property name="ignoreComments" value="false"/>
+ <property name="format" value="<\/?code>"/>
+ <property name="message" value="Use the javadoc @code tag instead."/>
+ </module>
+
</module>
<!-- Make sure each file ends with a newline. -->
Modified: trunk/foray/foray-app/src/main/java/org/foray/app/FOray.java
===================================================================
--- trunk/foray/foray-app/src/main/java/org/foray/app/FOray.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-app/src/main/java/org/foray/app/FOray.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -270,7 +270,7 @@
* @param commandLineOptions The command-line options controlling the parsing.
* @param args The command-line arguments to be parsed.
* @return The results of the parsing.
- * @throws ParseException For errors in <code>args</code>.
+ * @throws ParseException For errors in {@code args}.
*/
public static CommandLine parseCommandLine(final Options commandLineOptions, final String[] args)
throws ParseException {
Modified: trunk/foray/foray-app/src/main/java/org/foray/app/PrintStarter.java
===================================================================
--- trunk/foray/foray-app/src/main/java/org/foray/app/PrintStarter.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-app/src/main/java/org/foray/app/PrintStarter.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -86,8 +86,7 @@
* Returns an integer property value.
* @param name The name of the property whose value is needed.
* @param def The default value for the property.
- * @return The property value if it is found, or <code>def</code> if it is
- * not found.
+ * @return The property value if it is found, or {@code def} if it is not found.
*/
int getIntProperty(final String name, final int def) {
final String propValue = System.getProperty(name);
Modified: trunk/foray/foray-app/src/main/java/org/foray/demo/servlet/AbstractDemoServlet.java
===================================================================
--- trunk/foray/foray-app/src/main/java/org/foray/demo/servlet/AbstractDemoServlet.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-app/src/main/java/org/foray/demo/servlet/AbstractDemoServlet.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -223,7 +223,7 @@
* that converts the XML to XSL:FO.
* The PDF is written directly to the response object's OutputStream.
* @param xmlFile The semantic XML file to be transformed.
- * @param xslFile The stylesheet to be applied to <code>xmlFile</code>.
+ * @param xslFile The stylesheet to be applied to {@code xmlFile}.
* @param response The HTTP servlet response.
* @throws ServletException For errors during processing.
*/
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -72,7 +72,7 @@
/**
* Returns the first normal-flow reference area in a given area tree.
* @param areaTree The area tree being tested.
- * @return The first normal-flow reference area in <code>areaTree</code>.
+ * @return The first normal-flow reference area in {@code areaTree}.
*/
protected NormalFlowRA getFirstNormalFlowArea(final AreaTree areaTree) {
final PageCollection pageCollection = getPageCollection(areaTree, 1);
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/fo/AbstractFoTreeTest.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/fo/AbstractFoTreeTest.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/fo/AbstractFoTreeTest.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -44,7 +44,7 @@
/**
* Returns the first flow item in a given fo tree.
* @param foTree The fo tree whose first flow is needed.
- * @return The first flow in <code>foTree</code>
+ * @return The first flow in {@code foTree}.
*/
protected Flow getFlow(final FOTreeBuilder foTree) {
final Root root = foTree.getRootFo();
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -418,7 +418,7 @@
/**
* Returns the FOLinkage for a given FONode.
* @param node The FONode whose linkage is needed.
- * @return The FOLinkage for <code>node</code>, or null if there is none.
+ * @return The FOLinkage for {@code node}, or null if there is none.
*/
protected FOLinkage getFONodeLinkage(final Fo node) {
final int index = node.getSequentialIndex();
@@ -435,7 +435,7 @@
/**
* Sets the linkage for a given FONode.
* @param node The node whose linkage is to be set.
- * @param linkage The linkage for <code>node</code>.
+ * @param linkage The linkage for {@code node}.
*/
protected void setFONodeLinkage(final Fo node,
final FOLinkage linkage) {
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/FOLinkageMarker.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/FOLinkageMarker.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FOLinkageMarker.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -83,8 +83,7 @@
/**
* Constructor.
* @param foGenerator The FO node generating this linkage.
- * @throws AreaTreeException If the <code>foGenerator</code> has no
- * ancestor marker.
+ * @throws AreaTreeException If the {@code foGenerator} has no ancestor marker.
*/
public FOLinkageMarker(final Fo foGenerator)
throws AreaTreeException {
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/FOLinkageNormal.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/FOLinkageNormal.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FOLinkageNormal.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -102,8 +102,7 @@
/**
* For a given area, returns the previous area generated by this linkage.
* @param area The area whose previous area is needed.
- * @return The previous area, or null, if <code>area</code> is the first
- * area generated by this linkage.
+ * @return The previous area, or null, if {@code area} is the first area generated by this linkage.
*/
public AreaNode getPreviousGeneratedBy(final AreaNode area) {
if (this.generatedAreas == null) {
@@ -119,8 +118,7 @@
/**
* For a given area, returns the next area generated by this linkage.
* @param area The area whose next area is needed.
- * @return The next area, or null, if <code>area</code> is the last area
- * generated by this linkage.
+ * @return The next area, or null, if {@code area} is the last area generated by this linkage.
*/
public AreaNode getNextGeneratedBy(final AreaNode area) {
if (this.generatedAreas == null) {
@@ -250,7 +248,7 @@
/**
* Indicates whether a given area was generated by this linkage.
* @param areaNode The node to be tested.
- * @return True iff this linkage generated <code>areaNode</code>.
+ * @return True iff this linkage generated {@code areaNode}.
*/
public boolean contains(final AreaNode areaNode) {
for (int i = 0; i < this.generatedAreas.size(); i++) {
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -147,8 +147,7 @@
/**
* Return the previous line area, relative to a given line area.
* @param lineArea The line area whose previous line area is needed.
- * @return The previous line area, or null if <code>lineArea</code> is the
- * first child line area.
+ * @return The previous line area, or null if {@code lineArea} is the first child line area.
*/
public LineArea getPreviousLineArea(final LineArea lineArea) {
if (this.getChildren() == null) {
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRA.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRA.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRA.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -273,8 +273,7 @@
/**
* Indicates whether a new line can be added to a given block area.
* @param blockArea The block area to be tested.
- * @return True iff there is enough room to add a new line to
- * <code>blockArea</code>.
+ * @return True iff there is enough room to add a new line to {@code blockArea}.
*/
public boolean canAddLineArea(final NormalBlockArea blockArea) {
for (int i = 0; i < getChildren().size(); i++) {
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRA.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRA.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -477,7 +477,7 @@
* Indicates whether a given background area actually has a background that
* should be painted.
* @param backgroundArea The background area to be tested.
- * @return True iff <code>backgroundArea</code> actually has a background.
+ * @return True iff {@code backgroundArea} actually has a background.
*/
private boolean hasBackground(final BackgroundArea backgroundArea) {
if (backgroundArea.getGraphic() != null) {
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -906,9 +906,9 @@
* Constructor.
* @param wrappedSequence The encapsulated sequence, a subset of which is the content for
* this sequence.
- * @param start The index to the first element in <code>wrappedSequence</code> that is
+ * @param start The index to the first element in {@code wrappedSequence} that is
* considered to be part of this sequence.
- * @param length The number of chars in <code>wrappedSequence</code> that is considered to
+ * @param length The number of chars in {@code wrappedSequence} that is considered to
* be part of this sequence.
* @param hasDiscretionaryHyphen Set this to true if the text should be
* followed by the hyphenation character.
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/AbstractOrderedTreeNode.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/AbstractOrderedTreeNode.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/AbstractOrderedTreeNode.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -303,18 +303,17 @@
}
/**
- * Returns true if <code>anotherNode</code> is a descendant of this node
- * -- if it is this node, one of this node's children, or a descendant of
- * one of this node's children. Note that a node is considered a
- * descendant of itself. If <code>anotherNode</code> is null, returns
- * false. This operation is at worst O(h) where h is the distance from the
- * root to <code>anotherNode</code>.
+ * Returns true if {@code anotherNode} is a descendant of this node -- if it is this node, one of this node's
+ * children, or a descendant of one of this node's children.
+ * Note that a node is considered a descendant of itself.
+ * If {@code anotherNode} is null, returns false.
+ * This operation is at worst O(h) where h is the distance from the root to {@code anotherNode}.
* This implementation was liberated from {@link DefaultMutableTreeNode}).
*
* @see #isNodeAncestor
* @see #getSharedAncestor
- * @param anotherNode node to test as descendant of this node
- * @return true if this node is an ancestor of <code>anotherNode</code>
+ * @param anotherNode Node to test as descendant of this node.
+ * @return True if this node is an ancestor of {@code anotherNode}
*/
public boolean isNodeDescendant(final OrderedTreeNode anotherNode) {
if (anotherNode == null) {
@@ -324,16 +323,16 @@
}
/**
- * Returns the nearest common ancestor to this node and <code>aNode</code>.
- * Returns null, if no such ancestor exists -- if this node and
- * <code>aNode</code> are in different trees or if <code>aNode</code> is
- * null. A node is considered an ancestor of itself.
+ * Returns the nearest common ancestor to this node and {@code aNode}.
+ * Returns null, if no such ancestor exists -- if this node and {@code aNode} are in different trees or if
+ * {@code aNode} is null.
+ * A node is considered an ancestor of itself.
* This implementation was liberated from {@link DefaultMutableTreeNode}).
*
* @see #isNodeAncestor
* @see #isNodeDescendant
* @param aNode node to find common ancestor with
- * @return nearest ancestor common to this node and <code>aNode</code>,
+ * @return nearest ancestor common to this node and {@code aNode},
* or null if none
*/
public OrderedTreeNode getSharedAncestor(final OrderedTreeNode aNode) {
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/ByteVector.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/ByteVector.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/ByteVector.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -113,7 +113,7 @@
/**
* Retrieve a value from a specific index in the vector.
* @param index The 0-based index whose value should be returned.
- * @return The value at <code>index</code>.
+ * @return The value at {@code index}.
*/
public byte get(final int index) {
return this.backingArray[index];
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/ByteVectorPacked.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/ByteVectorPacked.java 2010-08-07 17:16:07 UTC (rev 11003)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/ByteVectorPacked.java 2010-08-07 20:54:15 UTC (rev 11004)
@@ -170,7 +170,7 @@
/**
* Retrieve a value from a specific index in the vector.
* @param index The 0-based index whose value should be returned.
- * @return The value at <code>index</code>.
+ * @return The value at {@code index}.
*/
public byte get(final int index) {
final int byteIndex = computeByteIndex(index);
@@ -219,8 +219,8 @@
* Returns the index of the first occurrence of a specified value in the vector.
* @param value The value whose index is sought.
* @param startingIndex The index in the vector at which the search should be started.
- * @return The index to t...
[truncated message content] |
|
From: <vic...@us...> - 2010-08-07 23:02:50
|
Revision: 11005
http://foray.svn.sourceforge.net/foray/?rev=11005&view=rev
Author: victormote
Date: 2010-08-07 23:02:43 +0000 (Sat, 07 Aug 2010)
Log Message:
-----------
Move dependency management items to parent pom.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-app/pom.xml
trunk/foray/foray-areatree/pom.xml
trunk/foray/foray-common/pom.xml
trunk/foray/foray-core/pom.xml
trunk/foray/foray-font/pom.xml
trunk/foray/foray-fotree/pom.xml
trunk/foray/foray-graphic/pom.xml
trunk/foray/foray-hyphen/pom.xml
trunk/foray/foray-layout/pom.xml
trunk/foray/foray-mif/pom.xml
trunk/foray/foray-output/pom.xml
trunk/foray/foray-pdf/pom.xml
trunk/foray/foray-pioneer/pom.xml
trunk/foray/foray-ps/pom.xml
trunk/foray/foray-render/pom.xml
trunk/foray/foray-speech/pom.xml
trunk/foray/foray-text/pom.xml
trunk/foray/foray-xml/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-08-07 20:54:15 UTC (rev 11004)
+++ trunk/foray/foray-all/pom.xml 2010-08-07 23:02:43 UTC (rev 11005)
@@ -16,6 +16,439 @@
<packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+
+ <!-- JUnit. -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Apache Commons. -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Apache Xerces. -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Apache Xalan. -->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.4.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Apache Ant. -->
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Apache xmlgraphics. -->
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Batik dependencies. -->
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-bridge</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-gvt</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-parser</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-script</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-svg-dom</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-dom</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-xml</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-css</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-awt-util</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-svggen</artifactId>
+ <version>1.6</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- JEuclid. -->
+ <dependency>
+ <groupId>net.sourceforge.jeuclid</groupId>
+ <artifactId>jeuclid-core</artifactId>
+ <version>3.0.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.2.0</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- aXSL dependencies. -->
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-area</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-common</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-fo</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-font</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-galley</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-graphic</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-hyphen</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-layout</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-mif</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-output</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-speech</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-pdf</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-ps</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-text</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Other FOray modules. -->
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-areatree</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-common</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-core</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-font</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-fotree</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-graphic</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-hyphen</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-layout</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-mif</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-output</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-pdf</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-pioneer</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-ps</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-render</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-speech</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-text</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-xml</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<pluginManagement>
<plugins>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2010-08-07 20:54:15 UTC (rev 11004)
+++ trunk/foray/foray-app/pom.xml 2010-08-07 23:02:43 UTC (rev 11005)
@@ -19,169 +19,147 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
<type>jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
- <version>1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.4.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-areatree</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-common</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-core</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-font</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-fotree</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-graphic</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-hyphen</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-layout</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-mif</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-output</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-pdf</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-pioneer</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-ps</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-render</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-speech</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-text</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-areatree/pom.xml
===================================================================
--- trunk/foray/foray-areatree/pom.xml 2010-08-07 20:54:15 UTC (rev 11004)
+++ trunk/foray/foray-areatree/pom.xml 2010-08-07 23:02:43 UTC (rev 11005)
@@ -21,35 +21,30 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-area</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-galley</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-common</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-common/pom.xml
===================================================================
--- trunk/foray/foray-common/pom.xml 2010-08-07 20:54:15 UTC (rev 11004)
+++ trunk/foray/foray-common/pom.xml 2010-08-07 23:02:43 UTC (rev 11005)
@@ -16,53 +16,47 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-common</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-ps</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-core/pom.xml
===================================================================
--- trunk/foray/foray-core/pom.xml 2010-08-07 20:54:15 UTC (rev 11004)
+++ trunk/foray/foray-core/pom.xml 2010-08-07 23:02:43 UTC (rev 11005)
@@ -24,98 +24,84 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-area</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-common</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-fo</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-font</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-galley</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-graphic</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-hyphen</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-layout</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-output</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-speech</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-text</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-common</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-font/pom.xml
===================================================================
--- trunk/foray/foray-font/pom.xml 2010-08-07 20:54:15 UTC (rev 11004)
+++ trunk/foray/foray-font/pom.xml 2010-08-07 23:02:43 UTC (rev 11005)
@@ -21,69 +21,59 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
- <version>0.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-common</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-font</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-common</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-xml</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-fotree/pom.xml
===================================================================
--- trunk/foray/foray-fotree/pom.xml 2010-08-07 20:54:15 UTC (rev 11004)
+++ trunk/foray/foray-fotree/pom.xml 2010-08-07 23:02:43 UTC (rev 11005)
@@ -21,28 +21,24 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.axsl</groupId>
<artifactId>axsl-fo</artifactId>
- <version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-common</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-graphic/pom.xml
===================================================================
--- trunk/foray/foray-graphic/pom.xml 2010-08-07 20:54:15 UTC (rev 11004)
+++ trunk/foray/foray-graphic/pom.xml 2010-08-07 23:02:43 UTC (rev 11005)
@@ -18,150 +18,131 @@
</parent>
<dependencies>
+
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</vers...
[truncated message content] |
|
From: <vic...@us...> - 2010-08-13 16:02:00
|
Revision: 11007
http://foray.svn.sourceforge.net/foray/?rev=11007&view=rev
Author: victormote
Date: 2010-08-13 16:01:52 +0000 (Fri, 13 Aug 2010)
Log Message:
-----------
Fix references to shared ant files.
Modified Paths:
--------------
trunk/foray/foray-app/scripts/build.xml
trunk/foray/foray-areatree/scripts/build.xml
trunk/foray/foray-common/scripts/build.xml
trunk/foray/foray-core/scripts/build.xml
trunk/foray/foray-font/scripts/build.xml
trunk/foray/foray-fotree/scripts/build.xml
trunk/foray/foray-graphic/scripts/build.xml
trunk/foray/foray-hyphen/scripts/build.xml
trunk/foray/foray-layout/scripts/build.xml
trunk/foray/foray-mif/scripts/build.xml
trunk/foray/foray-output/scripts/build.xml
trunk/foray/foray-pdf/scripts/build.xml
trunk/foray/foray-pioneer/scripts/build.xml
trunk/foray/foray-ps/scripts/build.xml
trunk/foray/foray-render/scripts/build.xml
trunk/foray/foray-speech/scripts/build.xml
trunk/foray/foray-text/scripts/build.xml
trunk/foray/foray-xml/scripts/build.xml
Modified: trunk/foray/foray-app/scripts/build.xml
===================================================================
--- trunk/foray/foray-app/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-app/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-areatree/scripts/build.xml
===================================================================
--- trunk/foray/foray-areatree/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-areatree/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-common/scripts/build.xml
===================================================================
--- trunk/foray/foray-common/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-common/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-core/scripts/build.xml
===================================================================
--- trunk/foray/foray-core/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-core/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-font/scripts/build.xml
===================================================================
--- trunk/foray/foray-font/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-font/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-fotree/scripts/build.xml
===================================================================
--- trunk/foray/foray-fotree/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-fotree/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-graphic/scripts/build.xml
===================================================================
--- trunk/foray/foray-graphic/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-graphic/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-hyphen/scripts/build.xml
===================================================================
--- trunk/foray/foray-hyphen/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-hyphen/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-layout/scripts/build.xml
===================================================================
--- trunk/foray/foray-layout/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-layout/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-mif/scripts/build.xml
===================================================================
--- trunk/foray/foray-mif/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-mif/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-output/scripts/build.xml
===================================================================
--- trunk/foray/foray-output/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-output/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-pdf/scripts/build.xml
===================================================================
--- trunk/foray/foray-pdf/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-pdf/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- Set up a prefix to designate environment variables. -->
<property environment="env"/>
Modified: trunk/foray/foray-pioneer/scripts/build.xml
===================================================================
--- trunk/foray/foray-pioneer/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-pioneer/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-ps/scripts/build.xml
===================================================================
--- trunk/foray/foray-ps/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-ps/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-render/scripts/build.xml
===================================================================
--- trunk/foray/foray-render/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-render/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-speech/scripts/build.xml
===================================================================
--- trunk/foray/foray-speech/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-speech/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-text/scripts/build.xml
===================================================================
--- trunk/foray/foray-text/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-text/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
Modified: trunk/foray/foray-xml/scripts/build.xml
===================================================================
--- trunk/foray/foray-xml/scripts/build.xml 2010-08-09 15:18:42 UTC (rev 11006)
+++ trunk/foray/foray-xml/scripts/build.xml 2010-08-13 16:01:52 UTC (rev 11007)
@@ -3,7 +3,7 @@
<project default="package" basedir=".">
- <import file="../../scripts/build-common.xml"/>
+ <import file="../../foray-all/scripts/build-common.xml"/>
<!-- =================================================================== -->
<!-- Initialization target -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-08-14 02:29:54
|
Revision: 11011
http://foray.svn.sourceforge.net/foray/?rev=11011&view=rev
Author: victormote
Date: 2010-08-14 02:29:47 +0000 (Sat, 14 Aug 2010)
Log Message:
-----------
Move some test methods to regular classes, so that they are available to all tests.
Modified Paths:
--------------
trunk/foray/foray-app/src/test/java/org/foray/app/fo/FoDocumentReader.java
trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestFOrayCommon.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGraphicServer4a.java
trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestEncodingParser.java
trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestGlyphListParser.java
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/fo/FoDocumentReader.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/fo/FoDocumentReader.java 2010-08-14 01:57:44 UTC (rev 11010)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/fo/FoDocumentReader.java 2010-08-14 02:29:47 UTC (rev 11011)
@@ -29,8 +29,8 @@
package org.foray.app.fo;
import org.foray.app.FOraySpecific;
+import org.foray.common.Environment;
import org.foray.common.Logging;
-import org.foray.common.TestFOrayCommon;
import org.foray.common.sax.SaxParser;
import org.foray.common.url.URLFactory;
import org.foray.core.FOrayException;
@@ -84,7 +84,7 @@
final Log logger = Logging.makeQuietLogger();
final SessionConfig sessionConfig = new SessionConfig();
- this.testDirectory = TestFOrayCommon.getTestDirectory();
+ this.testDirectory = Environment.getTestDirectory();
final FontServer fontServer = FOraySpecific.makeFontServer(logger,
sessionConfig);
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java 2010-08-14 01:57:44 UTC (rev 11010)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java 2010-08-14 02:29:47 UTC (rev 11011)
@@ -29,6 +29,7 @@
package org.foray.common;
import java.awt.GraphicsEnvironment;
+import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Properties;
@@ -87,10 +88,10 @@
if (configDir == null || "".equals(configDir)) {
configDir = System.getProperty("FORAY_CONFIG");
}
- final String ikewBuild = configDir + "/foray-build.properties";
+ final String forayBuild = configDir + "/foray-build.properties";
/* Turn it into a URL. */
- final URL buildPropertiesURL = new URL("file", null, ikewBuild);
+ final URL buildPropertiesURL = new URL("file", null, forayBuild);
/* Turn the URL into a properties file. */
Environment.buildProperties = new Properties();
@@ -99,4 +100,36 @@
return Environment.buildProperties;
}
+ /**
+ * Returns the directory that is the root of the local sandbox, for example,
+ * "D:/u/user/foray/trunk/foray".
+ * @return The directory that is the root of the local sandbox.
+ * @throws IOException For errors obtaining the build properties.
+ */
+ public static File getSandbox() throws IOException {
+ final Properties buildProperties = Environment.getBuildProperties();
+ final String foraySandbox = buildProperties.getProperty("foray.sandbox");
+ return new File(foraySandbox);
+ }
+
+ /**
+ * Returns the local directory that contains the test files.
+ * @return The local directory that contains the test files.
+ * @throws IOException For errors obtaining the build properties.
+ */
+ public static File getTestDirectory() throws IOException {
+ final File sandbox = Environment.getSandbox();
+ return new File(sandbox, "foray-all/resource/test/");
+ }
+
+ /**
+ * Returns the local directory that contains the test files.
+ * @return The local directory that contains the test files.
+ * @throws IOException For errors obtaining the build properties.
+ */
+ public static File getExamplesDirectory() throws IOException {
+ final File sandbox = Environment.getSandbox();
+ return new File(sandbox, "foray-all/resource/fo-examples/");
+ }
+
}
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/TestFOrayCommon.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestFOrayCommon.java 2010-08-14 01:57:44 UTC (rev 11010)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestFOrayCommon.java 2010-08-14 02:29:47 UTC (rev 11011)
@@ -31,10 +31,6 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
import junit.framework.TestCase;
/**
@@ -52,36 +48,4 @@
})
public class TestFOrayCommon extends TestCase {
- /**
- * Returns the directory that is the root of the local sandbox, for example,
- * "D:/u/user/foray/trunk/foray".
- * @return The directory that is the root of the local sandbox.
- * @throws IOException For errors obtaining the build properties.
- */
- public static File getSandbox() throws IOException {
- final Properties buildProperties = Environment.getBuildProperties();
- final String foraySandbox = buildProperties.getProperty("foray.sandbox");
- return new File(foraySandbox);
- }
-
- /**
- * Returns the local directory that contains the test files.
- * @return The local directory that contains the test files.
- * @throws IOException For errors obtaining the build properties.
- */
- public static File getTestDirectory() throws IOException {
- final File sandbox = TestFOrayCommon.getSandbox();
- return new File(sandbox, "foray-all/resource/test/");
- }
-
- /**
- * Returns the local directory that contains the test files.
- * @return The local directory that contains the test files.
- * @throws IOException For errors obtaining the build properties.
- */
- public static File getExamplesDirectory() throws IOException {
- final File sandbox = TestFOrayCommon.getSandbox();
- return new File(sandbox, "foray-all/resource/fo-examples/");
- }
-
}
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java 2010-08-14 01:57:44 UTC (rev 11010)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java 2010-08-14 02:29:47 UTC (rev 11011)
@@ -50,7 +50,7 @@
* @throws IOException For errors getting the local sandbox.
*/
public void testUrlToDom() throws IOException {
- final File examplesDir = TestFOrayCommon.getExamplesDirectory();
+ final File examplesDir = Environment.getExamplesDirectory();
final File graphicsDir = new File(examplesDir, "graphics");
final File testFile = new File(graphicsDir, "mathml-example-1.xml");
final URL url = testFile.toURI().toURL();
Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGraphicServer4a.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGraphicServer4a.java 2010-08-14 01:57:44 UTC (rev 11010)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGraphicServer4a.java 2010-08-14 02:29:47 UTC (rev 11011)
@@ -28,8 +28,8 @@
package org.foray.graphic;
+import org.foray.common.Environment;
import org.foray.common.Logging;
-import org.foray.common.TestFOrayCommon;
import org.axsl.graphic.GraphicException;
@@ -68,7 +68,7 @@
* @throws IOException For errors obtaining the local sandbox.
*/
public static File getTestGraphicsDir() throws IOException {
- final File sandbox = TestFOrayCommon.getSandbox();
+ final File sandbox = Environment.getSandbox();
final File graphicsDir = new File(sandbox, "resource/fo-examples/graphics");
return graphicsDir;
}
Modified: trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestEncodingParser.java
===================================================================
--- trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestEncodingParser.java 2010-08-14 01:57:44 UTC (rev 11010)
+++ trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestEncodingParser.java 2010-08-14 02:29:47 UTC (rev 11011)
@@ -28,7 +28,7 @@
package org.foray.ps.encode;
-import org.foray.common.TestFOrayCommon;
+import org.foray.common.Environment;
import org.axsl.ps.PsException;
@@ -50,7 +50,7 @@
* @throws PsException For errors parsing the input.
*/
public void testWinAnsi() throws IOException, PsException {
- final File sandbox = TestFOrayCommon.getSandbox();
+ final File sandbox = Environment.getSandbox();
final File testFile = new File(sandbox, "foray-ps/resource/encoding/latin-pdf.txt");
final InputStream input = new FileInputStream(testFile);
assertNotNull(input);
Modified: trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestGlyphListParser.java
===================================================================
--- trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestGlyphListParser.java 2010-08-14 01:57:44 UTC (rev 11010)
+++ trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestGlyphListParser.java 2010-08-14 02:29:47 UTC (rev 11011)
@@ -28,7 +28,7 @@
package org.foray.ps.encode;
-import org.foray.common.TestFOrayCommon;
+import org.foray.common.Environment;
import org.axsl.ps.PsException;
@@ -49,7 +49,7 @@
* @throws PsException For errors parsing the input.
*/
public void testZdGl() throws IOException, PsException {
- final File sandbox = TestFOrayCommon.getSandbox();
+ final File sandbox = Environment.getSandbox();
final File testFile = new File(sandbox, "foray-ps/resource/glyph-list/zapfdingbats.txt");
final FileInputStream input = new FileInputStream(testFile);
assertNotNull(input);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-08-14 13:40:36
|
Revision: 11014
http://foray.svn.sourceforge.net/foray/?rev=11014&view=rev
Author: victormote
Date: 2010-08-14 13:40:28 +0000 (Sat, 14 Aug 2010)
Log Message:
-----------
Mavenize the ant build scripts.
Modified Paths:
--------------
trunk/foray/foray-app/scripts/build.xml
trunk/foray/foray-areatree/scripts/build.xml
trunk/foray/foray-common/scripts/build.xml
trunk/foray/foray-core/scripts/build.xml
trunk/foray/foray-font/scripts/build.xml
trunk/foray/foray-fotree/scripts/build.xml
trunk/foray/foray-graphic/scripts/build.xml
trunk/foray/foray-hyphen/scripts/build.xml
trunk/foray/foray-layout/scripts/build.xml
trunk/foray/foray-mif/scripts/build.xml
trunk/foray/foray-output/scripts/build.xml
trunk/foray/foray-pdf/scripts/build.xml
trunk/foray/foray-pioneer/scripts/build.xml
trunk/foray/foray-ps/scripts/build.xml
trunk/foray/foray-render/scripts/build.xml
trunk/foray/foray-speech/scripts/build.xml
trunk/foray/foray-text/scripts/build.xml
trunk/foray/foray-xml/scripts/build.xml
Modified: trunk/foray/foray-app/scripts/build.xml
===================================================================
--- trunk/foray/foray-app/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-app/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,9 +11,9 @@
<target name="init" depends="env, common-init">
<property name="module" value="app"/>
<property name="module.dir" value="${foray.sandbox}/foray-${module}"/>
- <property name="src.dir" value="${module.dir}/src/java"/>
- <property name="test-src.dir" value="${module.dir}/src/javatest"/>
- <property name="build.dir" value="${module.dir}/build/ant"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="test-src.dir" value="${module.dir}/src/test/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="test-classes.dir" value="${build.dir}/test-classes"/>
<property name="jar.file"
@@ -21,71 +21,8 @@
<property name="test-jar.file"
location="${build.dir}/test-${name.lowercase}-${module}-${version}.jar"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="axsl*.jar"/>
- <include name="commons-io-*.jar"/>
- <include name="commons-logging-*.jar"/>
- <include name="commons-cli-*.jar"/>
- <include name="servlet*.jar"/>
- <include name="xercesImpl*.jar"/>
- <include name="xml-apis*.jar"/>
- </fileset>
- <fileset dir="${build.lib.dir}">
- <include name="junit/*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-core/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-font/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-speech/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-ps/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-graphic/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-pdf/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-hyphen/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-text/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-fotree/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-areatree/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-layout/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-pioneer/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-output/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-render/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-mif/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -112,6 +49,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
>
<classpath refid="libs-build-classpath"/>
</javac>
Modified: trunk/foray/foray-areatree/scripts/build.xml
===================================================================
--- trunk/foray/foray-areatree/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-areatree/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,9 +11,9 @@
<target name="init" depends="env, common-init">
<property name="module" value="areatree"/>
<property name="module.dir" value="${foray.sandbox}/foray-${module}"/>
- <property name="src.dir" value="${module.dir}/src/java"/>
- <property name="test-src.dir" value="${module.dir}/src/javatest"/>
- <property name="build.dir" value="${module.dir}/build/ant"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="test-src.dir" value="${module.dir}/src/test/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="test-classes.dir" value="${build.dir}/test-classes"/>
<property name="jar.file"
@@ -21,22 +21,8 @@
<property name="test-jar.file"
location="${build.dir}/test-${name.lowercase}-${module}-${version}.jar"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${build.lib.dir}">
- <include name="junit/*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="svg-*.jar"/>
- <include name="axsl*.jar"/>
- <include name="commons-logging-*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -63,6 +49,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
>
<classpath refid="libs-build-classpath"/>
</javac>
Modified: trunk/foray/foray-common/scripts/build.xml
===================================================================
--- trunk/foray/foray-common/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-common/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -12,9 +12,9 @@
<property name="module" value="common"/>
<property name="module.dir" value="${foray.sandbox}/foray-${module}"/>
<property name="doc.dir" value="${foray.sandbox}/doc"/>
- <property name="src.dir" value="${module.dir}/src/java"/>
- <property name="test-src.dir" value="${module.dir}/src/javatest"/>
- <property name="build.dir" value="${module.dir}/build/ant"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="test-src.dir" value="${module.dir}/src/test/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="test-classes.dir" value="${build.dir}/test-classes"/>
<property name="jar.file"
@@ -24,21 +24,8 @@
<property name="resources.build"
location="${build.dir}/resources"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${build.lib.dir}">
- <include name="junit/*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="axsl*.jar"/>
- <include name="commons-logging-*.jar"/>
- <include name="commons-io-*.jar"/>
- <include name="xercesImpl*.jar"/>
- <include name="stax-api*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -65,7 +52,9 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
- >
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
+ >
<classpath refid="libs-build-classpath"/>
</javac>
</target>
Modified: trunk/foray/foray-core/scripts/build.xml
===================================================================
--- trunk/foray/foray-core/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-core/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,26 +11,14 @@
<target name="init" depends="env, common-init">
<property name="module" value="core"/>
<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"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="jar.file"
location="${build.dir}/${name.lowercase}-${module}-${version}.jar"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="axsl*.jar"/>
- <include name="commons-logging-*.jar"/>
- <include name="xml-apis-1.3.02.jar"/>
- <include name="xercesImpl-2.7.1.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -57,7 +45,9 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
- >
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
+ >
<classpath refid="libs-build-classpath"/>
</javac>
</target>
Modified: trunk/foray/foray-font/scripts/build.xml
===================================================================
--- trunk/foray/foray-font/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-font/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,9 +11,9 @@
<target name="init" depends="env, common-init">
<property name="module" value="font"/>
<property name="module.dir" value="${foray.sandbox}/foray-${module}"/>
- <property name="src.dir" value="${module.dir}/src/java"/>
- <property name="test-src.dir" value="${module.dir}/src/javatest"/>
- <property name="build.dir" value="${module.dir}/build/ant"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="test-src.dir" value="${module.dir}/src/test/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="test-classes.dir" value="${build.dir}/test-classes"/>
<property name="jar.file"
@@ -26,28 +26,8 @@
<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="${build.lib.dir}">
- <include name="junit/*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="xercesImpl*.jar"/>
- <include name="axsl*.jar"/>
- <include name="commons-io-*.jar"/>
- <include name="commons-logging-*.jar"/>
- <include name="commons-discovery-*.jar"/>
- <include name="xml-apis*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-xml/build/ant">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -67,7 +47,7 @@
Parse and serialize the Base-14 AFM files
==============================================================================
-->
- <target name="resources" depends="package"
+ <target name="resources" depends="prepare"
description="Parse and serialize the Base-14 AFM files">
<!-- Set up variables, paths, and filesets. -->
@@ -123,6 +103,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
>
<classpath refid="libs-build-classpath"/>
</javac>
Modified: trunk/foray/foray-fotree/scripts/build.xml
===================================================================
--- trunk/foray/foray-fotree/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-fotree/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,9 +11,9 @@
<target name="init" depends="env, common-init">
<property name="module" value="fotree"/>
<property name="module.dir" value="${foray.sandbox}/foray-${module}"/>
- <property name="src.dir" value="${module.dir}/src/java"/>
- <property name="test-src.dir" value="${module.dir}/src/javatest"/>
- <property name="build.dir" value="${module.dir}/build/ant"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="test-src.dir" value="${module.dir}/src/test/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="test-classes.dir" value="${build.dir}/test-classes"/>
<property name="jar.file"
@@ -21,23 +21,8 @@
<property name="test-jar.file"
location="${build.dir}/test-${name.lowercase}-${module}-${version}.jar"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${build.lib.dir}">
- <include name="junit/*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="axsl*.jar"/>
- <include name="commons-logging-*.jar"/>
- <include name="svg-*.jar"/>
- <include name="mathml-*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -71,6 +56,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
>
<src path="${src.dir}"/>
<classpath refid="libs-build-classpath"/>
Modified: trunk/foray/foray-graphic/scripts/build.xml
===================================================================
--- trunk/foray/foray-graphic/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-graphic/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,9 +11,9 @@
<target name="init" depends="env, common-init">
<property name="module" value="graphic"/>
<property name="module.dir" value="${foray.sandbox}/foray-${module}"/>
- <property name="src.dir" value="${module.dir}/src/java"/>
- <property name="test-src.dir" value="${module.dir}/src/javatest"/>
- <property name="build.dir" value="${module.dir}/build/ant"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="test-src.dir" value="${module.dir}/src/test/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="test-classes.dir" value="${build.dir}/test-classes"/>
<property name="jar.file"
@@ -21,25 +21,8 @@
<property name="test-jar.file"
location="${build.dir}/test-${name.lowercase}-${module}-${version}.jar"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${build.lib.dir}">
- <include name="junit/*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="axsl*.jar"/>
- <include name="batik*.jar"/>
- <include name="commons-io-*.jar"/>
- <include name="commons-logging-*.jar"/>
- <include name="xmlgraphics-commons-*.jar"/>
- <include name="jeuclid-core-*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -65,6 +48,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
>
<src path="${src.dir}"/>
<classpath refid="libs-build-classpath"/>
Modified: trunk/foray/foray-hyphen/scripts/build.xml
===================================================================
--- trunk/foray/foray-hyphen/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-hyphen/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,9 +11,9 @@
<target name="init" depends="env, common-init">
<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="test-src.dir" value="${module.dir}/src/javatest"/>
- <property name="build.dir" value="${module.dir}/build/ant"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="test-src.dir" value="${module.dir}/src/test/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="test-classes.dir" value="${build.dir}/test-classes"/>
<property name="jar.file"
@@ -26,26 +26,8 @@
<property name="hyph.build"
value="${build.dir}/resource/org/foray/hyphen/resource/patterns"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${build.lib.dir}">
- <include name="junit/*.jar"/>
- <include name="axsl/axsl-dev*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="axsl*.jar"/>
- <include name="commons-cli-*.jar"/>
- <include name="commons-logging-*.jar"/>
- <include name="icu4j*.jar"/>
- <include name="xml-apis*.jar"/>
- <include name="xerces*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -112,6 +94,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
>
<classpath refid="libs-build-classpath"/>
</javac>
Modified: trunk/foray/foray-layout/scripts/build.xml
===================================================================
--- trunk/foray/foray-layout/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-layout/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,24 +11,15 @@
<target name="init" depends="env, common-init">
<property name="module" value="layout"/>
<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"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="jar.file"
location="${build.dir}/${name.lowercase}-${module}-${version}.jar"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="axsl*.jar"/>
- <include name="commons-logging-*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
+
</target>
<!-- =================================================================== -->
@@ -54,6 +45,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
>
<classpath refid="libs-build-classpath"/>
</javac>
Modified: trunk/foray/foray-mif/scripts/build.xml
===================================================================
--- trunk/foray/foray-mif/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-mif/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,25 +11,14 @@
<target name="init" depends="env, common-init">
<property name="module" value="mif"/>
<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"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="jar.file"
location="${build.dir}/${name.lowercase}-${module}-${version}.jar"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="axsl*.jar"/>
- <include name="commons-logging-*.jar"/>
- <include name="xml-apis.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -56,6 +45,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
>
<classpath refid="libs-build-classpath"/>
</javac>
Modified: trunk/foray/foray-output/scripts/build.xml
===================================================================
--- trunk/foray/foray-output/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-output/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -11,24 +11,14 @@
<target name="init" depends="env, common-init">
<property name="module" value="output"/>
<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"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="jar.file"
location="${build.dir}/${name.lowercase}-${module}-${version}.jar"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="axsl*.jar"/>
- <include name="commons-logging-*.jar"/>
- </fileset>
- <fileset dir="${foray.sandbox}/foray-common/build/ant">
- <include name="*.jar"/>
- </fileset>
- </path>
+ <artifact:pom id="project.pom" file="../pom.xml"/>
+ <artifact:dependencies pathId="libs-build-classpath" pomRefId="project.pom"/>
</target>
@@ -62,6 +52,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
source="${source}"
+ fork="true"
+ executable="${jdk.home}/bin/javac.exe"
>
<src path="${src.dir}"/>
<classpath refid="libs-build-classpath"/>
Modified: trunk/foray/foray-pdf/scripts/build.xml
===================================================================
--- trunk/foray/foray-pdf/scripts/build.xml 2010-08-14 13:13:57 UTC (rev 11013)
+++ trunk/foray/foray-pdf/scripts/build.xml 2010-08-14 13:40:28 UTC (rev 11014)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
-<project default="package" basedir=".">
+<project default="package" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="../../foray-all/scripts/build-common.xml"/>
@@ -14,24 +14,14 @@
<target name="init" depends="env, common-init">
<property name="module" value="pdf"/>
<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"/>
+ <property name="src.dir" value="${module.dir}/src/main/java"/>
+ <property name="build.dir" value="${module.dir}/target"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="jar.file"
location="${build.dir}/${name.lowercase}-${module}-${version}.jar"/>
- <path id="libs-build-classpath">
- <fileset dir="${axsl.build}">
- <include name="**/axsl*.jar"/...
[truncated message content] |
|
From: <vic...@us...> - 2010-08-14 17:38:04
|
Revision: 11019
http://foray.svn.sourceforge.net/foray/?rev=11019&view=rev
Author: victormote
Date: 2010-08-14 17:37:57 +0000 (Sat, 14 Aug 2010)
Log Message:
-----------
Add axsl-hyphen tests to the dependencies for foray-hyphen.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-hyphen/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-08-14 16:00:34 UTC (rev 11018)
+++ trunk/foray/foray-all/pom.xml 2010-08-14 17:37:57 UTC (rev 11019)
@@ -284,6 +284,13 @@
</dependency>
<dependency>
<groupId>org.axsl</groupId>
+ <artifactId>axsl-hyphen</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
<artifactId>axsl-layout</artifactId>
<version>0.3-SNAPSHOT</version>
<type>jar</type>
Modified: trunk/foray/foray-hyphen/pom.xml
===================================================================
--- trunk/foray/foray-hyphen/pom.xml 2010-08-14 16:00:34 UTC (rev 11018)
+++ trunk/foray/foray-hyphen/pom.xml 2010-08-14 17:37:57 UTC (rev 11019)
@@ -60,6 +60,12 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-hyphen</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.foray</groupId>
<artifactId>foray-common</artifactId>
<type>jar</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-08-15 22:30:22
|
Revision: 11026
http://foray.svn.sourceforge.net/foray/?rev=11026&view=rev
Author: victormote
Date: 2010-08-15 22:30:16 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
Make the method more flexible by allowing any InputStream.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java 2010-08-15 22:11:36 UTC (rev 11025)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java 2010-08-15 22:30:16 UTC (rev 11026)
@@ -31,11 +31,11 @@
import org.apache.xerces.util.XMLCatalogResolver;
import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.bootstrap.DOMImplementationRegistry;
import org.w3c.dom.ls.DOMImplementationLS;
import org.w3c.dom.ls.LSException;
+import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSParser;
import org.w3c.dom.ls.LSResourceResolver;
import org.xml.sax.EntityResolver;
@@ -43,8 +43,7 @@
import org.xml.sax.SAXException;
import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
+import java.io.InputStream;
import javax.xml.stream.XMLResolver;
import javax.xml.stream.XMLStreamException;
@@ -174,14 +173,15 @@
}
/**
- * Converts a URL to a generic DOM Document.
- * @param url The URL to be parsed to a DOM document.
+ * Converts an input stream to a generic DOM Document.
+ * @param inputStream The stream to be parsed to a DOM document.
* @param resourceResolver The resource resolver to use, which can be null.
* This is useful for cases where we want (for example) to find a DTD locally instead of on the internet.
* @return The DOM document.
* @throws IOException For errors parsing the document.
*/
- public static Document urlToDom(final URL url, final LSResourceResolver resourceResolver) throws IOException {
+ public static Document urlToDom(final InputStream inputStream, final LSResourceResolver resourceResolver)
+ throws IOException {
final DOMImplementationLS impl = XMLUtil.getDOMImplementation();
final LSParser builder = impl.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
final DOMConfiguration domConfiguration = builder.getDomConfig();
@@ -190,18 +190,19 @@
domConfiguration.setParameter("resource-resolver", resourceResolver);
}
- String uriString = null;
- try {
- uriString = url.toURI().toString();
- } catch (final URISyntaxException e) {
- throw new IOException(e.getMessage());
- }
+ final LSInput lsInput = impl.createLSInput();
+ lsInput.setByteStream(inputStream);
+// try {
+// uriString = url.toURI().toString();
+// } catch (final URISyntaxException e) {
+// throw new IOException(e.getMessage());
+// }
Document document = null;
try {
- document = builder.parseURI(uriString);
- } catch (final DOMException e) {
- throw new IOException(e.getMessage());
+ document = builder.parse(lsInput);
+// } catch (final DOMException e) {
+// throw new IOException(e.getMessage());
} catch (final LSException e) {
throw new IOException(e.getMessage());
}
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java 2010-08-15 22:11:36 UTC (rev 11025)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java 2010-08-15 22:30:16 UTC (rev 11026)
@@ -45,7 +45,7 @@
public class TestXMLUtil extends TestCase {
/**
- * Test the method {@link XMLUtil#urlToDom(java.net.URL, org.w3c.dom.ls.LSResourceResolver)} by parsing
+ * Test the method {@link XMLUtil#urlToDom(java.io.InputStream, org.w3c.dom.ls.LSResourceResolver)} by parsing
* a file and testing the results.
* @throws IOException For errors getting the local sandbox.
*/
@@ -55,7 +55,7 @@
final File testFile = new File(graphicsDir, "mathml-example-1.xml");
final URL url = testFile.toURI().toURL();
final LSResourceResolver resourceResolver = MathMLUtil.getMathMLDtdResourceResolver();
- final Document document = XMLUtil.urlToDom(url, resourceResolver);
+ final Document document = XMLUtil.urlToDom(url.openStream(), resourceResolver);
assertNotNull(document);
/* The document itself has two children, the document type, and the
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java 2010-08-15 22:11:36 UTC (rev 11025)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java 2010-08-15 22:30:16 UTC (rev 11026)
@@ -78,7 +78,7 @@
/* Convert the URL to a generic DOM document instance. */
final LSResourceResolver resourceResolver = MathMLUtil.getMathMLDtdResourceResolver();
- final Document dom = XMLUtil.urlToDom(url, resourceResolver);
+ final Document dom = XMLUtil.urlToDom(url.openStream(), resourceResolver);
/* Convert the generic DOM to an SVGDocument (DOM/SVG Document), using
* JEuclid. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-08-16 04:00:36
|
Revision: 11031
http://foray.svn.sourceforge.net/foray/?rev=11031&view=rev
Author: victormote
Date: 2010-08-16 04:00:23 +0000 (Mon, 16 Aug 2010)
Log Message:
-----------
Remove no-longer-needed classes for building the test suites for each module.
Removed Paths:
-------------
trunk/foray/foray-app/src/test/java/org/foray/app/TestFOrayApp.java
trunk/foray/foray-areatree/src/test/java/org/foray/area/TestFOrayAreaTree.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestFOrayCommon.java
trunk/foray/foray-font/src/test/java/org/foray/font/TestFOrayFont.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/TestFOrayFOTree.java
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestFOrayGraphic.java
trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestFOrayHyphen.java
trunk/foray/foray-ps/src/test/java/org/foray/ps/TestFOrayPS.java
trunk/foray/foray-render/src/test/java/org/foray/render/TestFOrayRender.java
Deleted: trunk/foray/foray-app/src/test/java/org/foray/app/TestFOrayApp.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/TestFOrayApp.java 2010-08-16 03:53:05 UTC (rev 11030)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/TestFOrayApp.java 2010-08-16 04:00:23 UTC (rev 11031)
@@ -1,76 +0,0 @@
-/*
- * Copyright 2007 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.app;
-
-import org.foray.app.area.TestBlock;
-import org.foray.app.area.TestBorder;
-import org.foray.app.area.TestGraphicArea;
-import org.foray.app.area.TestInline;
-import org.foray.app.area.TestMetadata;
-import org.foray.app.area.TestVertical;
-import org.foray.app.fo.TestFont;
-import org.foray.app.fo.TestGraphic;
-import org.foray.app.fo.TestInvalidXml;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Handles testing for the FOrayApp module.
- */
-public class TestFOrayApp extends TestCase {
-
- /**
- * Builds a test suite for all classes in this module.
- * @return The built test suite.
- */
- public static Test suite() {
- final TestSuite testSuite = new TestSuite("The FOray Application");
-
- /* FO Tree tests. */
- testSuite.addTestSuite(TestInvalidXml.class);
- testSuite.addTestSuite(TestFont.class);
- testSuite.addTestSuite(TestGraphic.class);
-
- /* Area Tree tests. */
- testSuite.addTestSuite(TestBorder.class);
- testSuite.addTestSuite(TestBlock.class);
- testSuite.addTestSuite(TestInline.class);
- testSuite.addTestSuite(TestMetadata.class);
- testSuite.addTestSuite(TestGraphicArea.class);
- testSuite.addTestSuite(TestVertical.class);
-
- /* Tests of classes in this project. */
- testSuite.addTestSuite(TestFOray.class);
-
- return testSuite;
- }
-
-}
Deleted: trunk/foray/foray-areatree/src/test/java/org/foray/area/TestFOrayAreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/test/java/org/foray/area/TestFOrayAreaTree.java 2010-08-16 03:53:05 UTC (rev 11030)
+++ trunk/foray/foray-areatree/src/test/java/org/foray/area/TestFOrayAreaTree.java 2010-08-16 04:00:23 UTC (rev 11031)
@@ -1,52 +0,0 @@
-/*
- * Copyright 2007 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Handles testing for the FOrayAreaTree module.
- */
-public class TestFOrayAreaTree extends TestCase {
-
- /**
- * Builds a test suite for all classes in this module.
- * @return The built test suite.
- */
- public static Test suite() {
- final TestSuite testSuite = new TestSuite("FOray Area Tree");
-
- testSuite.addTestSuite(TestPageCollection.class);
-
- return testSuite;
- }
-
-}
Deleted: trunk/foray/foray-common/src/test/java/org/foray/common/TestFOrayCommon.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestFOrayCommon.java 2010-08-16 03:53:05 UTC (rev 11030)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestFOrayCommon.java 2010-08-16 04:00:23 UTC (rev 11031)
@@ -1,51 +0,0 @@
-/*
- * Copyright 2006 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.common;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-import junit.framework.TestCase;
-
-/**
- * Handles testing for the FOrayCommon module.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- TestBit.class,
- TestByteVectorPacked.class,
- TestCharVector.class,
- TestStringUtil.class,
- TestTernaryTreeMap.class,
- TestUnicodeChar.class,
- TestXMLUtil.class
-})
-public class TestFOrayCommon extends TestCase {
-
-}
Deleted: trunk/foray/foray-font/src/test/java/org/foray/font/TestFOrayFont.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/TestFOrayFont.java 2010-08-16 03:53:05 UTC (rev 11030)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/TestFOrayFont.java 2010-08-16 04:00:23 UTC (rev 11031)
@@ -1,57 +0,0 @@
-/*
- * Copyright 2006 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.font;
-
-import org.foray.font.format.TestType1PfbFile;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Handles testing for the FOrayFont module.
- */
-public class TestFOrayFont extends TestCase {
-
- /**
- * Builds a test suite for all classes in this module.
- * @return The built test suite.
- */
- public static Test suite() {
- final TestSuite testSuite = new TestSuite("FOray Font");
-
- testSuite.addTestSuite(TestFontServer4a.class);
- testSuite.addTestSuite(TestFont4a.class);
-
- testSuite.addTestSuite(TestType1PfbFile.class);
-
- return testSuite;
- }
-
-}
Deleted: trunk/foray/foray-fotree/src/test/java/org/foray/fotree/TestFOrayFOTree.java
===================================================================
--- trunk/foray/foray-fotree/src/test/java/org/foray/fotree/TestFOrayFOTree.java 2010-08-16 03:53:05 UTC (rev 11030)
+++ trunk/foray/foray-fotree/src/test/java/org/foray/fotree/TestFOrayFOTree.java 2010-08-16 04:00:23 UTC (rev 11031)
@@ -1,637 +0,0 @@
-/*
- * Copyright 2006 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree;
-
-import org.foray.fotree.fo.prop.TestAbsolutePosition;
-import org.foray.fotree.fo.prop.TestActiveState;
-import org.foray.fotree.fo.prop.TestAlignmentAdjust;
-import org.foray.fotree.fo.prop.TestAlignmentBaseline;
-import org.foray.fotree.fo.prop.TestAllowedHeightScale;
-import org.foray.fotree.fo.prop.TestAllowedWidthScale;
-import org.foray.fotree.fo.prop.TestAutoRestore;
-import org.foray.fotree.fo.prop.TestAzimuth;
-import org.foray.fotree.fo.prop.TestBackground;
-import org.foray.fotree.fo.prop.TestBackgroundAttachment;
-import org.foray.fotree.fo.prop.TestBackgroundColor;
-import org.foray.fotree.fo.prop.TestBackgroundImage;
-import org.foray.fotree.fo.prop.TestBackgroundPosition;
-import org.foray.fotree.fo.prop.TestBackgroundPositionHorizontal;
-import org.foray.fotree.fo.prop.TestBackgroundPositionVertical;
-import org.foray.fotree.fo.prop.TestBackgroundRepeat;
-import org.foray.fotree.fo.prop.TestBaselineShift;
-import org.foray.fotree.fo.prop.TestBlankOrNotBlank;
-import org.foray.fotree.fo.prop.TestBlockProgressionDimension;
-import org.foray.fotree.fo.prop.TestBorder;
-import org.foray.fotree.fo.prop.TestBorderAfterColor;
-import org.foray.fotree.fo.prop.TestBorderAfterPrecedence;
-import org.foray.fotree.fo.prop.TestBorderAfterStyle;
-import org.foray.fotree.fo.prop.TestBorderAfterWidth;
-import org.foray.fotree.fo.prop.TestBorderBeforeColor;
-import org.foray.fotree.fo.prop.TestBorderBeforePrecedence;
-import org.foray.fotree.fo.prop.TestBorderBeforeStyle;
-import org.foray.fotree.fo.prop.TestBorderBeforeWidth;
-import org.foray.fotree.fo.prop.TestBorderBottom;
-import org.foray.fotree.fo.prop.TestBorderBottomColor;
-import org.foray.fotree.fo.prop.TestBorderBottomStyle;
-import org.foray.fotree.fo.prop.TestBorderBottomWidth;
-import org.foray.fotree.fo.prop.TestBorderCollapse;
-import org.foray.fotree.fo.prop.TestBorderColor;
-import org.foray.fotree.fo.prop.TestBorderEndColor;
-import org.foray.fotree.fo.prop.TestBorderEndPrecedence;
-import org.foray.fotree.fo.prop.TestBorderEndStyle;
-import org.foray.fotree.fo.prop.TestBorderEndWidth;
-import org.foray.fotree.fo.prop.TestBorderLeft;
-import org.foray.fotree.fo.prop.TestBorderLeftColor;
-import org.foray.fotree.fo.prop.TestBorderLeftStyle;
-import org.foray.fotree.fo.prop.TestBorderLeftWidth;
-import org.foray.fotree.fo.prop.TestBorderRight;
-import org.foray.fotree.fo.prop.TestBorderRightColor;
-import org.foray.fotree.fo.prop.TestBorderRightStyle;
-import org.foray.fotree.fo.prop.TestBorderRightWidth;
-import org.foray.fotree.fo.prop.TestBorderSeparation;
-import org.foray.fotree.fo.prop.TestBorderSpacing;
-import org.foray.fotree.fo.prop.TestBorderStartColor;
-import org.foray.fotree.fo.prop.TestBorderStartPrecedence;
-import org.foray.fotree.fo.prop.TestBorderStartStyle;
-import org.foray.fotree.fo.prop.TestBorderStartWidth;
-import org.foray.fotree.fo.prop.TestBorderStyle;
-import org.foray.fotree.fo.prop.TestBorderTop;
-import org.foray.fotree.fo.prop.TestBorderTopColor;
-import org.foray.fotree.fo.prop.TestBorderTopStyle;
-import org.foray.fotree.fo.prop.TestBorderTopWidth;
-import org.foray.fotree.fo.prop.TestBorderWidth;
-import org.foray.fotree.fo.prop.TestBottom;
-import org.foray.fotree.fo.prop.TestBreakAfter;
-import org.foray.fotree.fo.prop.TestBreakBefore;
-import org.foray.fotree.fo.prop.TestCaptionSide;
-import org.foray.fotree.fo.prop.TestCaseName;
-import org.foray.fotree.fo.prop.TestCaseTitle;
-import org.foray.fotree.fo.prop.TestChangeBarClass;
-import org.foray.fotree.fo.prop.TestChangeBarColor;
-import org.foray.fotree.fo.prop.TestChangeBarOffset;
-import org.foray.fotree.fo.prop.TestChangeBarPlacement;
-import org.foray.fotree.fo.prop.TestChangeBarStyle;
-import org.foray.fotree.fo.prop.TestChangeBarWidth;
-import org.foray.fotree.fo.prop.TestCharacter;
-import org.foray.fotree.fo.prop.TestClear;
-import org.foray.fotree.fo.prop.TestClip;
-import org.foray.fotree.fo.prop.TestColor;
-import org.foray.fotree.fo.prop.TestColorProfileName;
-import org.foray.fotree.fo.prop.TestColumnCount;
-import org.foray.fotree.fo.prop.TestColumnGap;
-import org.foray.fotree.fo.prop.TestColumnNumber;
-import org.foray.fotree.fo.prop.TestColumnWidth;
-import org.foray.fotree.fo.prop.TestContentHeight;
-import org.foray.fotree.fo.prop.TestContentType;
-import org.foray.fotree.fo.prop.TestContentWidth;
-import org.foray.fotree.fo.prop.TestCountry;
-import org.foray.fotree.fo.prop.TestCue;
-import org.foray.fotree.fo.prop.TestCueAfter;
-import org.foray.fotree.fo.prop.TestCueBefore;
-import org.foray.fotree.fo.prop.TestDestinationPlacementOffset;
-import org.foray.fotree.fo.prop.TestDirection;
-import org.foray.fotree.fo.prop.TestDisplayAlign;
-import org.foray.fotree.fo.prop.TestDominantBaseline;
-import org.foray.fotree.fo.prop.TestElevation;
-import org.foray.fotree.fo.prop.TestEmptyCells;
-import org.foray.fotree.fo.prop.TestEndIndent;
-import org.foray.fotree.fo.prop.TestEndsRow;
-import org.foray.fotree.fo.prop.TestExtent;
-import org.foray.fotree.fo.prop.TestExternalDestination;
-import org.foray.fotree.fo.prop.TestFloat;
-import org.foray.fotree.fo.prop.TestFlowMapName;
-import org.foray.fotree.fo.prop.TestFlowMapReference;
-import org.foray.fotree.fo.prop.TestFlowName;
-import org.foray.fotree.fo.prop.TestFlowNameReference;
-import org.foray.fotree.fo.prop.TestFont;
-import org.foray.fotree.fo.prop.TestFontFamily;
-import org.foray.fotree.fo.prop.TestFontSelectionStrategy;
-import org.foray.fotree.fo.prop.TestFontSize;
-import org.foray.fotree.fo.prop.TestFontSizeAdjust;
-import org.foray.fotree.fo.prop.TestFontStretch;
-import org.foray.fotree.fo.prop.TestFontStyle;
-import org.foray.fotree.fo.prop.TestFontVariant;
-import org.foray.fotree.fo.prop.TestFontWeight;
-import org.foray.fotree.fo.prop.TestForcePageCount;
-import org.foray.fotree.fo.prop.TestFormat;
-import org.foray.fotree.fo.prop.TestGlyphOrientationHorizontal;
-import org.foray.fotree.fo.prop.TestGlyphOrientationVertical;
-import org.foray.fotree.fo.prop.TestGroupingSeparator;
-import org.foray.fotree.fo.prop.TestGroupingSize;
-import org.foray.fotree.fo.prop.TestHeight;
-import org.foray.fotree.fo.prop.TestHyphenate;
-import org.foray.fotree.fo.prop.TestHyphenationCharacter;
-import org.foray.fotree.fo.prop.TestHyphenationKeep;
-import org.foray.fotree.fo.prop.TestHyphenationLadderCount;
-import org.foray.fotree.fo.prop.TestHyphenationPushCharacterCount;
-import org.foray.fotree.fo.prop.TestHyphenationRemainCharacterCount;
-import org.foray.fotree.fo.prop.TestId;
-import org.foray.fotree.fo.prop.TestIndexClass;
-import org.foray.fotree.fo.prop.TestIndexKey;
-import org.foray.fotree.fo.prop.TestIndicateDestination;
-import org.foray.fotree.fo.prop.TestInitialPageNumber;
-import org.foray.fotree.fo.prop.TestInlineProgressionDimension;
-import org.foray.fotree.fo.prop.TestInternalDestination;
-import org.foray.fotree.fo.prop.TestIntrinsicScaleValue;
-import org.foray.fotree.fo.prop.TestIntrusionDisplace;
-import org.foray.fotree.fo.prop.TestKeepTogether;
-import org.foray.fotree.fo.prop.TestKeepWithNext;
-import org.foray.fotree.fo.prop.TestKeepWithPrevious;
-import org.foray.fotree.fo.prop.TestLanguage;
-import org.foray.fotree.fo.prop.TestLastLineEndIndent;
-import org.foray.fotree.fo.prop.TestLeaderAlignment;
-import org.foray.fotree.fo.prop.TestLeaderLength;
-import org.foray.fotree.fo.prop.TestLeaderPattern;
-import org.foray.fotree.fo.prop.TestLeaderPatternWidth;
-import org.foray.fotree.fo.prop.TestLeft;
-import org.foray.fotree.fo.prop.TestLetterSpacing;
-import org.foray.fotree.fo.prop.TestLetterValue;
-import org.foray.fotree.fo.prop.TestLineHeight;
-import org.foray.fotree.fo.prop.TestLineHeightShiftAdjustment;
-import org.foray.fotree.fo.prop.TestLineStackingStrategy;
-import org.foray.fotree.fo.prop.TestLinefeedTreatment;
-import org.foray.fotree.fo.prop.TestMargin;
-import org.foray.fotree.fo.prop.TestMarginBottom;
-import org.foray.fotree.fo.prop.TestMarginLeft;
-import org.foray.fotree.fo.prop.TestMarginRight;
-import org.foray.fotree.fo.prop.TestMarginTop;
-import org.foray.fotree.fo.prop.TestMarkerClassName;
-import org.foray.fotree.fo.prop.TestMasterName;
-import org.foray.fotree.fo.prop.TestMasterReference;
-import org.foray.fotree.fo.prop.TestMaxHeight;
-import org.foray.fotree.fo.prop.TestMaxWidth;
-import org.foray.fotree.fo.prop.TestMaximumRepeats;
-import org.foray.fotree.fo.prop.TestMediaUsage;
-import org.foray.fotree.fo.prop.TestMergePagesAcrossIndexKeyReferences;
-import org.foray.fotree.fo.prop.TestMergeRangesAcrossIndexKeyReferences;
-import org.foray.fotree.fo.prop.TestMergeSequentialPageNumbers;
-import org.foray.fotree.fo.prop.TestMinHeight;
-import org.foray.fotree.fo.prop.TestMinWidth;
-import org.foray.fotree.fo.prop.TestNumberColumnsRepeated;
-import org.foray.fotree.fo.prop.TestNumberColumnsSpanned;
-import org.foray.fotree.fo.prop.TestNumberRowsSpanned;
-import org.foray.fotree.fo.prop.TestOddOrEven;
-import org.foray.fotree.fo.prop.TestOrphans;
-import org.foray.fotree.fo.prop.TestOverflow;
-import org.foray.fotree.fo.prop.TestPadding;
-import org.foray.fotree.fo.prop.TestPaddingAfter;
-import org.foray.fotree.fo.prop.TestPaddingBefore;
-import org.foray.fotree.fo.prop.TestPaddingBottom;
-import org.foray.fotree.fo.prop.TestPaddingEnd;
-import org.foray.fotree.fo.prop.TestPaddingLeft;
-import org.foray.fotree.fo.prop.TestPaddingRight;
-import org.foray.fotree.fo.prop.TestPaddingStart;
-import org.foray.fotree.fo.prop.TestPaddingTop;
-import org.foray.fotree.fo.prop.TestPageBreakAfter;
-import org.foray.fotree.fo.prop.TestPageBreakBefore;
-import org.foray.fotree.fo.prop.TestPageBreakInside;
-import org.foray.fotree.fo.prop.TestPageCitationStrategy;
-import org.foray.fotree.fo.prop.TestPageHeight;
-import org.foray.fotree.fo.prop.TestPageNumberTreatment;
-import org.foray.fotree.fo.prop.TestPagePosition;
-import org.foray.fotree.fo.prop.TestPageWidth;
-import org.foray.fotree.fo.prop.TestPause;
-import org.foray.fotree.fo.prop.TestPauseAfter;
-import org.foray.fotree.fo.prop.TestPauseBefore;
-import org.foray.fotree.fo.prop.TestPitch;
-import org.foray.fotree.fo.prop.TestPitchRange;
-import org.foray.fotree.fo.prop.TestPlayDuring;
-import org.foray.fotree.fo.prop.TestPosition;
-import org.foray.fotree.fo.prop.TestPrecedence;
-import org.foray.fotree.fo.prop.TestProvisionalDistanceBetweenStarts;
-import org.foray.fotree.fo.prop.TestProvisionalLabelSeparation;
-import org.foray.fotree.fo.prop.TestRefId;
-import org.foray.fotree.fo.prop.TestRefIndexKey;
-import org.foray.fotree.fo.prop.TestReferenceOrientation;
-import org.foray.fotree.fo.prop.TestRegionName;
-import org.foray.fotree.fo.prop.TestRegionNameReference;
-import org.foray.fotree.fo.prop.TestRelativeAlign;
-import org.foray.fotree.fo.prop.TestRelativePosition;
-import org.foray.fotree.fo.prop.TestRenderingIntent;
-import org.foray.fotree.fo.prop.TestRetrieveBoundary;
-import org.foray.fotree.fo.prop.TestRetrieveBoundaryWithinTable;
-import org.foray.fotree.fo.prop.TestRetrieveClassName;
-import org.foray.fotree.fo.prop.TestRetrievePosition;
-import org.foray.fotree.fo.prop.TestRetrievePositionWithinTable;
-import org.foray.fotree.fo.prop.TestRichness;
-import org.foray.fotree.fo.prop.TestRight;
-import org.foray.fotree.fo.prop.TestRole;
-import org.foray.fotree.fo.prop.TestRuleStyle;
-import org.foray.fotree.fo.prop.TestRuleThickness;
-import org.foray.fotree.fo.prop.TestScaleOption;
-import org.foray.fotree.fo.prop.TestScaling;
-import org.foray.fotree.fo.prop.TestScalingMethod;
-import org.foray.fotree.fo.prop.TestScoreSpaces;
-import org.foray.fotree.fo.prop.TestScript;
-import org.foray.fotree.fo.prop.TestShowDestination;
-import org.foray.fotree.fo.prop.TestSize;
-import org.foray.fotree.fo.prop.TestSourceDocument;
-import org.foray.fotree.fo.prop.TestSpaceAfter;
-import org.foray.fotree.fo.prop.TestSpaceBefore;
-import org.foray.fotree.fo.prop.TestSpaceEnd;
-import org.foray.fotree.fo.prop.TestSpaceStart;
-import org.foray.fotree.fo.prop.TestSpan;
-import org.foray.fotree.fo.prop.TestSpeak;
-import org.foray.fotree.fo.prop.TestSpeakHeader;
-import org.foray.fotree.fo.prop.TestSpeakNumeral;
-import org.foray.fotree.fo.prop.TestSpeakPunctuation;
-import org.foray.fotree.fo.prop.TestSpeechRate;
-import org.foray.fotree.fo.prop.TestSrc;
-import org.foray.fotree.fo.prop.TestStartIndent;
-import org.foray.fotree.fo.prop.TestStartingState;
-import org.foray.fotree.fo.prop.TestStartsRow;
-import org.foray.fotree.fo.prop.TestStress;
-import org.foray.fotree.fo.prop.TestSuppressAtLineBreak;
-import org.foray.fotree.fo.prop.TestSwitchTo;
-import org.foray.fotree.fo.prop.TestTableLayout;
-import org.foray.fotree.fo.prop.TestTableOmitFooterAtBreak;
-import org.foray.fotree.fo.prop.TestTableOmitHeaderAtBreak;
-import org.foray.fotree.fo.prop.TestTargetPresentationContext;
-import org.foray.fotree.fo.prop.TestTargetProcessingContext;
-import org.foray.fotree.fo.prop.TestTargetStylesheet;
-import org.foray.fotree.fo.prop.TestTextAlign;
-import org.foray.fotree.fo.prop.TestTextAlignLast;
-import org.foray.fotree.fo.prop.TestTextAltitude;
-import org.foray.fotree.fo.prop.TestTextDecoration;
-import org.foray.fotree.fo.prop.TestTextDepth;
-import org.foray.fotree.fo.prop.TestTextIndent;
-import org.foray.fotree.fo.prop.TestTextShadow;
-import org.foray.fotree.fo.prop.TestTextTransform;
-import org.foray.fotree.fo.prop.TestTop;
-import org.foray.fotree.fo.prop.TestTreatAsWordSpace;
-import org.foray.fotree.fo.prop.TestUnicodeBidi;
-import org.foray.fotree.fo.prop.TestVerticalAlign;
-import org.foray.fotree.fo.prop.TestVisibility;
-import org.foray.fotree.fo.prop.TestVoiceFamily;
-import org.foray.fotree.fo.prop.TestVolume;
-import org.foray.fotree.fo.prop.TestWhiteSpace;
-import org.foray.fotree.fo.prop.TestWhiteSpaceCollapse;
-import org.foray.fotree.fo.prop.TestWhiteSpaceTreatment;
-import org.foray.fotree.fo.prop.TestWidows;
-import org.foray.fotree.fo.prop.TestWidth;
-import org.foray.fotree.fo.prop.TestWordSpacing;
-import org.foray.fotree.fo.prop.TestWrapOption;
-import org.foray.fotree.fo.prop.TestWritingMode;
-import org.foray.fotree.fo.prop.TestZIndex;
-import org.foray.fotree.value.TestDtLength;
-import org.foray.fotree.value.TestFnAbs;
-import org.foray.fotree.value.TestFnBodyStart;
-import org.foray.fotree.value.TestFnCeiling;
-import org.foray.fotree.value.TestFnFloor;
-import org.foray.fotree.value.TestFnFromPageMasterRegion;
-import org.foray.fotree.value.TestFnFromParent;
-import org.foray.fotree.value.TestFnFromTableColumn;
-import org.foray.fotree.value.TestFnInheritedProp;
-import org.foray.fotree.value.TestFnLabelEnd;
-import org.foray.fotree.value.TestFnMax;
-import org.foray.fotree.value.TestFnMergePropertyValues;
-import org.foray.fotree.value.TestFnMin;
-import org.foray.fotree.value.TestFnNearestSpecProp;
-import org.foray.fotree.value.TestFnProportionalColWidth;
-import org.foray.fotree.value.TestFnRgb;
-import org.foray.fotree.value.TestFnRgbIcc;
-import org.foray.fotree.value.TestFnRound;
-import org.foray.fotree.value.TestFnSystemColor;
-import org.foray.fotree.value.TestFnSystemFont;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Handles testing for the FOrayFOTree module.
- */
-public class TestFOrayFOTree extends TestCase {
-
- /**
- * Builds a test suite for all classes in this module.
- * @return The built test suite.
- */
- public static Test suite() {
- final TestSuite testSuite = new TestSuite("FOray Fo Tree");
-
- /* Add tests of property value classes. */
- testSuite.addTestSuite(TestDtLength.class);
- testSuite.addTestSuite(TestFnAbs.class);
- testSuite.addTestSuite(TestFnBodyStart.class);
- testSuite.addTestSuite(TestFnCeiling.class);
- testSuite.addTestSuite(TestFnFloor.class);
- testSuite.addTestSuite(TestFnFromPageMasterRegion.class);
- testSuite.addTestSuite(TestFnFromParent.class);
- testSuite.addTestSuite(TestFnFromTableColumn.class);
- testSuite.addTestSuite(TestFnInheritedProp.class);
- testSuite.addTestSuite(TestFnLabelEnd.class);
- testSuite.addTestSuite(TestFnMax.class);
- testSuite.addTestSuite(TestFnMergePropertyValues.class);
- testSuite.addTestSuite(TestFnMin.class);
- testSuite.addTestSuite(TestFnNearestSpecProp.class);
- testSuite.addTestSuite(TestFnProportionalColWidth.class);
- testSuite.addTestSuite(TestFnRgb.class);
- testSuite.addTestSuite(TestFnRgbIcc.class);
- testSuite.addTestSuite(TestFnRound.class);
- testSuite.addTestSuite(TestFnSystemColor.class);
- testSuite.addTestSuite(TestFnSystemFont.class);
-
- /* Add tests of FO properties. */
- testSuite.addTestSuite(TestAbsolutePosition.class);
- testSuite.addTestSuite(TestActiveState.class);
- testSuite.addTestSuite(TestAlignmentAdjust.class);
- testSuite.addTestSuite(TestAlignmentBaseline.class);
- testSuite.addTestSuite(TestAllowedHeightScale.class);
- testSuite.addTestSuite(TestAllowedWidthScale.class);
- testSuite.addTestSuite(TestAutoRestore.class);
- testSuite.addTestSuite(TestAzimuth.class);
- testSuite.addTestSuite(TestBackground.class);
- testSuite.addTestSuite(TestBackgroundAttachment.class);
- testSuite.addTestSuite(TestBackgroundColor.class);
- testSuite.addTestSuite(TestBackgroundImage.class);
- testSuite.addTestSuite(TestBackgroundPosition.class);
- testSuite.addTestSuite(TestBackgroundPositionHorizontal.class);
- testSuite.addTestSuite(TestBackgroundPositionVertical.class);
- testSuite.addTestSuite(TestBackgroundRepeat.class);
- testSuite.addTestSuite(TestBaselineShift.class);
- testSuite.addTestSuite(TestBlankOrNotBlank.class);
- testSuite.addTestSuite(TestBlockProgressionDimension.class);
- testSuite.addTestSuite(TestBorder.class);
- testSuite.addTestSuite(TestBorderAfterColor.class);
- testSuite.addTestSuite(TestBorderAfterPrecedence.class);
- testSuite.addTestSuite(TestBorderAfterStyle.class);
- testSuite.addTestSuite(TestBorderAfterWidth.class);
- testSuite.addTestSuite(TestBorderBeforeColor.class);
- testSuite.addTestSuite(TestBorderBeforePrecedence.class);
- testSuite.addTestSuite(TestBorderBeforeStyle.class);
- testSuite.addTestSuite(TestBorderBeforeWidth.class);
- testSuite.addTestSuite(TestBorderBottom.class);
- testSuite.addTestSuite(TestBorderBottomColor.class);
- testSuite.addTestSuite(TestBorderBottomStyle.class);
- testSuite.addTestSuite(TestBorderBottomWidth.class);
- testSuite.addTestSuite(TestBorderCollapse.class);
- testSuite.addTestSuite(TestBorderColor.class);
- testSuite.addTestSuite(TestBorderEndColor.class);
- testSuite.addTestSuite(TestBorderEndPrecedence.class);
- testSuite.addTestSuite(TestBorderEndStyle.class);
- testSuite.addTestSuite(TestBorderEndWidth.class);
- testSuite.addTestSuite(TestBorderLeft.class);
- testSuite.addTestSuite(TestBorderLeftColor.class);
- testSuite.addTestSuite(TestBorderLeftStyle.class);
- testSuite.addTestSuite(TestBorderLeftWidth.class);
- testSuite.addTestSuite(TestBorderRight.class);
- testSuite.addTestSuite(TestBorderRightColor.class);
- testSuite.addTestSuite(TestBorderRightStyle.class);
- testSuite.add...
[truncated message content] |
|
From: <vic...@us...> - 2010-08-16 04:30:22
|
Revision: 11032
http://foray.svn.sourceforge.net/foray/?rev=11032&view=rev
Author: victormote
Date: 2010-08-16 04:30:15 +0000 (Mon, 16 Aug 2010)
Log Message:
-----------
1. Rename method for clarity.
2. Add test for the failure case.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java 2010-08-16 04:00:23 UTC (rev 11031)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java 2010-08-16 04:30:15 UTC (rev 11032)
@@ -31,11 +31,9 @@
import org.apache.xerces.util.XMLCatalogResolver;
import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.bootstrap.DOMImplementationRegistry;
import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSException;
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSParser;
import org.w3c.dom.ls.LSResourceResolver;
@@ -181,7 +179,7 @@
* @return The DOM document.
* @throws IOException For errors parsing the document.
*/
- public static Document urlToDom(final InputStream inputStream, final LSResourceResolver resourceResolver)
+ public static Document streamToDom(final InputStream inputStream, final LSResourceResolver resourceResolver)
throws IOException {
final DOMImplementationLS impl = XMLUtil.getDOMImplementation();
final LSParser builder = impl.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
@@ -194,14 +192,7 @@
final LSInput lsInput = impl.createLSInput();
lsInput.setByteStream(inputStream);
- Document document = null;
- try {
- document = builder.parse(lsInput);
- } catch (final DOMException e) {
- throw new IOException(e.getMessage());
- } catch (final LSException e) {
- throw new IOException(e.getMessage());
- }
+ final Document document = builder.parse(lsInput);
return document;
}
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java 2010-08-16 04:00:23 UTC (rev 11031)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java 2010-08-16 04:30:15 UTC (rev 11032)
@@ -28,9 +28,15 @@
package org.foray.common;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.ls.LSException;
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSResourceResolver;
@@ -38,12 +44,10 @@
import java.io.IOException;
import java.io.InputStream;
-import junit.framework.TestCase;
-
/**
* JUnit test class for the class {@link XMLUtil}.
*/
-public class TestXMLUtil extends TestCase {
+public class TestXMLUtil {
/* Example document and DTD liberated from O'Reilly's "XML in a Nutshell", 3rd Edition, p. 30. */
@@ -79,10 +83,27 @@
" <!ELEMENT profession (#PCDATA)>";
/**
- * Test the method {@link XMLUtil#urlToDom(java.io.InputStream, org.w3c.dom.ls.LSResourceResolver)} by parsing
+ * Test the method {@link XMLUtil#streamToDom(java.io.InputStream, org.w3c.dom.ls.LSResourceResolver)} by parsing
* a file and testing the results.
+ * @throws IOException For errors obtaining an instance of the DOM Implementation registry.
+ */
+ @Test
+ public void parseWithoutDtdShouldFail() throws IOException {
+ final InputStream xmlDocumentInputStream = new ByteArrayInputStream(TestXMLUtil.XML_DOCUMENT.getBytes());
+ try {
+ XMLUtil.streamToDom(xmlDocumentInputStream, null);
+ fail("Should have failed");
+ } catch (final LSException e) {
+ /* Do nothing. This is the expected case. */
+ }
+ }
+
+ /**
+ * Test the method {@link XMLUtil#streamToDom(java.io.InputStream, org.w3c.dom.ls.LSResourceResolver)} by parsing
+ * a file and testing the results.
* @throws IOException For errors getting the local sandbox.
*/
+ @Test
public void testUrlToDom() throws IOException {
final InputStream xmlDocumentInputStream = new ByteArrayInputStream(TestXMLUtil.XML_DOCUMENT.getBytes());
final InputStream dtdDocumentInputStream = new ByteArrayInputStream(TestXMLUtil.DTD_DOCUMENT.getBytes());
@@ -96,7 +117,7 @@
return null;
}
};
- final Document document = XMLUtil.urlToDom(xmlDocumentInputStream, resourceResolver);
+ final Document document = XMLUtil.streamToDom(xmlDocumentInputStream, resourceResolver);
assertNotNull(document);
/* The document itself has two children, the document type, and the
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java 2010-08-16 04:00:23 UTC (rev 11031)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java 2010-08-16 04:30:15 UTC (rev 11032)
@@ -78,7 +78,7 @@
/* Convert the URL to a generic DOM document instance. */
final LSResourceResolver resourceResolver = MathMLUtil.getMathMLDtdResourceResolver();
- final Document dom = XMLUtil.urlToDom(url.openStream(), resourceResolver);
+ final Document dom = XMLUtil.streamToDom(url.openStream(), resourceResolver);
/* Convert the generic DOM to an SVGDocument (DOM/SVG Document), using
* JEuclid. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-08-21 17:54:07
|
Revision: 11039
http://foray.svn.sourceforge.net/foray/?rev=11039&view=rev
Author: victormote
Date: 2010-08-21 17:54:01 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
1. Remove some unnecessary transitive dependencies by upgrading to commons-logging 1.1.1.
2. Add back the now explicit dependency on the servlet-api to foray-app.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-app/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-08-21 04:06:11 UTC (rev 11038)
+++ trunk/foray/foray-all/pom.xml 2010-08-21 17:54:01 UTC (rev 11039)
@@ -34,11 +34,20 @@
<scope>test</scope>
</dependency>
+ <!-- J2EE stuff -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
<!-- Apache Commons. -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2010-08-21 04:06:11 UTC (rev 11038)
+++ trunk/foray/foray-app/pom.xml 2010-08-21 17:54:01 UTC (rev 11039)
@@ -26,6 +26,13 @@
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<type>jar</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-08-21 18:35:08
|
Revision: 11040
http://foray.svn.sourceforge.net/foray/?rev=11040&view=rev
Author: victormote
Date: 2010-08-21 18:35:01 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
Move some MathML-specific code to the graphic module.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/MathMLUtil.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/MathMLUtil.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/MathMLUtil.java 2010-08-21 17:54:01 UTC (rev 11039)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/MathMLUtil.java 2010-08-21 18:35:01 UTC (rev 11040)
@@ -28,13 +28,6 @@
package org.foray.common;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSResourceResolver;
-
-import java.io.IOException;
-import java.io.InputStream;
-
/**
* Utilities related to the Math Markup Language (MathML).
*/
@@ -60,54 +53,4 @@
*/
private MathMLUtil() { }
- /**
- * Returns a MathML DTD component as an InputStream.
- * @param fileName The name of the file to be retrieved.
- * @return A MathML DTD component as an InputStream.
- */
- public static InputStream getMathMLDtdAsInputStream(final String fileName) {
- final InputStream theStream = MathMLUtil.class.getResourceAsStream("/mathml2/" + fileName);
- return theStream;
- }
-
- /**
- * Returns the MathML DTD as an LSInput instance.
- * @param fileName The name of the file to be retrieved.
- * @return The MathML DTD as an LSInput instance.
- */
- public static LSInput getMathMLDtdAsLsInputStream(final String fileName) {
- final InputStream theStream = MathMLUtil.getMathMLDtdAsInputStream(fileName);
- DOMImplementationLS implementation;
- try {
- implementation = XMLUtil.getDOMImplementation();
- } catch (final IOException e) {
- return null;
- }
- final LSInput input = implementation.createLSInput();
- input.setByteStream(theStream);
- input.setPublicId(MathMLUtil.MATHML_PUBLIC_ID);
- input.setSystemId(MathMLUtil.MATHML_SYSTEM_ID);
- return input;
- }
-
- /**
- * Returns an LSResourceResolver that knows how to find the local copy of the MathML DTD.
- * @return An LSResourceResolver that knows how to find the local copy of the MathML DTD.
- */
- public static LSResourceResolver getMathMLDtdResourceResolver() {
- final LSResourceResolver resolver = new LSResourceResolver() {
- public LSInput resolveResource(final String type, final String namespaceURI, final String publicId,
- final String systemId, final String baseURI) {
- if (MathMLUtil.MATHML_PUBLIC_ID.equals(publicId)) {
- return MathMLUtil.getMathMLDtdAsLsInputStream("mathml2.dtd");
- }
- if (MathMLUtil.MATHML_SYSTEM_ID.equals(baseURI)) {
- return MathMLUtil.getMathMLDtdAsLsInputStream(systemId);
- }
- return null;
- }
- };
- return resolver;
- }
-
}
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java 2010-08-21 17:54:01 UTC (rev 11039)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java 2010-08-21 18:35:01 UTC (rev 11040)
@@ -36,11 +36,14 @@
import org.axsl.graphic.GraphicException;
import org.w3c.dom.Document;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSResourceResolver;
import org.w3c.dom.svg.SVGDocument;
import java.io.BufferedInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
/**
@@ -77,7 +80,7 @@
}
/* Convert the URL to a generic DOM document instance. */
- final LSResourceResolver resourceResolver = MathMLUtil.getMathMLDtdResourceResolver();
+ final LSResourceResolver resourceResolver = MathFactory.getMathMLDtdResourceResolver();
final Document dom = XMLUtil.streamToDom(url.openStream(), resourceResolver);
/* Convert the generic DOM to an SVGDocument (DOM/SVG Document), using
@@ -93,4 +96,54 @@
return new SVGGraphic(this.getServer(), svgDocument);
}
+ /**
+ * Returns a MathML DTD component as an InputStream.
+ * @param fileName The name of the file to be retrieved.
+ * @return A MathML DTD component as an InputStream.
+ */
+ public static InputStream getMathMLDtdAsInputStream(final String fileName) {
+ final InputStream theStream = MathMLUtil.class.getResourceAsStream("/mathml2/" + fileName);
+ return theStream;
+ }
+
+ /**
+ * Returns the MathML DTD as an LSInput instance.
+ * @param fileName The name of the file to be retrieved.
+ * @return The MathML DTD as an LSInput instance.
+ */
+ public static LSInput getMathMLDtdAsLsInputStream(final String fileName) {
+ final InputStream theStream = MathFactory.getMathMLDtdAsInputStream(fileName);
+ DOMImplementationLS implementation;
+ try {
+ implementation = XMLUtil.getDOMImplementation();
+ } catch (final IOException e) {
+ return null;
+ }
+ final LSInput input = implementation.createLSInput();
+ input.setByteStream(theStream);
+ input.setPublicId(MathMLUtil.MATHML_PUBLIC_ID);
+ input.setSystemId(MathMLUtil.MATHML_SYSTEM_ID);
+ return input;
+ }
+
+ /**
+ * Returns an LSResourceResolver that knows how to find the local copy of the MathML DTD.
+ * @return An LSResourceResolver that knows how to find the local copy of the MathML DTD.
+ */
+ public static LSResourceResolver getMathMLDtdResourceResolver() {
+ final LSResourceResolver resolver = new LSResourceResolver() {
+ public LSInput resolveResource(final String type, final String namespaceURI, final String publicId,
+ final String systemId, final String baseURI) {
+ if (MathMLUtil.MATHML_PUBLIC_ID.equals(publicId)) {
+ return MathFactory.getMathMLDtdAsLsInputStream("mathml2.dtd");
+ }
+ if (MathMLUtil.MATHML_SYSTEM_ID.equals(baseURI)) {
+ return MathFactory.getMathMLDtdAsLsInputStream(systemId);
+ }
+ return null;
+ }
+ };
+ return resolver;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-08-21 18:53:48
|
Revision: 11041
http://foray.svn.sourceforge.net/foray/?rev=11041&view=rev
Author: victormote
Date: 2010-08-21 18:53:41 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
Move some DOM-specific code from foray-common to foray-xml.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java
trunk/foray/foray-graphic/pom.xml
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java
trunk/foray/foray-xml/pom.xml
Added Paths:
-----------
trunk/foray/foray-xml/src/main/java/org/foray/xml/DomUtil.java
trunk/foray/foray-xml/src/test/
trunk/foray/foray-xml/src/test/java/
trunk/foray/foray-xml/src/test/java/org/
trunk/foray/foray-xml/src/test/java/org/foray/
trunk/foray/foray-xml/src/test/java/org/foray/xml/
trunk/foray/foray-xml/src/test/java/org/foray/xml/TestXMLUtil.java
Removed Paths:
-------------
trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java 2010-08-21 18:35:01 UTC (rev 11040)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/XMLUtil.java 2010-08-21 18:53:41 UTC (rev 11041)
@@ -31,18 +31,8 @@
import org.apache.xml.resolver.CatalogManager;
import org.apache.xml.resolver.tools.CatalogResolver;
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.Document;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSParser;
-import org.w3c.dom.ls.LSResourceResolver;
import org.xml.sax.InputSource;
-import java.io.IOException;
-import java.io.InputStream;
-
import javax.xml.stream.XMLResolver;
import javax.xml.stream.XMLStreamException;
@@ -58,9 +48,6 @@
*/
public static final String XMLNS_NAMESPACE_URI = "http://www.w3.org/2000/xmlns/";
- /** The registry of DOM Implementations available. */
- private static DOMImplementationRegistry domImplementationRegistry;
-
/**
* This class should never be instantiated.
*/
@@ -137,86 +124,6 @@
}
/**
- * Returns the DOM Implementation registry.
- * @return The DOM Implementation registry.
- * @throws IOException For errors obtaining an instance of the registry.
- */
- public static DOMImplementationRegistry getDOMRegistry() throws IOException {
- if (XMLUtil.domImplementationRegistry == null) {
- try {
- XMLUtil.domImplementationRegistry = DOMImplementationRegistry.newInstance();
- } catch (final ClassCastException e) {
- throw new IOException(e.getMessage());
- } catch (final ClassNotFoundException e) {
- throw new IOException(e.getMessage());
- } catch (final InstantiationException e) {
- throw new IOException(e.getMessage());
- } catch (final IllegalAccessException e) {
- throw new IOException(e.getMessage());
- }
- }
- return XMLUtil.domImplementationRegistry;
- }
-
- /**
- * Returns the DOM Implementation.
- * @return The DOM Implementation.
- * @throws IOException For errors obtaining an instance of the DOM Implementation registry.
- */
- public static DOMImplementationLS getDOMImplementation() throws IOException {
- final DOMImplementationRegistry registry = XMLUtil.getDOMRegistry();
-
- final DOMImplementationLS impl = (DOMImplementationLS) registry.getDOMImplementation("LS");
- return impl;
- }
-
- /**
- * Converts an input stream to a generic DOM Document.
- * @param inputStream The stream to be parsed to a DOM document.
- * @param resourceResolver The resource resolver to use, which can be null.
- * This is useful for cases where we want (for example) to find a DTD locally instead of on the internet.
- * @return The DOM document.
- * @throws IOException For errors parsing the document.
- */
- public static Document streamToDom(final InputStream inputStream, final LSResourceResolver resourceResolver)
- throws IOException {
- final DOMImplementationLS impl = XMLUtil.getDOMImplementation();
- final LSParser builder = impl.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
- final DOMConfiguration domConfiguration = builder.getDomConfig();
- if (resourceResolver != null
- && domConfiguration.canSetParameter("resource-resolver", resourceResolver)) {
- domConfiguration.setParameter("resource-resolver", resourceResolver);
- }
-
- final LSInput lsInput = impl.createLSInput();
- lsInput.setByteStream(inputStream);
-
- final Document document = builder.parse(lsInput);
- return document;
- }
-
- /**
- * Converts an input stream into an LSInput.
- * @param publicId The public ID to attache to the input.
- * @param systemId The system ID to attach to the input.
- * @param inputStream The input stream to attach to the input.
- * @return The new input.
- */
- public static LSInput createLSInput(final InputStream inputStream, final String publicId, final String systemId) {
- DOMImplementationLS implementation;
- try {
- implementation = XMLUtil.getDOMImplementation();
- } catch (final IOException e) {
- return null;
- }
- final LSInput input = implementation.createLSInput();
- input.setByteStream(inputStream);
- input.setPublicId(publicId);
- input.setSystemId(systemId);
- return input;
- }
-
- /**
* Creates an EntityResolver for one or more XML catalogs.
* @param catalogs The array of URIs indicating where the XML catalogs are located.
* @return The created EntityResolver.
Deleted: trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java 2010-08-21 18:35:01 UTC (rev 11040)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java 2010-08-21 18:53:41 UTC (rev 11041)
@@ -1,151 +0,0 @@
-/*
- * Copyright 2008 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ls.LSException;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSResourceResolver;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * JUnit test class for the class {@link XMLUtil}.
- */
-public class TestXMLUtil {
-
- /* Example document and DTD liberated from O'Reilly's "XML in a Nutshell", 3rd Edition, p. 30. */
-
- /** The DTD public ID. */
- private static final String STATED_PUBLIC_ID = "Totally Bogus DTD";
-
- /** The DTD system ID. */
- private static final String STATED_SYSTEM_ID = "file:/u/xyz/abc/totally-bogus.dtd";
-
- /** The test document. */
- private static final String XML_DOCUMENT =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<!DOCTYPE Book\n" +
- " PUBLIC \"" + TestXMLUtil.STATED_PUBLIC_ID + "\"\n" +
- " \"" + TestXMLUtil.STATED_SYSTEM_ID + "\"\n" +
- ">\n" +
- "<person>\n" +
- " <name>\n" +
- " <first_name>Alan</first_name>\n" +
- " <last_name>Turing</last_name>\n" +
- " </name>\n" +
- " <profession>computer scientist</profession>\n" +
- " <profession>mathematician</profession>\n" +
- " <profession>cryptographer</profession>\n" +
- "</person>\n";
-
- /** The test DTD. */
- private static final String DTD_DOCUMENT =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- " <!ELEMENT person (name, profession*)>\n" +
- " <!ELEMENT name (first_name, last_name)>\n" +
- " <!ELEMENT first_name (#PCDATA)>\n" +
- " <!ELEMENT last_name (#PCDATA)>\n" +
- " <!ELEMENT profession (#PCDATA)>\n";
-
- /**
- * Test the method {@link XMLUtil#streamToDom(java.io.InputStream, org.w3c.dom.ls.LSResourceResolver)} by parsing
- * a file and testing the results.
- * @throws IOException For errors obtaining an instance of the DOM Implementation registry.
- */
- @Test
- public void parseWithoutDtdShouldFail() throws IOException {
- final InputStream xmlDocumentInputStream = new ByteArrayInputStream(TestXMLUtil.XML_DOCUMENT.getBytes());
- try {
- XMLUtil.streamToDom(xmlDocumentInputStream, null);
- fail("Should have failed");
- } catch (final LSException e) {
- /* Do nothing. This is the expected case. */
- }
- }
-
- /**
- * Test the method {@link XMLUtil#streamToDom(java.io.InputStream, org.w3c.dom.ls.LSResourceResolver)} by parsing
- * a file and testing the results.
- * @throws IOException For errors getting the local sandbox.
- */
- @Test
- public void parseWithDtdShouldWork() throws IOException {
- final InputStream xmlDocumentInputStream = new ByteArrayInputStream(TestXMLUtil.XML_DOCUMENT.getBytes());
- final InputStream dtdDocumentInputStream = new ByteArrayInputStream(TestXMLUtil.DTD_DOCUMENT.getBytes());
- final LSResourceResolver resourceResolver = new LSResourceResolver() {
- public LSInput resolveResource(final String type, final String namespaceURI, final String publicId,
- final String systemId, final String baseURI) {
- if (TestXMLUtil.STATED_PUBLIC_ID.equals(publicId)) {
- return XMLUtil.createLSInput(dtdDocumentInputStream, TestXMLUtil.STATED_PUBLIC_ID,
- TestXMLUtil.STATED_SYSTEM_ID);
- }
- return null;
- }
- };
- final Document document = XMLUtil.streamToDom(xmlDocumentInputStream, resourceResolver);
- assertNotNull(document);
-
- /* The document itself has two children, the document type, and the
- * root element. */
- NodeList nodeList = document.getChildNodes();
- assertEquals(2, nodeList.getLength());
- /* The first node is the document type node. */
- assertEquals(Node.DOCUMENT_TYPE_NODE, nodeList.item(0).getNodeType());
-
- /* The second node is the root element. */
- Node node = nodeList.item(1);
- assertEquals(Node.ELEMENT_NODE, node.getNodeType());
- assertEquals("person", node.getLocalName());
-
- nodeList = node.getChildNodes();
- assertEquals(9, nodeList.getLength());
- /* The first child is ignorable whitespace. */
- assertEquals(Node.TEXT_NODE, nodeList.item(0).getNodeType());
- /* The second child is the name element. */
- assertEquals(Node.ELEMENT_NODE, nodeList.item(1).getNodeType());
- assertEquals("name", nodeList.item(1).getLocalName());
- /* The third child is ignorable whitespace. */
- assertEquals(Node.TEXT_NODE, nodeList.item(2).getNodeType());
- node = nodeList.item(1);
-
- /* It is certainly possible to test this DOM document more extensively, but this is enough to show that it was
- * parsed. */
- }
-
-}
Modified: trunk/foray/foray-graphic/pom.xml
===================================================================
--- trunk/foray/foray-graphic/pom.xml 2010-08-21 18:35:01 UTC (rev 11040)
+++ trunk/foray/foray-graphic/pom.xml 2010-08-21 18:53:41 UTC (rev 11041)
@@ -149,10 +149,15 @@
<dependency>
<groupId>org.foray</groupId>
<artifactId>foray-common</artifactId>
- <version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.foray</groupId>
+ <artifactId>foray-xml</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java 2010-08-21 18:35:01 UTC (rev 11040)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/factory/MathFactory.java 2010-08-21 18:53:41 UTC (rev 11041)
@@ -29,9 +29,9 @@
package org.foray.graphic.factory;
import org.foray.common.MathMLUtil;
-import org.foray.common.XMLUtil;
import org.foray.graphic.GraphicServer4a;
import org.foray.graphic.SVGGraphic;
+import org.foray.xml.DomUtil;
import org.axsl.graphic.GraphicException;
@@ -81,7 +81,7 @@
/* Convert the URL to a generic DOM document instance. */
final LSResourceResolver resourceResolver = MathFactory.getMathMLDtdResourceResolver();
- final Document dom = XMLUtil.streamToDom(url.openStream(), resourceResolver);
+ final Document dom = DomUtil.streamToDom(url.openStream(), resourceResolver);
/* Convert the generic DOM to an SVGDocument (DOM/SVG Document), using
* JEuclid. */
@@ -115,7 +115,7 @@
final InputStream theStream = MathFactory.getMathMLDtdAsInputStream(fileName);
DOMImplementationLS implementation;
try {
- implementation = XMLUtil.getDOMImplementation();
+ implementation = DomUtil.getDOMImplementation();
} catch (final IOException e) {
return null;
}
Modified: trunk/foray/foray-xml/pom.xml
===================================================================
--- trunk/foray/foray-xml/pom.xml 2010-08-21 18:35:01 UTC (rev 11040)
+++ trunk/foray/foray-xml/pom.xml 2010-08-21 18:53:41 UTC (rev 11041)
@@ -19,6 +19,13 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<type>jar</type>
Added: trunk/foray/foray-xml/src/main/java/org/foray/xml/DomUtil.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/DomUtil.java (rev 0)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/DomUtil.java 2010-08-21 18:53:41 UTC (rev 11041)
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2004 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision: 11037 $
+ * $LastChangedDate: 2010-08-20 21:17:15 -0600 (Fri, 20 Aug 2010) $
+ * $LastChangedBy$
+ */
+
+package org.foray.xml;
+
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.Document;
+import org.w3c.dom.bootstrap.DOMImplementationRegistry;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSResourceResolver;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Utility class containing methods useful in parsing or building XML.
+ */
+public final class DomUtil {
+
+ /**
+ * The namespace declaration to be assigned to the namespace definition
+ * in XML documents.
+ * @see "http://www.w3.org/2000/xmlns/"
+ */
+ public static final String XMLNS_NAMESPACE_URI = "http://www.w3.org/2000/xmlns/";
+
+ /** The registry of DOM Implementations available. */
+ private static DOMImplementationRegistry domImplementationRegistry;
+
+ /**
+ * This class should never be instantiated.
+ */
+ private DomUtil() { }
+
+ /**
+ * Returns the DOM Implementation registry.
+ * @return The DOM Implementation registry.
+ * @throws IOException For errors obtaining an instance of the registry.
+ */
+ public static DOMImplementationRegistry getDOMRegistry() throws IOException {
+ if (DomUtil.domImplementationRegistry == null) {
+ try {
+ DomUtil.domImplementationRegistry = DOMImplementationRegistry.newInstance();
+ } catch (final ClassCastException e) {
+ throw new IOException(e.getMessage());
+ } catch (final ClassNotFoundException e) {
+ throw new IOException(e.getMessage());
+ } catch (final InstantiationException e) {
+ throw new IOException(e.getMessage());
+ } catch (final IllegalAccessException e) {
+ throw new IOException(e.getMessage());
+ }
+ }
+ return DomUtil.domImplementationRegistry;
+ }
+
+ /**
+ * Returns the DOM Implementation.
+ * @return The DOM Implementation.
+ * @throws IOException For errors obtaining an instance of the DOM Implementation registry.
+ */
+ public static DOMImplementationLS getDOMImplementation() throws IOException {
+ final DOMImplementationRegistry registry = DomUtil.getDOMRegistry();
+
+ final DOMImplementationLS impl = (DOMImplementationLS) registry.getDOMImplementation("LS");
+ return impl;
+ }
+
+ /**
+ * Converts an input stream to a generic DOM Document.
+ * @param inputStream The stream to be parsed to a DOM document.
+ * @param resourceResolver The resource resolver to use, which can be null.
+ * This is useful for cases where we want (for example) to find a DTD locally instead of on the internet.
+ * @return The DOM document.
+ * @throws IOException For errors parsing the document.
+ */
+ public static Document streamToDom(final InputStream inputStream, final LSResourceResolver resourceResolver)
+ throws IOException {
+ final DOMImplementationLS impl = DomUtil.getDOMImplementation();
+ final LSParser builder = impl.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
+ final DOMConfiguration domConfiguration = builder.getDomConfig();
+ if (resourceResolver != null
+ && domConfiguration.canSetParameter("resource-resolver", resourceResolver)) {
+ domConfiguration.setParameter("resource-resolver", resourceResolver);
+ }
+
+ final LSInput lsInput = impl.createLSInput();
+ lsInput.setByteStream(inputStream);
+
+ final Document document = builder.parse(lsInput);
+ return document;
+ }
+
+ /**
+ * Converts an input stream into an LSInput.
+ * @param publicId The public ID to attache to the input.
+ * @param systemId The system ID to attach to the input.
+ * @param inputStream The input stream to attach to the input.
+ * @return The new input.
+ */
+ public static LSInput createLSInput(final InputStream inputStream, final String publicId, final String systemId) {
+ DOMImplementationLS implementation;
+ try {
+ implementation = DomUtil.getDOMImplementation();
+ } catch (final IOException e) {
+ return null;
+ }
+ final LSInput input = implementation.createLSInput();
+ input.setByteStream(inputStream);
+ input.setPublicId(publicId);
+ input.setSystemId(systemId);
+ return input;
+ }
+
+}
Copied: trunk/foray/foray-xml/src/test/java/org/foray/xml/TestXMLUtil.java (from rev 11037, trunk/foray/foray-common/src/test/java/org/foray/common/TestXMLUtil.java)
===================================================================
--- trunk/foray/foray-xml/src/test/java/org/foray/xml/TestXMLUtil.java (rev 0)
+++ trunk/foray/foray-xml/src/test/java/org/foray/xml/TestXMLUtil.java 2010-08-21 18:53:41 UTC (rev 11041)
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2008 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.xml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import org.foray.common.XMLUtil;
+
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.ls.LSException;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSResourceResolver;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * JUnit test class for the class {@link XMLUtil}.
+ */
+public class TestXMLUtil {
+
+ /* Example document and DTD liberated from O'Reilly's "XML in a Nutshell", 3rd Edition, p. 30. */
+
+ /** The DTD public ID. */
+ private static final String STATED_PUBLIC_ID = "Totally Bogus DTD";
+
+ /** The DTD system ID. */
+ private static final String STATED_SYSTEM_ID = "file:/u/xyz/abc/totally-bogus.dtd";
+
+ /** The test document. */
+ private static final String XML_DOCUMENT =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<!DOCTYPE Book\n" +
+ " PUBLIC \"" + TestXMLUtil.STATED_PUBLIC_ID + "\"\n" +
+ " \"" + TestXMLUtil.STATED_SYSTEM_ID + "\"\n" +
+ ">\n" +
+ "<person>\n" +
+ " <name>\n" +
+ " <first_name>Alan</first_name>\n" +
+ " <last_name>Turing</last_name>\n" +
+ " </name>\n" +
+ " <profession>computer scientist</profession>\n" +
+ " <profession>mathematician</profession>\n" +
+ " <profession>cryptographer</profession>\n" +
+ "</person>\n";
+
+ /** The test DTD. */
+ private static final String DTD_DOCUMENT =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ " <!ELEMENT person (name, profession*)>\n" +
+ " <!ELEMENT name (first_name, last_name)>\n" +
+ " <!ELEMENT first_name (#PCDATA)>\n" +
+ " <!ELEMENT last_name (#PCDATA)>\n" +
+ " <!ELEMENT profession (#PCDATA)>\n";
+
+ /**
+ * Test the method {@link DomUtil#streamToDom(java.io.InputStream, org.w3c.dom.ls.LSResourceResolver)} by parsing
+ * a file and testing the results.
+ * @throws IOException For errors obtaining an instance of the DOM Implementation registry.
+ */
+ @Test
+ public void parseWithoutDtdShouldFail() throws IOException {
+ final InputStream xmlDocumentInputStream = new ByteArrayInputStream(TestXMLUtil.XML_DOCUMENT.getBytes());
+ try {
+ DomUtil.streamToDom(xmlDocumentInputStream, null);
+ fail("Should have failed");
+ } catch (final LSException e) {
+ /* Do nothing. This is the expected case. */
+ }
+ }
+
+ /**
+ * Test the method {@link DomUtil#streamToDom(java.io.InputStream, org.w3c.dom.ls.LSResourceResolver)} by parsing
+ * a file and testing the results.
+ * @throws IOException For errors getting the local sandbox.
+ */
+ @Test
+ public void parseWithDtdShouldWork() throws IOException {
+ final InputStream xmlDocumentInputStream = new ByteArrayInputStream(TestXMLUtil.XML_DOCUMENT.getBytes());
+ final InputStream dtdDocumentInputStream = new ByteArrayInputStream(TestXMLUtil.DTD_DOCUMENT.getBytes());
+ final LSResourceResolver resourceResolver = new LSResourceResolver() {
+ public LSInput resolveResource(final String type, final String namespaceURI, final String publicId,
+ final String systemId, final String baseURI) {
+ if (TestXMLUtil.STATED_PUBLIC_ID.equals(publicId)) {
+ return DomUtil.createLSInput(dtdDocumentInputStream, TestXMLUtil.STATED_PUBLIC_ID,
+ TestXMLUtil.STATED_SYSTEM_ID);
+ }
+ return null;
+ }
+ };
+ final Document document = DomUtil.streamToDom(xmlDocumentInputStream, resourceResolver);
+ assertNotNull(document);
+
+ /* The document itself has two children, the document type, and the
+ * root element. */
+ NodeList nodeList = document.getChildNodes();
+ assertEquals(2, nodeList.getLength());
+ /* The first node is the document type node. */
+ assertEquals(Node.DOCUMENT_TYPE_NODE, nodeList.item(0).getNodeType());
+
+ /* The second node is the root element. */
+ Node node = nodeList.item(1);
+ assertEquals(Node.ELEMENT_NODE, node.getNodeType());
+ assertEquals("person", node.getLocalName());
+
+ nodeList = node.getChildNodes();
+ assertEquals(9, nodeList.getLength());
+ /* The first child is ignorable whitespace. */
+ assertEquals(Node.TEXT_NODE, nodeList.item(0).getNodeType());
+ /* The second child is the name element. */
+ assertEquals(Node.ELEMENT_NODE, nodeList.item(1).getNodeType());
+ assertEquals("name", nodeList.item(1).getLocalName());
+ /* The third child is ignorable whitespace. */
+ assertEquals(Node.TEXT_NODE, nodeList.item(2).getNodeType());
+ node = nodeList.item(1);
+
+ /* It is certainly possible to test this DOM document more extensively, but this is enough to show that it was
+ * parsed. */
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-08-21 23:51:45
|
Revision: 11044
http://foray.svn.sourceforge.net/foray/?rev=11044&view=rev
Author: victormote
Date: 2010-08-21 23:51:35 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
Convert some test classes to the Junit 4 style annotations.
Modified Paths:
--------------
trunk/foray/foray-app/src/test/java/org/foray/app/TestFOray.java
trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java
trunk/foray/foray-app/src/test/java/org/foray/app/area/TestBlock.java
trunk/foray/foray-app/src/test/java/org/foray/app/area/TestBorder.java
trunk/foray/foray-app/src/test/java/org/foray/app/area/TestGraphicArea.java
trunk/foray/foray-app/src/test/java/org/foray/app/area/TestInline.java
trunk/foray/foray-app/src/test/java/org/foray/app/area/TestMetadata.java
trunk/foray/foray-app/src/test/java/org/foray/app/area/TestVertical.java
trunk/foray/foray-areatree/src/test/java/org/foray/area/TestPageCollection.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestBit.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestByteVectorPacked.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestCharVector.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestStringUtil.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestTernaryTreeMap.java
trunk/foray/foray-common/src/test/java/org/foray/common/TestUnicodeChar.java
trunk/foray/foray-font/src/test/java/org/foray/font/TestFont4a.java
trunk/foray/foray-font/src/test/java/org/foray/font/TestFontServer4a.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/TestType1PfbFile.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTest.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestAbsoluteDimension.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestAbsoluteOffset.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestBackgroundPosition.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestBorderWidth.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestContentDimension.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestIndent.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestMargin.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestName.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestPadding.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestPageDimension.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestRelativeDimension.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestRelativeSpace.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbstractTestString.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CmpLengthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestAlignmentAdjust.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestBaselineShift.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestChangeBarOffset.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestChangeBarWidth.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestColumnGap.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestColumnWidth.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestDestinationPlacementOffset.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestExtent.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestFontFamily.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestFontSize.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestForcePageCount.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestLastLineEndIndent.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestLeaderLength.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestLeaderPatternWidth.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestLetterSpacing.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestLineHeight.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestProvisionalDistanceBetweenStarts.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestProvisionalLabelSeparation.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestRole.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestRuleThickness.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestSwitchTo.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestTextAlign.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestTextAltitude.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestTextDepth.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestTextIndent.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestVerticalAlign.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestVoiceFamily.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestWordSpacing.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestDtLength.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnAbs.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnBodyStart.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnCeiling.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnFloor.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnFromPageMasterRegion.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnFromParent.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnFromTableColumn.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnInheritedProp.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnLabelEnd.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnMax.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnMergePropertyValues.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnMin.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnNearestSpecProp.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnProportionalColWidth.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnRgb.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnRgbIcc.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnRound.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnSystemColor.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnSystemFont.java
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/TestFOray.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/TestFOray.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/TestFOray.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,15 +28,19 @@
package org.foray.app;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.ParseException;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* Tests of {@link FOray}.
*/
-public class TestFOray extends TestCase {
+public class TestFOray {
/**
* Splits the raw command-line into an array of Strings expected by "main" methods.
@@ -64,6 +68,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* @throws ParseException For errors on the input line.
*/
+ @Test
public void testParseCommandLine001() throws ParseException {
final CommandLine commandLine = parseCommandLine(FOray.COMMAND_LINE_EXAMPLE_001);
assertEquals("foo.fo", commandLine.getOptionValue("fo"));
@@ -74,6 +79,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* @throws ParseException For errors on the input line.
*/
+ @Test
public void testParseCommandLine002() throws ParseException {
final CommandLine commandLine = parseCommandLine(FOray.COMMAND_LINE_EXAMPLE_002);
assertEquals("foo.xml", commandLine.getOptionValue("xml"));
@@ -85,6 +91,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* @throws ParseException For errors on the input line.
*/
+ @Test
public void testParseCommandLine003() throws ParseException {
final CommandLine commandLine = parseCommandLine(FOray.COMMAND_LINE_EXAMPLE_003);
assertEquals("foo.fo", commandLine.getOptionValue("fo"));
@@ -95,6 +102,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* @throws ParseException For errors on the input line.
*/
+ @Test
public void testParseCommandLine004() throws ParseException {
final CommandLine commandLine = parseCommandLine(FOray.COMMAND_LINE_EXAMPLE_004);
assertEquals("foo.fo", commandLine.getOptionValue("fo"));
@@ -105,6 +113,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* Tests case where neither a -fo nor -xml option is provided.
*/
+ @Test
public void testParseCommandLineError001() {
try {
parseCommandLine("-xsl foo.xsl -pdf foo.pdf");
@@ -119,6 +128,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* Tests case where -fo switch is specified, but no value is.
*/
+ @Test
public void testParseCommandLineError002() {
try {
parseCommandLine("-fo -pdf foo.pdf");
@@ -133,6 +143,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* Tests case where -pdf switch is specified, but no value is.
*/
+ @Test
public void testParseCommandLineError003() {
try {
parseCommandLine("-fo foo.fo -pdf");
@@ -147,6 +158,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* Tests case where -xml switch is specified, but no value is.
*/
+ @Test
public void testParseCommandLineError004() {
try {
parseCommandLine("-xml -xsl foo.xsl -pdf foo.pdf");
@@ -161,6 +173,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* Tests case where -xsl switch is specified, but no value is.
*/
+ @Test
public void testParseCommandLineError005() {
try {
parseCommandLine("-xml foo.xml -xsl -pdf foo.pdf");
@@ -175,6 +188,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* Tests case where -xml switch is specified, but -xsl switch is not.
*/
+ @Test
public void testParseCommandLineError006() {
try {
parseCommandLine("-xml foo.xml -pdf foo.pdf");
@@ -189,6 +203,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* Tests case where -xsl switch is specified, but -xml switch is not.
*/
+ @Test
public void testParseCommandLineError007() {
try {
parseCommandLine("-fo foo.fo -xsl foo.xsl -pdf foo.pdf");
@@ -203,6 +218,7 @@
* Test of {@link FOray#parseCommandLine(org.apache.commons.cli.Options, String[])}.
* Tests case where no output option is specified.
*/
+ @Test
public void testParseCommandLineError008() {
try {
parseCommandLine("-fo foo.fo");
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,6 +28,9 @@
package org.foray.app.area;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.foray.area.AreaNode;
import org.foray.area.AreaTree;
import org.foray.area.MainRA;
@@ -46,12 +49,10 @@
import java.util.Iterator;
-import junit.framework.TestCase;
-
/**
* Abstract superclass for test classes testing Area Tree content.
*/
-public abstract class AbstractAreaTreeTest extends TestCase {
+public abstract class AbstractAreaTreeTest {
/**
* Get a font server suitable for testing.
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/TestBlock.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/TestBlock.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/TestBlock.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,6 +28,9 @@
package org.foray.app.area;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.foray.area.AreaNode;
import org.foray.area.AreaTree;
import org.foray.area.LineArea;
@@ -40,6 +43,8 @@
import org.axsl.font.FontException;
+import org.junit.Test;
+
/**
* Tests of various block-related concepts at the Area Tree level.
*/
@@ -49,6 +54,7 @@
* Test of fo/block-001.fo.
* @throws FOrayException For errors creating the FO Tree or Area Tree.
*/
+ @Test
public void testBlock001() throws FOrayException {
final AreaTreeCreator creator = AreaTreeCreator.getInstance();
final AreaTree areaTree = creator.buildAreaTree(
@@ -146,6 +152,7 @@
* Test of fo/block-002.fo.
* @throws FOrayException For errors creating the FO Tree or Area Tree.
*/
+ @Test
public void testBlock002() throws FOrayException {
final AreaTreeCreator creator = AreaTreeCreator.getInstance();
final AreaTree areaTree = creator.buildAreaTree(
@@ -225,6 +232,7 @@
* @throws FOrayException For errors creating the FO Tree or Area Tree.
* @throws FontException For errors in the font system.
*/
+ @Test
public void testBlock003() throws FOrayException, FontException {
final AreaTreeCreator creator = AreaTreeCreator.getInstance();
@@ -286,6 +294,7 @@
* @throws FOrayException For errors creating the FO Tree or Area Tree.
* @throws FontException For font system errors in obtaining the font.
*/
+ @Test
public void testBlock004() throws FOrayException, FontException {
final AreaTreeCreator creator = AreaTreeCreator.getInstance();
final AreaTree areaTree = creator.buildAreaTree(
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/TestBorder.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/TestBorder.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/TestBorder.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,12 +28,17 @@
package org.foray.app.area;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.foray.area.AreaNode;
import org.foray.area.AreaTree;
import org.foray.area.NormalBlockArea;
import org.foray.area.NormalFlowRA;
import org.foray.core.FOrayException;
+import org.junit.Test;
+
/**
* Tests of various border-related concepts at the Area Tree level.
*/
@@ -43,6 +48,7 @@
* Test of fo/border-style-001.fo.
* @throws FOrayException For errors creating the FO Tree or Area Tree.
*/
+ @Test
public void testBorderStyle001() throws FOrayException {
final AreaTreeCreator creator = AreaTreeCreator.getInstance();
final AreaTree areaTree = creator.buildAreaTree(
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/TestGraphicArea.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/TestGraphicArea.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/TestGraphicArea.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,6 +28,9 @@
package org.foray.app.area;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.foray.area.AreaNode;
import org.foray.area.AreaTree;
import org.foray.area.ExternalGraphicArea;
@@ -36,6 +39,8 @@
import org.foray.area.NormalFlowRA;
import org.foray.core.FOrayException;
+import org.junit.Test;
+
/**
* Tests of various graphic-related concepts at the Area Tree level.
*/
@@ -47,6 +52,7 @@
* dimensions of the viewport are correct.
* @throws FOrayException For errors creating the FO Tree or Area Tree.
*/
+ @Test
public void testGraphic002() throws FOrayException {
final AreaTreeCreator creator = AreaTreeCreator.getInstance();
final AreaTree areaTree = creator.buildAreaTree(
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/TestInline.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/TestInline.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/TestInline.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,6 +28,9 @@
package org.foray.app.area;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.foray.area.AreaNode;
import org.foray.area.AreaTree;
import org.foray.area.InlineArea;
@@ -37,6 +40,8 @@
import org.foray.area.TextArea;
import org.foray.core.FOrayException;
+import org.junit.Test;
+
/**
* Tests of various block-related concepts at the Area Tree level.
*/
@@ -48,6 +53,7 @@
* Also does some basic testing of a text area's ability to return its text.
* @throws FOrayException For errors creating the FO Tree or Area Tree.
*/
+ @Test
public void testInline001() throws FOrayException {
final AreaTreeCreator creator = AreaTreeCreator.getInstance();
final AreaTree areaTree = creator.buildAreaTree(
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/TestMetadata.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/TestMetadata.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/TestMetadata.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,9 +28,14 @@
package org.foray.app.area;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import org.foray.area.AreaTree;
import org.foray.core.FOrayException;
+import org.junit.Test;
+
/**
* Tests of metadata at the Area Tree level.
*/
@@ -40,6 +45,7 @@
* Test of fo/metadata-001.fo.
* @throws FOrayException For errors creating the FO Tree or Area Tree.
*/
+ @Test
public void testMetadata001() throws FOrayException {
final AreaTreeCreator creator = AreaTreeCreator.getInstance();
final AreaTree areaTree = creator.buildAreaTree(
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/TestVertical.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/TestVertical.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/TestVertical.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,6 +28,9 @@
package org.foray.app.area;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.foray.area.AreaNode;
import org.foray.area.AreaTree;
import org.foray.area.InlineArea;
@@ -39,6 +42,8 @@
import org.axsl.font.FontUse;
+import org.junit.Test;
+
/**
* Tests of various vertical positioning concepts at the Area Tree level.
*/
@@ -48,6 +53,7 @@
* Test of fo/vertical-001.fo.
* @throws FOrayException For errors creating the FO Tree or Area Tree.
*/
+ @Test
public void testVertical001() throws FOrayException {
final AreaTreeCreator creator = AreaTreeCreator.getInstance();
final AreaTree areaTree = creator.buildAreaTree("fo/vertical-001.fo");
Modified: trunk/foray/foray-areatree/src/test/java/org/foray/area/TestPageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/test/java/org/foray/area/TestPageCollection.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-areatree/src/test/java/org/foray/area/TestPageCollection.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,16 +28,17 @@
package org.foray.area;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* Tests for the class {@link PageCollection}.
*/
-public class TestPageCollection extends TestCase {
+public class TestPageCollection {
/**
* Test of {@link PageCollection#padPagesAtBeginning()}.
*/
+ @Test
public void testPadPagesAtBeginning() {
return;
}
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/TestBit.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestBit.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestBit.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,16 +28,19 @@
package org.foray.common;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
/**
* JUnit test class for the class {@link Bit}.
*/
-public class TestBit extends TestCase {
+public class TestBit {
/**
* Unit test of {@link Bit#maskHighOrderBits(byte)}.
*/
+ @Test
public void testMaskHighOrderBits() {
byte inputByte = (byte) 0xFF;
byte actualOutput = Bit.maskHighOrderBits(inputByte);
@@ -53,6 +56,7 @@
/**
* Unit test of {@link Bit#maskLowOrderBits(byte)}.
*/
+ @Test
public void testMaskLowOrderBits() {
byte inputByte = (byte) 0xFF;
byte actualOutput = Bit.maskLowOrderBits(inputByte);
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/TestByteVectorPacked.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestByteVectorPacked.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestByteVectorPacked.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,14 +28,17 @@
package org.foray.common;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
import java.util.Arrays;
-import junit.framework.TestCase;
-
/**
* JUnit test class for the class {@link ByteVectorPacked}.
*/
-public class TestByteVectorPacked extends TestCase {
+public class TestByteVectorPacked {
/** An array of test bytes. */
private static byte[] testSequence01 = new byte[] {
@@ -49,6 +52,7 @@
/**
* Functional test of the class as a whole.
*/
+ @Test
public void testClass01() {
final ByteVectorPacked testVector = new ByteVectorPacked();
@@ -69,6 +73,7 @@
/**
* Test of {@link ByteVectorPacked#computeByteIndex(int)}.
*/
+ @Test
public void testComputeByteIndex() {
final ByteVectorPacked testVector = new ByteVectorPacked();
@@ -88,6 +93,7 @@
/**
* Test of {@link ByteVectorPacked#indexOf(byte, int)}.
*/
+ @Test
public void testIndexOf() {
final ByteVectorPacked testVector = new ByteVectorPacked();
testVector.add(TestByteVectorPacked.testSequence01);
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/TestCharVector.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestCharVector.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestCharVector.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,12 +28,15 @@
package org.foray.common;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
/**
* JUnit test class for the class {@link CharVector}.
*/
-public class TestCharVector extends TestCase {
+public class TestCharVector {
/** The vector that is built and used for various tests. */
private CharVector testVector;
@@ -73,6 +76,7 @@
/**
* Tests of {@link CharVector#compareNullTerminated(int, CharSequence, int)}.
*/
+ @Test
public void testCompareNullTerminated() {
final CharVector testVector = this.getTestVector();
@@ -97,6 +101,7 @@
/**
* Tests of {@link CharVector#subSequence(int, int)}.
*/
+ @Test
public void testSubSequence() {
final CharVector testVector = this.getTestVector();
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/TestStringUtil.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestStringUtil.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestStringUtil.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,12 +28,14 @@
package org.foray.common;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
/**
* JUnit test class for the class {@link StringUtil}.
*/
-public class TestStringUtil extends TestCase {
+public class TestStringUtil {
/** Array used to test methods using null terminator checks. */
private static final char[] NULL_TERMINATED_CHAR_ARRAY = new char[] {'a', 'b', 'c', 'd', 'e', 'f', 0x00, 'g', 'h'};
@@ -44,6 +46,7 @@
/**
* Unit test of the method {@link StringUtil#nullTerminatedLength(char[], int)}.
*/
+ @Test
public void testNullTerminatedLengthCharArray() {
assertEquals(6, StringUtil.nullTerminatedLength(TestStringUtil.NULL_TERMINATED_CHAR_ARRAY, 0));
assertEquals(4, StringUtil.nullTerminatedLength(TestStringUtil.NULL_TERMINATED_CHAR_ARRAY, 2));
@@ -54,6 +57,7 @@
/**
* Unit test of the method {@link StringUtil#nullTerminatedLength(CharSequence, int)}.
*/
+ @Test
public void testNullTerminatedLengthCharSequence() {
assertEquals(6, StringUtil.nullTerminatedLength(TestStringUtil.NULL_TERMINATED_STRING, 0));
assertEquals(4, StringUtil.nullTerminatedLength(TestStringUtil.NULL_TERMINATED_STRING, 2));
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/TestTernaryTreeMap.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/TestTernaryTreeMap.java 2010-08-21 19:39:20 UTC (rev 11043)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/TestTernaryTreeMap.java 2010-08-21 23:51:35 UTC (rev 11044)
@@ -28,10 +28,10 @@
package org.foray.common;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Test;
-import junit.framework.TestCase;
-
/**
* JUnit test class for the class {@link TernaryTreeMap}.
*/
@@ -103,56 +103,56 @@
*/
private void checkGetters(final TernaryTreeMap map) {
/* Check the CharSequence getters for whole words. */
- TestCase.assertEquals('C', (char) map.get("Carlos"));
- TestCase.assertEquals('r', (char) map.get("Car"));
- TestCase.assertEquals('l', (char) map.get("palos"));
- TestCase.assertEquals('p', (char) map.get("pa"));
- TestCase.assertEquals(-1, map.get("alto"));
- TestCase.assertEquals(-1, map.get("C"));
+ assertEquals('C', (char) map.get("Carlos"));
+ assertEquals('r', (char) map.get("Car"));
+ assertEquals('l', (char) map.get("palos"));
+ assertEquals('p', (char) map.get("pa"));
+ assertEquals(-1, map.get("alto"));
+ assertEquals(-1, map.get("C"));
/* Check the CharSequence getters for words starting in the middle of a string. */
- TestCase.assertEquals('C', (char) map.get("ABCCarlos", 3));
- TestCase.assertEquals('r', (char) map.get("ABCCar", 3));
- TestCase.assertEquals('l', (char) map.get("ABCpalos", 3));
- TestCase.assertEquals('p', (char) map.get("ABCpa", 3));
- TestCase.assertEquals(-1, map.get("ABCalto", 3));
- TestCase.assertEquals(-1, map.get("ABCC", 3));
+ assertEquals('C', (char) map.get("ABCCarlos", 3));
+ assertEquals('r', (char) map.get("ABCCar", 3));
+ assertEquals('l', (char) map.get("ABCpalos", 3));
+ assertEquals('p', (char) map.get("ABCpa", 3));
+ assertEquals(-1, map.get("ABCalto", 3));
+ assertEquals(-1, map.get("ABCC", 3));
/* Check the CharSequence getters for words starting and ending in the middle of a string. */
- TestCase.assertEquals('C', (char) map.get("ABCCarlosXYZ", 3, 9));
- TestCase.assertEquals('r', (char) m...
[truncated message content] |
|
From: <vic...@us...> - 2010-08-22 00:48:04
|
Revision: 11045
http://foray.svn.sourceforge.net/foray/?rev=11045&view=rev
Author: victormote
Date: 2010-08-22 00:47:56 +0000 (Sun, 22 Aug 2010)
Log Message:
-----------
Convert some test classes to the Junit 4 style annotations.
Modified Paths:
--------------
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestAbstractGraphic.java
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestBmpGraphic.java
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGifGraphic.java
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGraphicServer4a.java
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestJpegGraphic.java
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestPngGraphic.java
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestSvgGraphic.java
trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestTiffGraphic.java
trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java
trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationTree.java
trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestNaturalLanguage.java
trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestWordList.java
trunk/foray/foray-ps/src/test/java/org/foray/ps/TestPsSystemDict.java
trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestEncodingParser.java
trunk/foray/foray-ps/src/test/java/org/foray/ps/encode/TestGlyphListParser.java
trunk/foray/foray-ps/src/test/java/org/foray/ps/filter/TestAscii85EncodeFilter.java
trunk/foray/foray-ps/src/test/java/org/foray/ps/filter/TestRunLengthEncodeFilter.java
trunk/foray/foray-render/src/test/java/org/foray/render/TestRenderer.java
Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestAbstractGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestAbstractGraphic.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestAbstractGraphic.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -31,15 +31,15 @@
import org.foray.common.Environment;
import org.foray.common.url.URLFactory;
+import org.junit.Before;
+
import java.io.IOException;
import java.net.URL;
-import junit.framework.TestCase;
-
/**
* Abstract superclass for tests of specific graphic types.
*/
-public abstract class TestAbstractGraphic extends TestCase {
+public abstract class TestAbstractGraphic {
/** The graphic server. */
private GraphicServer4a server;
@@ -51,6 +51,7 @@
* Standard setup code for all methods.
* @throws IOException For any errors reading the build properties.
*/
+ @Before
public void setUp() throws IOException {
this.server = new GraphicServer4a(null);
final URL graphicsUrl = URLFactory.createURL("file", null,
Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestBmpGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestBmpGraphic.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestBmpGraphic.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,8 +28,16 @@
package org.foray.graphic;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import org.axsl.graphic.GraphicException;
+import org.junit.Test;
+
import java.awt.color.ColorSpace;
import java.io.IOException;
@@ -43,6 +51,7 @@
* @throws GraphicException For errors processing image.
* @throws IOException For errors reading image.
*/
+ @Test
public void testGraphic01() throws GraphicException, IOException {
final Graphic4a bmp = this.getServer().makeGraphic("linux.bmp", this.getBaseURLs(), false);
assertNotNull(bmp);
Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGifGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGifGraphic.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGifGraphic.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,8 +28,14 @@
package org.foray.graphic;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.axsl.graphic.GraphicException;
+import org.junit.Test;
+
import java.awt.Color;
import java.awt.color.ColorSpace;
import java.io.IOException;
@@ -44,6 +50,7 @@
* @throws GraphicException For errors processing image.
* @throws IOException For errors reading image.
*/
+ @Test
public void testGraphic01() throws GraphicException, IOException {
final Graphic4a gif = this.getServer().makeGraphic("xml_feather.gif",
this.getBaseURLs(), false);
@@ -73,6 +80,7 @@
* @throws GraphicException For errors processing image.
* @throws IOException For errors reading image.
*/
+ @Test
public void testGraphic02() throws GraphicException, IOException {
final Graphic4a gif = this.getServer().makeGraphic(
"xml_feather_transparent.gif", this.getBaseURLs(), false);
Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGraphicServer4a.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGraphicServer4a.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestGraphicServer4a.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -35,15 +35,15 @@
import org.apache.commons.logging.Log;
+import org.junit.Test;
+
import java.io.File;
import java.io.IOException;
-import junit.framework.TestCase;
-
/**
* Tests for the class {@link GraphicServer4a}.
*/
-public class TestGraphicServer4a extends TestCase {
+public class TestGraphicServer4a {
/** A GraphicServer available for testing. */
private static GraphicServer4a graphicServer;
@@ -90,6 +90,7 @@
* Stub test to ensure at least one "test" in this class.
* TODO: Remove this method when we get some real tests in this class.
*/
+ @Test
public void testDummy() {
}
Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestJpegGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestJpegGraphic.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestJpegGraphic.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,8 +28,15 @@
package org.foray.graphic;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.axsl.graphic.GraphicException;
+import org.junit.Assert;
+import org.junit.Test;
+
import java.awt.color.ColorSpace;
import java.io.IOException;
@@ -43,6 +50,7 @@
* @throws GraphicException For errors processing image.
* @throws IOException For errors reading image.
*/
+ @Test
public void testGraphic01() throws GraphicException, IOException {
final Graphic4a jpeg = this.getServer().makeGraphic("jpeg-test1.jpg",
this.getBaseURLs(), false);
@@ -52,8 +60,8 @@
assertEquals(144, jpeg.pixelHeight());
assertEquals(8, jpeg.getBitsPerComponent());
assertTrue(jpeg.getColorSpace().getType() == ColorSpace.TYPE_RGB);
- assertFalse(jpeg.isTransparent());
- assertNull(jpeg.getTransparentColor());
+ Assert.assertFalse(jpeg.isTransparent());
+ Assert.assertNull(jpeg.getTransparentColor());
final byte[] rawContent = jpeg.getRawSamples();
assertNotNull(rawContent);
Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestPngGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestPngGraphic.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestPngGraphic.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,8 +28,16 @@
package org.foray.graphic;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import org.axsl.graphic.GraphicException;
+import org.junit.Test;
+
import java.awt.color.ColorSpace;
import java.io.IOException;
@@ -43,6 +51,7 @@
* @throws GraphicException For errors processing image.
* @throws IOException For errors reading image.
*/
+ @Test
public void testGraphic01() throws GraphicException, IOException {
final Graphic4a png = this.getServer().makeGraphic("png-test1.png",
this.getBaseURLs(), false);
Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestSvgGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestSvgGraphic.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestSvgGraphic.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,6 +28,10 @@
package org.foray.graphic;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.axsl.graphic.GraphicException;
import org.apache.batik.dom.GenericText;
@@ -36,6 +40,7 @@
import org.apache.batik.dom.svg.SVGOMStyleElement;
import org.apache.batik.dom.svg.SVGOMTextElement;
+import org.junit.Test;
import org.w3c.dom.Attr;
import org.w3c.dom.Comment;
import org.w3c.dom.NamedNodeMap;
@@ -56,6 +61,7 @@
* @throws GraphicException For errors processing image.
* @throws IOException For errors reading image.
*/
+ @Test
public void testText001() throws GraphicException, IOException {
/* This test ends up being somewhat a test of Batik, which we really
* should not need to test. However, this will flag changes that they
@@ -132,6 +138,7 @@
* @throws GraphicException For errors processing image.
* @throws IOException For errors reading image.
*/
+ @Test
public void testFontEmbed() throws GraphicException, IOException {
final Graphic4a graphic = this.getServer().makeGraphic(
"font-embed.svg", this.getBaseURLs(), false);
Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestTiffGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestTiffGraphic.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TestTiffGraphic.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,8 +28,16 @@
package org.foray.graphic;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import org.axsl.graphic.GraphicException;
+import org.junit.Test;
+
import java.awt.color.ColorSpace;
import java.io.IOException;
@@ -43,6 +51,7 @@
* @throws GraphicException For errors processing image.
* @throws IOException For errors reading image.
*/
+ @Test
public void testGraphic01() throws GraphicException, IOException {
final Graphic4a tiff = this.getServer().makeGraphic("xml_fax.tif",
this.getBaseURLs(), false);
Modified: trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java
===================================================================
--- trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,6 +28,10 @@
package org.foray.hyphen;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
import org.foray.common.Environment;
import org.foray.common.Logging;
@@ -38,6 +42,8 @@
import org.apache.commons.logging.Log;
+import org.junit.Test;
+
import java.io.IOException;
import java.net.URL;
import java.util.Properties;
@@ -83,6 +89,7 @@
* Make sure that the resource files that are supposed to be available actually are.
* @throws HyphenationException For errors obtaining the various tree instances.
*/
+ @Test
public void testResources() throws HyphenationException {
final HyphenationServer4a server = makeHyphenationServer();
Modified: trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationTree.java
===================================================================
--- trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationTree.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationTree.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,16 +28,19 @@
package org.foray.hyphen;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
/**
* JUnit test class for the class {@link HyphenationTree}.
*/
-public class TestHyphenationTree extends TestCase {
+public class TestHyphenationTree {
/**
* Unit test of {@link HyphenationTree#getPatternChars(String)}.
*/
+ @Test
public void testGetPatternChars() {
final String testInputString = ".ab4i";
final String result = HyphenationTree.getPatternChars(testInputString);
@@ -47,6 +50,7 @@
/**
* Unit test of {@link HyphenationTree#getInterletterValues(String)}.
*/
+ @Test
public void testGetInterletterValues() {
final String testInputString = ".ab4i";
final String result = HyphenationTree.getInterletterValues(testInputString);
Modified: trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestNaturalLanguage.java
===================================================================
--- trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestNaturalLanguage.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestNaturalLanguage.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,24 +28,27 @@
package org.foray.hyphen.util;
+import static org.junit.Assert.assertEquals;
+
import org.foray.hyphen.HyphenationServer4a;
import org.foray.hyphen.TestHyphenationServer4a;
import org.axsl.common.value.Iso639;
+import org.junit.Test;
+
import java.io.IOException;
-import junit.framework.TestCase;
-
/**
* JUnit test class for the class {@link NaturalLanguage}.
*/
-public class TestNaturalLanguage extends TestCase {
+public class TestNaturalLanguage {
/**
* Tests various Strings against the method {@link NaturalLanguage#validateText(CharSequence)}.
* @throws IOException For errors creating the Hyphenation server.
*/
+ @Test
public void testValidateText() throws IOException {
final HyphenationServer4a server = TestHyphenationServer4a.makeHyphenationServerStatic();
final NaturalLanguage nl = server.getNaturalLanguage(Iso639.MARSHALLESE);
Modified: trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestWordList.java
===================================================================
--- trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestWordList.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestWordList.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,17 +28,20 @@
package org.foray.hyphen.util;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
/**
* JUnit test class for the class {@link WordList}.
*/
-public class TestWordList extends TestCase {
+public class TestWordList {
/**
* Tests various Strings against the method
* {@link WordList#containsNonWord(String)}.
*/
+@Test
public void testContainsNonWord() {
String testString = "abc";
boolean containsNonWord = WordList.containsNonWord(testString);
@@ -53,6 +56,7 @@
* Tests various Strings agains the method
* {@link WordList#removeNonWordChars(String)}.
*/
+@Test
public void testRemoveNonWordChars() {
String testString = "abc";
String newString = WordList.removeNonWordChars(testString);
Modified: trunk/foray/foray-ps/src/test/java/org/foray/ps/TestPsSystemDict.java
===================================================================
--- trunk/foray/foray-ps/src/test/java/org/foray/ps/TestPsSystemDict.java 2010-08-21 23:51:35 UTC (rev 11044)
+++ trunk/foray/foray-ps/src/test/java/org/foray/ps/TestPsSystemDict.java 2010-08-22 00:47:56 UTC (rev 11045)
@@ -28,22 +28,27 @@
package org.foray.ps;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.axsl.ps.PsInput;
+import org.junit.Test;
+
import java.math.BigDecimal;
-import junit.framework.TestCase;
-
/**
* Tests for the class {@link PsSystemDict4a}.
*/
-public class TestPsSystemDict extends TestCase {
+public class TestPsSystemDict {
/**
* Test of the "dict" operator.
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testDict01() throws PsInterpreterException4a, PsOperatorException {
final PsInput input = new PsStringInput("3 dict");
final PsInterpreter4a interpreter = new PsInterpreter4a(input, null);
@@ -59,6 +64,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testPop01() throws PsInterpreterException4a, PsOperatorException {
/* First example from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("1 2 3 pop");
@@ -95,6 +101,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testBegin01() throws PsInterpreterException4a, PsOperatorException {
final PsInput input = new PsStringInput("17 dict begin");
final PsInterpreter4a interpreter = new PsInterpreter4a(input, null);
@@ -109,6 +116,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testDiv01() throws PsInterpreterException4a, PsOperatorException {
/* First example from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("3 2 div");
@@ -118,7 +126,7 @@
PsObject object = interpreter.getOperandStack().pop();
assertTrue(object instanceof PsReal);
PsReal real = (PsReal) object;
- assertEquals(1.5, real.getDoubleValue());
+ assertEquals(1.5, real.getDoubleValue(), .0000001);
/* Second example from the PSLRM, 2nd ed. */
input = new PsStringInput("4 2 div");
@@ -128,7 +136,7 @@
object = interpreter.getOperandStack().pop();
assertTrue(object instanceof PsReal);
real = (PsReal) object;
- assertEquals(2.0, real.getDoubleValue());
+ assertEquals(2.0, real.getDoubleValue(), .0000001);
}
/**
@@ -136,6 +144,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testIdiv01() throws PsInterpreterException4a, PsOperatorException {
/* First example from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("3 2 idiv");
@@ -173,6 +182,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testAdd01() throws PsInterpreterException4a, PsOperatorException {
/* First example from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("3 4 add");
@@ -190,7 +200,7 @@
object = interpreter.getOperandStack().pop();
assertTrue(object instanceof PsReal);
final PsReal real = (PsReal) object;
- assertEquals(11.0, real.getDoubleValue());
+ assertEquals(11.0, real.getDoubleValue(), .00000001);
}
/**
@@ -198,6 +208,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testSub01() throws PsInterpreterException4a, PsOperatorException {
/* Inverse of the first example for "add" from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("7 3 sub");
@@ -223,6 +234,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testMul01() throws PsInterpreterException4a, PsOperatorException {
/* Use the same operands as for the "add" operator tests. */
PsInput input = new PsStringInput("3 4 mul");
@@ -248,6 +260,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testDup01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -257,6 +270,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testTrueOperator01() throws PsInterpreterException4a, PsOperatorException {
final PsInput input = new PsStringInput("true");
final PsInterpreter4a interpreter = new PsInterpreter4a(input, null);
@@ -273,6 +287,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testFalseOperator01() throws PsInterpreterException4a, PsOperatorException {
final PsInput input = new PsStringInput("false");
final PsInterpreter4a interpreter = new PsInterpreter4a(input, null);
@@ -289,6 +304,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testReadonly01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -298,6 +314,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testExecuteonly01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -307,6 +324,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testNoaccess01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -316,6 +334,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testDef01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -325,6 +344,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testEnd01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -334,6 +354,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testMark01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -343,6 +364,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testCreateArray01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -352,6 +374,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testCurrentdict01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -361,6 +384,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testCurrentfile01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -370,6 +394,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testCounttomark01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -379,6 +404,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testEexec01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -388,6 +414,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testString01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -397,6 +424,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testExch01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -406,6 +434,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testReadstring01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -415,6 +444,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testRoll01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -424,6 +454,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testIfOperator01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -433,6 +464,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testIfElseOperator01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -442,6 +474,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testPut01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
@@ -451,6 +484,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testArray01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -460,6 +494,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testClosefile01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -469,6 +504,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testIndex01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -478,6 +514,7 @@
* @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
+ @Test
public void testGet01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
@@ -487,6 +524,7 @@
* @throws PsOperatorException For any PostScript error.
* @throws PsInterpreterException4a For PostScript errors during execution.
*/
+ @Test
public void testD...
[truncated message content] |
|
From: <vic...@us...> - 2010-09-01 15:03:14
|
Revision: 11047
http://foray.svn.sourceforge.net/foray/?rev=11047&view=rev
Author: victormote
Date: 2010-09-01 15:03:07 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Clean up some maven warnings by referencing Ant in its new location.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-app/pom.xml
trunk/foray/foray-font/pom.xml
trunk/foray/foray-hyphen/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-08-22 01:02:21 UTC (rev 11046)
+++ trunk/foray/foray-all/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
@@ -93,7 +93,7 @@
<!-- Apache Ant. -->
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
<scope>compile</scope>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2010-08-22 01:02:21 UTC (rev 11046)
+++ trunk/foray/foray-app/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
@@ -57,7 +57,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-font/pom.xml
===================================================================
--- trunk/foray/foray-font/pom.xml 2010-08-22 01:02:21 UTC (rev 11046)
+++ trunk/foray/foray-font/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
@@ -49,7 +49,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-hyphen/pom.xml
===================================================================
--- trunk/foray/foray-hyphen/pom.xml 2010-08-22 01:02:21 UTC (rev 11046)
+++ trunk/foray/foray-hyphen/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
@@ -43,7 +43,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>compile</scope>
</dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-11 19:18:10
|
Revision: 11048
http://foray.svn.sourceforge.net/foray/?rev=11048&view=rev
Author: victormote
Date: 2010-09-11 19:18:03 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Add "name" elements to all POMs.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-app/pom.xml
trunk/foray/foray-areatree/pom.xml
trunk/foray/foray-common/pom.xml
trunk/foray/foray-core/pom.xml
trunk/foray/foray-font/pom.xml
trunk/foray/foray-fotree/pom.xml
trunk/foray/foray-graphic/pom.xml
trunk/foray/foray-hyphen/pom.xml
trunk/foray/foray-layout/pom.xml
trunk/foray/foray-mif/pom.xml
trunk/foray/foray-output/pom.xml
trunk/foray/foray-pdf/pom.xml
trunk/foray/foray-pioneer/pom.xml
trunk/foray/foray-ps/pom.xml
trunk/foray/foray-render/pom.xml
trunk/foray/foray-speech/pom.xml
trunk/foray/foray-text/pom.xml
trunk/foray/foray-xml/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-all/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -21,6 +21,7 @@
<artifactId>oss-parent</artifactId>
<version>4</version>
</parent>
+ <name>foray-all</name>
<dependencyManagement>
<dependencies>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-app/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-app</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-areatree/pom.xml
===================================================================
--- trunk/foray/foray-areatree/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-areatree/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-areatree</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-common/pom.xml
===================================================================
--- trunk/foray/foray-common/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-common/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-common</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-core/pom.xml
===================================================================
--- trunk/foray/foray-core/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-core/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,8 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-core</name>
+
<dependencies>
<!-- TODO: This project has a runtime dependency on foray-common-0.4-dev-rsrc.jar which has not yet been accounted
Modified: trunk/foray/foray-font/pom.xml
===================================================================
--- trunk/foray/foray-font/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-font/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-font</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-fotree/pom.xml
===================================================================
--- trunk/foray/foray-fotree/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-fotree/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-fotree</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-graphic/pom.xml
===================================================================
--- trunk/foray/foray-graphic/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-graphic/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-graphic</name>
<dependencies>
Modified: trunk/foray/foray-hyphen/pom.xml
===================================================================
--- trunk/foray/foray-hyphen/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-hyphen/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-hyphen</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-layout/pom.xml
===================================================================
--- trunk/foray/foray-layout/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-layout/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-layout</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-mif/pom.xml
===================================================================
--- trunk/foray/foray-mif/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-mif/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-mif</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-output/pom.xml
===================================================================
--- trunk/foray/foray-output/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-output/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-output</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-pdf/pom.xml
===================================================================
--- trunk/foray/foray-pdf/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-pdf/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-pdf</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-pioneer/pom.xml
===================================================================
--- trunk/foray/foray-pioneer/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-pioneer/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-pioneer</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-ps/pom.xml
===================================================================
--- trunk/foray/foray-ps/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-ps/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,8 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-ps</name>
+
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
Modified: trunk/foray/foray-render/pom.xml
===================================================================
--- trunk/foray/foray-render/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-render/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-render</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-speech/pom.xml
===================================================================
--- trunk/foray/foray-speech/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-speech/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-speech</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-text/pom.xml
===================================================================
--- trunk/foray/foray-text/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-text/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-text</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-xml/pom.xml
===================================================================
--- trunk/foray/foray-xml/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-xml/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-xml</name>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-28 22:34:39
|
Revision: 11050
http://foray.svn.sourceforge.net/foray/?rev=11050&view=rev
Author: victormote
Date: 2010-09-28 22:34:33 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Clean up compiler warnings about dead code (after upgrade to Eclipse Helios).
Modified Paths:
--------------
trunk/foray/foray-app/src/main/java/org/foray/app/OutputTargetFactory.java
trunk/foray/foray-font/src/main/java/org/foray/font/ConfigGenerator.java
trunk/foray/foray-font/src/main/java/org/foray/font/FontConsumer4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java
Modified: trunk/foray/foray-app/src/main/java/org/foray/app/OutputTargetFactory.java
===================================================================
--- trunk/foray/foray-app/src/main/java/org/foray/app/OutputTargetFactory.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-app/src/main/java/org/foray/app/OutputTargetFactory.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -134,9 +134,6 @@
break;
}
}
- if (renderer == null) {
- throw new FOrayException("Unable to create renderer.");
- }
return renderer;
}
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/ConfigGenerator.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/ConfigGenerator.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/ConfigGenerator.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -322,11 +322,6 @@
this.failureCount ++;
return;
}
- if (reader == null) {
- getLogger().error("Error opening:\n " + file.getAbsolutePath());
- this.failureCount ++;
- return;
- }
this.successCount ++;
final FontFile fontFile = reader.createFontFile();
if (! (fontFile == null)) {
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FontConsumer4a.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FontConsumer4a.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FontConsumer4a.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -330,9 +330,6 @@
}
return fontUse;
}
- if (fontSelected == null) {
- return null;
- }
final ConsumerFont4a consumerFont = registerFontUse(fontSelected);
/* Selection of the actual FontUse is delegated to consumerFont. */
final FontUse4a fontUse = consumerFont.selectFontUse(
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -5035,7 +5035,7 @@
FoProperty.BACKGROUND);
if (background != null) {
backgroundPosition = background.getPosition();
- if (property != null) {
+ if (backgroundPosition != null) {
return backgroundPosition.getShorthandValue(context,
fobj, AbsoluteAxis.VERTICAL,
paddingRectangleHeight, backgroundImageHeight);
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -462,6 +462,10 @@
/* The variable svgDocument below is the same object as the one
* commented out above ... */
final Document svgDocument = svgRoot.getOwnerDocument();
+ if (svgDocument == null) {
+ throw new GraphicException("Error converting MathML to SVG: "
+ + "Document is null.");
+ }
/* ... however, the root element below is /NOT/ the same as the svgRoot
* variable above ... */
@@ -471,10 +475,6 @@
svgDocument.removeChild(svgRoot2);
svgDocument.appendChild(svgRoot);
- if (svgDocument == null) {
- throw new GraphicException("Error converting MathML to SVG: "
- + "Document is null.");
- }
if (! (svgDocument instanceof SVGDocument)) {
throw new GraphicException("Error converting MathML to SVG: "
+ "Converted document is not SVG.");
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -313,7 +313,6 @@
final AttributedCharacterIterator aci, final Graphics2D g2d,
final Float size, final boolean italic, final boolean bold)
throws FontException {
- org.axsl.font.FontUse font = null;
Font.Style style = Font.Style.NORMAL;
if (italic) {
style = Font.Style.ITALIC;
@@ -331,7 +330,7 @@
for (final Iterator<?> i = gvtFonts.iterator(); i.hasNext(); ) {
final GVTFontFamily fam = (GVTFontFamily) i.next();
this.fontFamily = fam.getFamilyName();
- font = this.fontConsumer.selectFontCss(
+ org.axsl.font.FontUse font = this.fontConsumer.selectFontCss(
FontUtility.foFontFamily(this.fontFamily),
style, weight, Font.Variant.NORMAL,
org.axsl.font.Font.Stretch.NORMAL,
@@ -346,17 +345,14 @@
}
}
}
- if (font == null) {
- this.fontFamily = "any";
- return this.fontConsumer.selectFontXsl(
- org.axsl.font.Font.SelectionStrategy.AUTO,
- new String[] {"any"}, style, weight,
- Font.Variant.NORMAL,
- org.axsl.font.Font.Stretch.NORMAL,
- fsize * WKConstants.MILLIPOINTS_PER_POINT,
- ' ');
- }
- return font;
+ this.fontFamily = "any";
+ return this.fontConsumer.selectFontXsl(
+ org.axsl.font.Font.SelectionStrategy.AUTO,
+ new String[] {"any"}, style, weight,
+ Font.Variant.NORMAL,
+ org.axsl.font.Font.Stretch.NORMAL,
+ fsize * WKConstants.MILLIPOINTS_PER_POINT,
+ ' ');
}
/**
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -84,11 +84,11 @@
doc = this.svg.getSvgDocument();
final PDFGraphics2D graphics = getPDFContent4SVG(fontConsumer, doc,
strokeText, outputContext, output);
- graphics.dispose();
if (graphics == null) {
throw new GraphicException("Unable to convert to PDF: "
+ this.svg.getUrl().toExternalForm());
}
+ graphics.dispose();
if (graphics.ioErrorFound()) {
throw new GraphicException("I/O error(s) while converting to PDF: "
+ this.svg.getUrl().toExternalForm());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-29 16:11:04
|
Revision: 11052
http://foray.svn.sourceforge.net/foray/?rev=11052&view=rev
Author: victormote
Date: 2010-09-29 16:10:56 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Conform to changes in aXSL in which i18n classes are split into a separate project.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-common/pom.xml
trunk/foray/foray-common/src/main/java/org/foray/common/FontUtil.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FOLineText.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationServer4a.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/ValidateChars.java
trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java
trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestNaturalLanguage.java
trunk/foray/foray-text/src/main/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-all/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
@@ -301,6 +301,13 @@
</dependency>
<dependency>
<groupId>org.axsl</groupId>
+ <artifactId>axsl-i18n</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
<artifactId>axsl-layout</artifactId>
<version>0.3-SNAPSHOT</version>
<type>jar</type>
Modified: trunk/foray/foray-common/pom.xml
===================================================================
--- trunk/foray/foray-common/pom.xml 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-common/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
@@ -47,6 +47,12 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-i18n</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/FontUtil.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/FontUtil.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/FontUtil.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -28,7 +28,7 @@
package org.foray.common;
-import org.axsl.common.value.Iso15924;
+import org.axsl.i18n.Script;
/**
* Utility methods related to fonts.
@@ -41,11 +41,11 @@
private FontUtil() { }
/**
- * Converts an {@link Iso15924} script instance into its OpenType script equivalent.
+ * Converts an {@link Script} script instance into its OpenType script equivalent.
* @param script The ISO 15924 script for which the OpenType equivalent is needed.
* @return The OpenType equivalent.
*/
- public static String getOpenTypeScript(final Iso15924 script) {
+ public static String getOpenTypeScript(final Script script) {
/* TODO: This is probably not correct. */
return script.getAlphaCode().toLowerCase();
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FOLineText.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FOLineText.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FOLineText.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -28,11 +28,11 @@
package org.foray.fotree;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.fo.FoContext;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.font.FontUse;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.axsl.text.line.LineText;
/**
@@ -173,28 +173,28 @@
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage() {
+ public Language inlineLanguage() {
return this.realLineText.inlineLanguage(this.context);
}
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage(final FoContext context) {
+ public Language inlineLanguage(final FoContext context) {
return this.realLineText.inlineLanguage(context);
}
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry() {
+ public Country inlineCountry() {
return this.realLineText.inlineCountry(this.context);
}
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry(final FoContext context) {
+ public Country inlineCountry(final FoContext context) {
return this.realLineText.inlineCountry(context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FObj.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FObj.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -75,9 +75,6 @@
import org.axsl.common.value.HyphenationKeep;
import org.axsl.common.value.IndexMerge;
import org.axsl.common.value.IntrusionDisplace;
-import org.axsl.common.value.Iso15924;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.common.value.LeaderAlignment;
import org.axsl.common.value.LeaderPattern;
import org.axsl.common.value.LineHeightShiftAdjustment;
@@ -258,6 +255,9 @@
import org.axsl.font.FontUse;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicServer;
+import org.axsl.i18n.Script;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.axsl.speech.SpeechException;
import org.axsl.speech.SpeechServer;
import org.axsl.speech.Voice;
@@ -2455,12 +2455,12 @@
/**
* {@inheritDoc}
*/
- public Iso639 traitLanguage(final FoContext context) {
+ public Language traitLanguage(final FoContext context) {
final String languageCode = this.getPropertyList().getLanguage(this,
context);
- final Iso639 iso639 = Iso639.findFromAlpha(languageCode);
+ final Language iso639 = Language.findFromAlpha(languageCode);
if (iso639 == null) {
- return Iso639.NULL;
+ return Language.NULL;
} else {
return iso639;
}
@@ -2469,7 +2469,7 @@
/**
* {@inheritDoc}
*/
- public Iso3166 traitCountry(final FoContext context) {
+ public Country traitCountry(final FoContext context) {
return this.getPropertyList().getCountry(this, context);
}
@@ -2612,7 +2612,7 @@
final FObj parent = this.effectiveParent(context);
if (this.isBlockLevelFo()
|| parent == null) {
- final Iso15924 script = this.traitScript(context);
+ final Script script = this.traitScript(context);
if (script.equals("auto")) {
final DtWritingMode writingMode = this.traitWritingMode(context);
if (writingMode.isHorizontal()) {
@@ -2640,7 +2640,7 @@
throw new IllegalStateException("Unable to obtain a font for baseline computation.");
}
final Font font = fontUse.getFont();
- final Iso15924 script = this.traitScript(context);
+ final Script script = this.traitScript(context);
final String opentypeScript = FontUtil.getOpenTypeScript(script);
final Font.Baseline fontBaseline = font.baseline(opentypeScript);
switch (fontBaseline) {
@@ -3820,17 +3820,17 @@
/**
* {@inheritDoc}
*/
- public Iso15924 traitScript(final FoContext context) {
+ public Script traitScript(final FoContext context) {
final String script = this.getPropertyList().traitScript(this, context);
if ("auto".equals(script)) {
return getAutoScript();
}
if ("none".equals(script)) {
- return Iso15924.UNDETERMINED;
+ return Script.UNDETERMINED;
}
- final Iso15924 iso15924 = Iso15924.findFromAlpha(script);
+ final Script iso15924 = Script.findFromAlpha(script);
if (iso15924 == null) {
- return Iso15924.UNDETERMINED;
+ return Script.UNDETERMINED;
} else {
return iso15924;
}
@@ -3840,10 +3840,10 @@
* Computes the script to be used for this object based on its content.
* @return The content-based script for this object.
*/
- protected Iso15924 getAutoScript() {
+ protected Script getAutoScript() {
/*TODO: This is incorrect. See XSL-FO 1.1, Section 7.10.3 for the
* algorithm. */
- return Iso15924.UNDETERMINED;
+ return Script.UNDETERMINED;
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -234,13 +234,13 @@
import org.axsl.common.value.Baseline;
import org.axsl.common.value.Compass;
import org.axsl.common.value.Conditionality;
-import org.axsl.common.value.Iso3166;
import org.axsl.common.value.RelativeAxis;
import org.axsl.common.value.RelativeCompass;
import org.axsl.common.value.ShadowEffect;
import org.axsl.fo.FoContext;
import org.axsl.fo.FoInlineContext;
import org.axsl.graphic.Graphic;
+import org.axsl.i18n.Country;
import java.awt.Shape;
import java.util.ArrayList;
@@ -3081,7 +3081,7 @@
* issues.
* @return The country property.
*/
- public Iso3166 getCountry(final FObj fobj, final FoContext context) {
+ public Country getCountry(final FObj fobj, final FoContext context) {
PdCountry property = (PdCountry) getProperty(FoProperty.COUNTRY);
if (property != null) {
return property.getValue(context, fobj);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -32,8 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.common.value.WrapOption;
import org.axsl.fo.FoContext;
import org.axsl.fo.FoTreeException;
@@ -41,6 +39,8 @@
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.font.Font;
import org.axsl.font.FontUse;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.axsl.text.line.LineText;
import java.util.List;
@@ -318,14 +318,14 @@
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage() {
+ public Language inlineLanguage() {
return this.inlineLanguage(null);
}
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage(final FoContext context) {
+ public Language inlineLanguage(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitLanguage(context);
}
@@ -333,14 +333,14 @@
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry() {
+ public Country inlineCountry() {
return this.inlineCountry(null);
}
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry(final FoContext context) {
+ public Country inlineCountry(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitCountry(context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -36,8 +36,6 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.fo.FoValue;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.common.value.LinefeedTreatment;
import org.axsl.common.value.TextTransform;
import org.axsl.common.value.WhiteSpaceTreatment;
@@ -51,6 +49,8 @@
import org.axsl.font.Font;
import org.axsl.font.FontServer;
import org.axsl.font.FontUse;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.axsl.text.line.LineText;
import java.util.List;
@@ -661,14 +661,14 @@
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage() {
+ public Language inlineLanguage() {
return this.inlineLanguage(null);
}
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage(final FoContext context) {
+ public Language inlineLanguage(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitLanguage(context);
}
@@ -676,14 +676,14 @@
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry() {
+ public Country inlineCountry() {
return this.inlineCountry(null);
}
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry(final FoContext context) {
+ public Country inlineCountry(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitCountry(context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -36,8 +36,8 @@
import org.foray.fotree.value.DtCountry;
import org.foray.fotree.value.PropertyValue;
-import org.axsl.common.value.Iso3166;
import org.axsl.fo.FoContext;
+import org.axsl.i18n.Country;
/**
* The "country" property in XSL-FO.
@@ -91,7 +91,7 @@
}
final DtCountry dtCountry = DtCountry.makeCountryDT(value);
if (dtCountry != null
- && dtCountry.getValue() != Iso3166.NULL) {
+ && dtCountry.getValue() != Country.NULL) {
return dtCountry;
}
throw unexpectedValue(value, fobj);
@@ -103,7 +103,7 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public Iso3166 getValue(final FoContext context, final FObj fobj) {
+ public Country getValue(final FoContext context, final FObj fobj) {
if (value().canEvalKeyword()) {
final FoValue keyword = this.convertValueToFoValue(value());
switch (keyword) {
@@ -111,7 +111,7 @@
return getValueNoInstance(context, fobj);
}
case NONE: {
- return Iso3166.NULL;
+ return Country.NULL;
}
}
}
@@ -127,13 +127,13 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- public static Iso3166 getValueNoInstance(final FoContext context,
+ public static Country getValueNoInstance(final FoContext context,
final FObj fobj) {
final FObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.getPropertyList().getCountry(parent, context);
}
- return Iso3166.NULL;
+ return Country.NULL;
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -28,7 +28,7 @@
package org.foray.fotree.value;
-import org.axsl.common.value.Iso3166;
+import org.axsl.i18n.Country;
import java.awt.Color;
import java.util.HashMap;
@@ -36,7 +36,7 @@
/**
* A "country" datatype in XSL-FO. Countries must conform to the ISO 3166 codes.
- * @see org.axsl.common.value.Iso3166
+ * @see org.axsl.i18n.Country
*/
public final class DtCountry extends Datatype {
@@ -44,18 +44,18 @@
* The map of ISO codes to DtCountry instances that encapsulate the ISO
* codes.
*/
- private static Map<Iso3166, DtCountry> countryMap =
- new HashMap<Iso3166, DtCountry>();
+ private static Map<Country, DtCountry> countryMap =
+ new HashMap<Country, DtCountry>();
/** The ISO 3166 code. */
- private Iso3166 value = null;
+ private Country value = null;
/**
* Private Constructor. To obtain an instance of this class, use
* {@link #makeCountryDT(String)}.
* @param value The country code.
*/
- private DtCountry(final Iso3166 value) {
+ private DtCountry(final Country value) {
this.value = value;
}
@@ -63,7 +63,7 @@
* Return the value.
* @return The value of this number.
*/
- public Iso3166 getValue() {
+ public Country getValue() {
return this.value;
}
@@ -73,16 +73,16 @@
* @return The DtCountry instance for {@code countryCode}.
*/
public static DtCountry makeCountryDT(final String countryCode) {
- final Iso3166 iso3166 = Iso3166.findFromAlpha(countryCode);
+ final Country iso3166 = Country.findFromAlpha(countryCode);
return getCountryDT(iso3166);
}
/**
- * Finds the {@link DtCountry} for a given {@link Iso3166} code.
+ * Finds the {@link DtCountry} for a given {@link Country} code.
* @param countryCode The Iso3166 country code to be converted.
* @return The DtCountry instance for {@code countryCode}.
*/
- public static DtCountry getCountryDT(final Iso3166 countryCode) {
+ public static DtCountry getCountryDT(final Country countryCode) {
if (countryCode == null) {
return null;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -28,14 +28,14 @@
package org.foray.fotree.value;
-import org.axsl.common.value.Iso639;
+import org.axsl.i18n.Language;
import java.awt.Color;
/**
* A "language" datatype in XSL-FO. Languages must conform to the 2-letter or
* 3-letter ISO 639 codes.
- * @see org.axsl.common.value.Iso639
+ * @see org.axsl.i18n.Language
*/
public class DtLanguage extends Datatype {
@@ -64,7 +64,7 @@
* @return The DtLanguage instance for {@code languageCode}.
*/
public static DtLanguage makeLanguageDT(final String languageCode) {
- final Iso639 iso639 = Iso639.findFromAlpha(languageCode);
+ final Language iso639 = Language.findFromAlpha(languageCode);
if (iso639 == null) {
return null;
}
Modified: trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationServer4a.java
===================================================================
--- trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationServer4a.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationServer4a.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -39,9 +39,9 @@
import org.foray.hyphen.util.NatLangParser;
import org.foray.hyphen.util.NaturalLanguage;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.hyphen.HyphenationException;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.apache.commons.logging.Log;
@@ -96,8 +96,8 @@
private URL naturalLanguageDir;
/** Map of all Natural Language instances. */
- private Map<Iso639, NaturalLanguage> languages =
- new HashMap<Iso639, NaturalLanguage>();
+ private Map<Language, NaturalLanguage> languages =
+ new HashMap<Language, NaturalLanguage>();
/**
* Constructor.
@@ -126,13 +126,13 @@
* @return The hyphenation tree if it exists, or null otherwise.
* @throws HyphenationException For errors retrieving the hyphenation tree.
*/
- HyphenationTree getHyphenationTree(final Iso639 rawLanguageCode,
- final Iso3166 rawCountryCode) throws HyphenationException {
+ HyphenationTree getHyphenationTree(final Language rawLanguageCode,
+ final Country rawCountryCode) throws HyphenationException {
/* Bail out if the language code is null. */
if (rawLanguageCode == null
- || rawLanguageCode.equals(Iso639.UNDETERMINED)
- || rawLanguageCode.equals(Iso639.NULL)) {
+ || rawLanguageCode.equals(Language.UNDETERMINED)
+ || rawLanguageCode.equals(Language.NULL)) {
return null;
}
@@ -162,7 +162,7 @@
* @throws HyphenationException For errors retrieving the hyphenation tree.
*/
private HyphenationTree findTreeForKey(final String key,
- final Iso639 language, final Iso3166 country)
+ final Language language, final Country country)
throws HyphenationException {
if (key == null) {
return null;
@@ -201,7 +201,7 @@
HyphenationServer4a.PATTERN_MISSING_TEXT
+ key + " (" + language.getEnglishName());
if (country != null
- && country != Iso3166.NULL) {
+ && country != Country.NULL) {
warningMessage.append(", " + country.getEnglishName());
}
warningMessage.append(")");
@@ -380,8 +380,8 @@
* {@inheritDoc}
*/
public org.axsl.hyphen.Hyphenation hyphenate(final CharSequence word,
- final int offset, final int len, final Iso639 language,
- final Iso3166 country, final int remainCount, final int pushCount,
+ final int offset, final int len, final Language language,
+ final Country country, final int remainCount, final int pushCount,
final boolean includeInhibitors) throws HyphenationException {
return this.hyphenate(word.toString().toCharArray(), offset, len,
language, country, remainCount, pushCount, includeInhibitors);
@@ -391,8 +391,8 @@
* {@inheritDoc}
*/
public org.axsl.hyphen.Hyphenation hyphenate(final char[] word,
- final int offset, final int len, final Iso639 language,
- final Iso3166 country, final int remainCount,
+ final int offset, final int len, final Language language,
+ final Country country, final int remainCount,
final int pushCount, final boolean includeInhibitors)
throws HyphenationException {
final HyphenationTree hTree = getHyphenationTree(language, country);
@@ -415,7 +415,7 @@
* {@inheritDoc}
*/
public int wordSize(final char[] characters, final int wordStart,
- final Iso639 language, final Iso3166 country) {
+ final Language language, final Country country) {
if (characters == null) {
return 0;
}
@@ -439,7 +439,7 @@
* {@inheritDoc}
*/
public int wordSize(final CharSequence characters, final int wordStart,
- final Iso639 language, final Iso3166 country) {
+ final Language language, final Country country) {
if (characters == null) {
return 0;
}
@@ -451,7 +451,7 @@
* {@inheritDoc}
*/
public int wordStarts(final char[] characters, final int startIndex,
- final Iso639 language, final Iso3166 country) {
+ final Language language, final Country country) {
if (characters == null) {
return -1;
}
@@ -476,7 +476,7 @@
* {@inheritDoc}
*/
public int wordStarts(final CharSequence characters, final int startIndex,
- final Iso639 language, final Iso3166 country) {
+ final Language language, final Country country) {
if (characters == null) {
return -1;
}
@@ -492,13 +492,13 @@
* @return The country key, or null if the input is invalid.
*/
public static String buildCountryKey(final String languageCode,
- final Iso3166 rawCountryCode) {
+ final Country rawCountryCode) {
if (languageCode == null
|| languageCode.equals("")) {
return null;
}
if (rawCountryCode == null
- || rawCountryCode == Iso3166.NULL) {
+ || rawCountryCode == Country.NULL) {
return null;
}
final String countryCode = rawCountryCode.getAbbrev3().toLowerCase();
@@ -521,7 +521,7 @@
*/
public NaturalLanguage getNaturalLanguage(
final String languageCode) {
- final Iso639 iso639 = Iso639.findFromAlpha(languageCode);
+ final Language iso639 = Language.findFromAlpha(languageCode);
return this.getNaturalLanguage(iso639);
}
@@ -531,7 +531,7 @@
* @param iso639 The ISO-639 instance for the language sought.
* @return The suitable instance for {@code iso639}.
*/
- public NaturalLanguage getNaturalLanguage(final Iso639 iso639) {
+ public NaturalLanguage getNaturalLanguage(final Language iso639) {
NaturalLanguage nl = this.languages.get(iso639);
if (nl != null) {
return nl;
@@ -557,7 +557,7 @@
*/
public NaturalLanguage makeNaturalLanguage(
final String languageCode) {
- final Iso639 iso639 = Iso639.findFromAlpha(languageCode);
+ final Language iso639 = Language.findFromAlpha(languageCode);
final NaturalLanguage existingLang = this.getNaturalLanguage(iso639);
if (existingLang != null) {
/* If the instance already exists, don't return a new one for the
Modified: trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/ValidateChars.java
===================================================================
--- trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/ValidateChars.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/ValidateChars.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -32,7 +32,7 @@
import org.foray.common.url.URLFactory;
import org.foray.hyphen.HyphenationServer4a;
-import org.axsl.common.value.Iso639;
+import org.axsl.i18n.Language;
import org.apache.commons.logging.Log;
import org.apache.xerces.util.XMLCatalogResolver;
@@ -105,7 +105,7 @@
/** The Iso639 instance against whose language the content of this document
* will be tested. */
- private Iso639 iso639;
+ private Language iso639;
/* TODO: This needs to be handled on an element-by-element basis, based
* upon language codes in the document itself. */
@@ -133,7 +133,7 @@
this.input = input;
this.entityResolver = getEntityResolver(catalog);
this.languageCode = languageCode;
- this.iso639 = Iso639.findFromAlpha(languageCode);
+ this.iso639 = Language.findFromAlpha(languageCode);
}
/**
Modified: trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java
===================================================================
--- trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -35,10 +35,10 @@
import org.foray.common.Environment;
import org.foray.common.Logging;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.hyphen.AbstractTestHyphenationServer;
import org.axsl.hyphen.HyphenationException;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.apache.commons.logging.Log;
@@ -93,40 +93,40 @@
public void testResources() throws HyphenationException {
final HyphenationServer4a server = makeHyphenationServer();
- HyphenationTree tree = server.getHyphenationTree(Iso639.ENGLISH, Iso3166.UNITED_STATES);
+ HyphenationTree tree = server.getHyphenationTree(Language.ENGLISH, Country.UNITED_STATES);
assertNotNull(tree);
assertEquals(HyphenationTree.Source.RESOURCES, tree.getSource());
- tree = server.getHyphenationTree(Iso639.FINNISH, null);
...
[truncated message content] |
|
From: <vic...@us...> - 2010-09-29 19:21:43
|
Revision: 11053
http://foray.svn.sourceforge.net/foray/?rev=11053&view=rev
Author: victormote
Date: 2010-09-29 19:21:37 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Conform to axsl change from axsl-text to axsl-linebreak.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-core/pom.xml
trunk/foray/foray-text/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
+++ trunk/foray/foray-all/pom.xml 2010-09-29 19:21:37 UTC (rev 11053)
@@ -350,7 +350,7 @@
</dependency>
<dependency>
<groupId>org.axsl</groupId>
- <artifactId>axsl-text</artifactId>
+ <artifactId>axsl-linebreak</artifactId>
<version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
Modified: trunk/foray/foray-core/pom.xml
===================================================================
--- trunk/foray/foray-core/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
+++ trunk/foray/foray-core/pom.xml 2010-09-29 19:21:37 UTC (rev 11053)
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>org.axsl</groupId>
- <artifactId>axsl-text</artifactId>
+ <artifactId>axsl-linebreak</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-text/pom.xml
===================================================================
--- trunk/foray/foray-text/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
+++ trunk/foray/foray-text/pom.xml 2010-09-29 19:21:37 UTC (rev 11053)
@@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>org.axsl</groupId>
- <artifactId>axsl-text</artifactId>
+ <artifactId>axsl-linebreak</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-29 21:36:19
|
Revision: 11055
http://foray.svn.sourceforge.net/foray/?rev=11055&view=rev
Author: victormote
Date: 2010-09-29 21:36:13 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Rename project foray-text to foray-linebreak.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-app/pom.xml
trunk/foray/foray-text/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-09-29 20:04:14 UTC (rev 11054)
+++ trunk/foray/foray-all/pom.xml 2010-09-29 21:36:13 UTC (rev 11055)
@@ -464,7 +464,7 @@
</dependency>
<dependency>
<groupId>org.foray</groupId>
- <artifactId>foray-text</artifactId>
+ <artifactId>foray-linebreak</artifactId>
<version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
@@ -585,6 +585,7 @@
<module>../foray-graphic</module>
<module>../foray-hyphen</module>
<module>../foray-layout</module>
+ <module>../foray-linebreak</module>
<module>../foray-mif</module>
<module>../foray-output</module>
<module>../foray-pdf</module>
@@ -592,7 +593,6 @@
<module>../foray-ps</module>
<module>../foray-render</module>
<module>../foray-speech</module>
- <module>../foray-text</module>
<module>../foray-xml</module>
</modules>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2010-09-29 20:04:14 UTC (rev 11054)
+++ trunk/foray/foray-app/pom.xml 2010-09-29 21:36:13 UTC (rev 11055)
@@ -167,7 +167,7 @@
</dependency>
<dependency>
<groupId>org.foray</groupId>
- <artifactId>foray-text</artifactId>
+ <artifactId>foray-linebreak</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-text/pom.xml
===================================================================
--- trunk/foray/foray-text/pom.xml 2010-09-29 20:04:14 UTC (rev 11054)
+++ trunk/foray/foray-text/pom.xml 2010-09-29 21:36:13 UTC (rev 11055)
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.foray</groupId>
- <artifactId>foray-text</artifactId>
+ <artifactId>foray-linebreak</artifactId>
<packaging>jar</packaging>
@@ -16,7 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
- <name>foray-text</name>
+ <name>foray-linebreak</name>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X