Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/build.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/build.xml?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/build.xml (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/build.xml Wed Aug 25 16:49:26 2010 @@ -57,7 +57,6 @@ list of possible build targets. <property file="${basedir}/build-local.properties"/> <property file="${basedir}/build.properties"/> <property environment="env"/> - <property name="build.lib.dir" value="${basedir}/lib/build"/> <fileset dir="${basedir}" id="dist.bin"> <include name="conf/**"/> <include name="examples/**"/> @@ -85,12 +84,22 @@ list of possible build targets. <include name="lib/xml-apis*"/> </patternset> </fileset> + <patternset id="dist.src.lib.tools"> + <include name="lib/build/asm*"/> + <include name="lib/build/backport-util-concurrent*"/> + <include name="lib/build/jaxen*"/> + <include name="lib/build/pmd*"/> + <include name="lib/build/qdox*"/> + <include name="lib/build/retroweaver*"/> + <include name="lib/build/xmlunit*"/> + </patternset> <fileset dir="${basedir}" id="dist.src"> <include name="src/**"/> <include name="conf/**"/> <include name="hyph/hyphenation.dtd"/> <include name="hyph/readme"/> <patternset refid="dist.lib"/> + <patternset refid="dist.src.lib.tools"/> <include name="lib/servlet*"/> <include name="test/**"/> <include name="examples/**"/> @@ -103,6 +112,8 @@ list of possible build targets. <include name="build.*"/> <include name="forrest.properties"/> <include name="fop.bat"/> + <include name="fop.cmd"/> + <include name="fop.js"/> <include name="fop"/> </fileset> <path id="libs-build-classpath"> @@ -110,10 +121,10 @@ list of possible build targets. <include name="*.jar"/> </fileset> </path> - <property name="lib-build-tools" value="${basedir}/lib/build"/> - <path id="libs-build-tools-classpath"> + <property name="lib-tools" value="${basedir}/lib/build"/> + <path id="libs-tools-build-classpath"> <path refid="libs-build-classpath"/> - <fileset dir="${lib-build-tools}"> + <fileset dir="${lib-tools}"> <include name="*.jar"/> </fileset> </path> @@ -134,7 +145,7 @@ list of possible build targets. <property name="name" value="fop"/> <property name="NAME" value="FOP"/> <property name="version" value="svn-trunk"/> - <property name="year" value="1999-2009"/> + <property name="year" value="1999-2010"/> <property name="javac.debug" value="on"/> <property name="javac.optimize" value="off"/> <property name="javac.deprecation" value="on"/> @@ -226,7 +237,7 @@ list of possible build targets. <echo message="${jce.message}"/> <available property="jdk14.present" classname="java.lang.CharSequence"/> <fail message="${Name} requires at least Java 1.4!" unless="jdk14.present"/> - <available property="junit.present" classname="junit.framework.TestCase" classpathref="libs-build-tools-classpath"/> + <available property="junit.present" classname="junit.framework.TestCase" classpathref="libs-tools-build-classpath"/> <condition property="junit.message" value="JUnit Support PRESENT"> <equals arg1="${junit.present}" arg2="true"/> </condition> @@ -238,7 +249,7 @@ list of possible build targets. <echo message="${junit.message}"/> <condition property="xmlunit.present"> <and> - <available classname="org.custommonkey.xmlunit.XMLTestCase" classpathref="libs-build-tools-classpath"/> + <available classname="org.custommonkey.xmlunit.XMLTestCase" classpathref="libs-tools-build-classpath"/> <isset property="junit.present"/> </and> </condition> @@ -319,7 +330,7 @@ list of possible build targets. <target name="compile-java" depends="init, codegen"> <!-- create directories --> <mkdir dir="${build.classes.dir}"/> - <javac destdir="${build.classes.dir}" fork="${javac.fork}" debug="${javac.debug}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" source="${javac.source}" target="${javac.target}"> + <javac destdir="${build.classes.dir}" fork="${javac.fork}" debug="${javac.debug}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" source="${javac.source}" target="${javac.target}" includeAntRuntime="true"> <src path="${build.gensrc.dir}"/> <src path="${src.java.dir}"/> <patternset includes="**/*.java"/> @@ -328,7 +339,7 @@ list of possible build targets. <classpath refid="libs-build-classpath"/> </javac> <mkdir dir="${build.sandbox-classes.dir}"/> - <javac destdir="${build.sandbox-classes.dir}" fork="${javac.fork}" debug="${javac.debug}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" source="${javac.source}" target="${javac.target}"> + <javac destdir="${build.sandbox-classes.dir}" fork="${javac.fork}" debug="${javac.debug}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" source="${javac.source}" target="${javac.target}" includeAntRuntime="true"> <src path="${src.sandbox.dir}"/> <patternset includes="**/*.java"/> <patternset refid="exclude-jai"/> @@ -340,11 +351,11 @@ list of possible build targets. </target> <target name="resourcegen" depends="compile-java"> <mkdir dir="${build.codegen-classes.dir}"/> - <javac destdir="${build.codegen-classes.dir}" fork="${javac.fork}" debug="${javac.debug}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" source="${javac.source}" target="${javac.target}"> + <javac destdir="${build.codegen-classes.dir}" fork="${javac.fork}" debug="${javac.debug}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" source="${javac.source}" target="${javac.target}" includeAntRuntime="true"> <src path="${src.codegen.dir}/java"/> <patternset includes="**/*.java"/> <classpath> - <path refid="libs-build-tools-classpath"/> + <path refid="libs-tools-build-classpath"/> <pathelement location="${build.classes.dir}"/> </classpath> </javac> @@ -355,7 +366,7 @@ list of possible build targets. </copy> <taskdef name="eventResourceGenerator" classname="org.apache.fop.tools.EventProducerCollectorTask"> <classpath> - <path refid="libs-build-tools-classpath"/> + <path refid="libs-tools-build-classpath"/> <pathelement location="${build.classes.dir}"/> <pathelement location="${build.codegen-classes.dir}"/> </classpath> @@ -472,7 +483,7 @@ list of possible build targets. <target name="retro-avail" depends="compile" if="java14.rt.lib"> <taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask"> <classpath> - <path refid="libs-build-tools-classpath"/> + <path refid="libs-tools-build-classpath"/> </classpath> </taskdef> <path id="verify-classpath"> @@ -483,7 +494,7 @@ list of possible build targets. </path> <!-- If we decide to use retroweaver for the actual weaving, the mkdir and destdir= will have to be removed. Also, the weaving task would additionally - need to be defined even if no jdk 14 is available. --> + need to be defined even if no jdk 14 is available. --> <mkdir dir="${build.dir}/temp"/> <retroweaver srcdir="${build.classes.dir}" destdir="${build.dir}/temp" classpath="${toString:verify-classpath}" lazy="false" @@ -509,7 +520,6 @@ list of possible build targets. <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}"> <manifest> <attribute name="Main-Class" value="org.apache.fop.cli.Main"/> - <attribute name="Class-Path" value="${manifest.classpath}"/> <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/> <section name="org/apache/fop/"> <attribute name="Specification-Title" value="XSL-FO - Extensible Stylesheet Language"/> @@ -714,11 +724,11 @@ list of possible build targets. <mkdir dir="${build.dir}/test-classes"/> <mkdir dir="${build.dir}/test-gensrc"/> <mkdir dir="${junit.reports.dir}"/> - <javac destdir="${build.dir}/test-classes" fork="${javac.fork}" debug="${javac.debug}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" source="${javac.source}" target="${javac.target}"> + <javac destdir="${build.dir}/test-classes" fork="${javac.fork}" debug="${javac.debug}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" source="${javac.source}" target="${javac.target}" includeAntRuntime="true"> <src path="${test.dir}/java"/> <patternset refid="test-sources"/> <classpath> - <path refid="libs-build-tools-classpath"/> + <path refid="libs-tools-build-classpath"/> <fileset dir="${build.dir}"> <include name="fop.jar"/> </fileset> @@ -796,6 +806,7 @@ list of possible build targets. <target name="junit-userconfig" depends="junit-compile" if="junit.present" description="Runs FOP's user config JUnit tests"> <echo message="Running user config tests"/> <junit dir="${basedir}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" errorproperty="fop.junit.error" failureproperty="fop.junit.failure"> + <jvmarg value="-Xmx1024m"/> <sysproperty key="basedir" value="${basedir}"/> <sysproperty key="jawa.awt.headless" value="true"/> <sysproperty key="fop.layoutengine.disabled" value="${layoutengine.disabled}"/> @@ -917,7 +928,7 @@ list of possible build targets. <formatter type="xml" usefile="true"/> <classpath> <pathelement location="${build.dir}/test-classes"/> - <path refid="libs-build-tools-classpath"/> + <path refid="libs-tools-build-classpath"/> <pathelement location="${build.dir}/fop.jar"/> </classpath> <test name="@{testsuite}" todir="${junit.reports.dir}" outfile="@{outfile}"/> @@ -1034,7 +1045,7 @@ NOTE: <pathelement path="${src.sandbox.dir}"/> <pathelement path="${build.gensrc.dir}"/> </sourcepath> - <tag name="todo" scope="all" description="To do:"/> + <tag name="asf.todo" scope="all" description="To do:"/> <tag name="event.severity" scope="all" description="Event severity level:"/> <group title="Control and Startup"> <package name="org.apache.fop"/> @@ -1116,7 +1127,7 @@ NOTE: <and> <available classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> <classpath> - <path refid="libs-build-tools-classpath"/> + <path refid="libs-tools-build-classpath"/> </classpath> </available> <available file="${checkstyle.noframes.xslt}"/> @@ -1124,13 +1135,20 @@ NOTE: </condition> <target name="checkstyle-avail" unless="checkstyle.avail"> <echo message="Checkstyle support NOT present. Please download it from http://checkstyle.sf.net/ and"/> - <echo message="..copy or link checkstyle-all-5.0.jar to ${lib-build-tools}"/> + <echo message="..copy or link checkstyle-all-5.1.jar to ${lib-tools}"/> <echo message="..copy or link checkstyle-noframes.xsl to ${checkstyle.noframes.xslt}"/> </target> - <target name="checkstyle" depends="init, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report"> - <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="libs-build-tools-classpath"/> - <checkstyle config="checkstyle-5.0.xml" failonviolation="false"> - <fileset dir="${src.java.dir}" includes="**/*.java"/> + <target name="checkstyle" depends="package, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report"> + <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="libs-tools-build-classpath"/> + <mkdir dir="${build.dir}"/> + <checkstyle config="checkstyle-5.1.xml" failonviolation="false"> + <classpath> + <path refid="libs-build-classpath"/> + <pathelement location="${build.classes.dir}"/> + <pathelement location="${build.sandbox-classes.dir}"/> + <pathelement location="${build.codegen-classes.dir}"/> + </classpath> + <fileset dir="${src.dir}" includes="**/*.java"/> <formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/> </checkstyle> <xslt in="${build.dir}/report_checkstyle.xml" out="${build.dir}/report_checkstyle.html" style="${checkstyle.noframes.xslt}"/> @@ -1142,7 +1160,7 @@ NOTE: <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"> <classpath> <path refid="libs-build-classpath"/> - <path refid="libs-build-tools-classpath"/> + <path refid="libs-tools-build-classpath"/> </classpath> </taskdef> <pmd shortFilenames="true" targetjdk="${javac.target}"> @@ -1160,7 +1178,7 @@ NOTE: <taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask"> <classpath> <path refid="libs-build-classpath"/> - <path refid="libs-build-tools-classpath"/> + <path refid="libs-tools-build-classpath"/> </classpath> </taskdef> <cpd minimumTokenCount="100" outputFile="${build.dir}/report_cpd.txt"> @@ -1172,22 +1190,62 @@ NOTE: <!-- =================================================================== --> <!-- Findbugs --> <!-- =================================================================== --> - <property name="findbugs.lib" value="${findbugs.home.dir}/lib"/> - <path id="libs-findbugs"> - <fileset dir="${findbugs.lib}"> - <include name="*.jar"/> - </fileset> - </path> - <target name="findbugs-avail" unless="findbugs.home.dir"> - <echo message="Findbugs Support NOT Present. Please download it from http://findbugs.sf.net/ and set findbugs.home.dir in build-local.properties"/> + <target name="findbugs-maybe-describe-install" unless="findbugs.present"> + <echo message="Please download FINDBUGS from http://findbugs.sf.net/ and set property findbugs.home.dir"/> + <echo message="in build-local.properties to the top-level directory of the binary distribution."/> + </target> + <target name="findbugs-avail"> + <condition property="findbugs.present"> + <and> + <isset property="findbugs.home.dir"/> + <available file="${findbugs.home.dir}" type="dir"/> + </and> + </condition> + <condition property="findbugs.message" value="FINDBUGS Support PRESENT"> + <equals arg1="${findbugs.present}" arg2="true"/> + </condition> + <condition property="findbugs.message" value="FINDBUGS Support NOT Present"> + <not> + <equals arg1="${findbugs.present}" arg2="true"/> + </not> + </condition> + <echo message="${findbugs.message}"/> + <antcall target="findbugs-maybe-describe-install"/> </target> - <target name="findbugs" depends="init, findbugs-avail, compile-java" if="findbugs.home.dir"> - <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="libs-findbugs"/> - <findbugs home="${findbugs.home.dir}" output="html" reportLevel="low" effort="max" outputFile="${build.dir}/report_findbugs.html" jvmargs="-Xmx1024m"> + <target name="findbugs-exec" depends="compile-java" if="findbugs.present"> + <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"> + <classpath> + <fileset dir="${findbugs.home.dir}/lib"> + <include name="*.jar"/> + </fileset> + </classpath> + </taskdef> + <findbugs home="${findbugs.home.dir}" output="${findbugs.output.format}" reportLevel="low" effort="max" + outputFile="${build.dir}/report_findbugs.${findbugs.output.extension}" excludeFilter="findbugs-exclude.xml" jvmargs="-Xmx1024m"> <sourcePath path="${src.java.dir}"/> <class location="${build.classes.dir}"/> + <auxClasspath> + <path refid="libs-build-classpath"/> + <path> + <fileset dir="${ant.library.dir}"> + <include name="ant.jar"/> + <include name="ant-launcher.jar"/> + </fileset> + </path> + </auxClasspath> </findbugs> </target> + <target name="findbugs-xml" depends="findbugs-avail" if="findbugs.present" description="Runs findbugs for a code quality report in XML"> + <property name="findbugs.output.format" value="xml"/> + <property name="findbugs.output.extension" value="xml"/> + <antcall target="findbugs-exec"/> + </target> + <target name="findbugs-html" depends="findbugs-avail" if="findbugs.present" description="Runs findbugs for a code quality report in HTML"> + <property name="findbugs.output.format" value="html"/> + <property name="findbugs.output.extension" value="html"/> + <antcall target="findbugs-exec"/> + </target> + <target name="findbugs" depends="findbugs-html" description="Runs findbugs for a code quality report in HTML"/> <!-- =================================================================== --> <!-- Creates the reports --> <!-- =================================================================== --> @@ -1197,21 +1255,18 @@ NOTE: <!-- =================================================================== --> <target name="docs" description="Generates documentation"> <echo message="Building documentation with Forrest..."/> -<!-- - <echo message="Make sure that you have installed Apache Forrest and"/> - <echo message="the FORREST_HOME environment variable is set (see http://forrest.apache.org/)"/> - <echo message="FORREST_HOME = ${forrest.home}"/> - --> + <echo message="FORREST_HOME = ${env.FORREST_HOME}"/> <echo message="Make sure you have a proper Forrest installation (see http://forrest.apache.org/)"/> <condition property="forrest.call" value="forrest.bat" else="forrest"> <os family="windows"/> </condition> - <exec executable="${forrest.call}"/> + <exec executable="${env.FORREST_HOME}/bin/${forrest.call}"/> </target> <!-- =================================================================== --> <!-- Creates the distribution --> <!-- =================================================================== --> - <target name="dist" depends="dist-prereq,dist-src,dist-bin" description="Generates the distribution package"/> +<!-- It would be better to make dist depend on distclean. But as long as the forrest projectInfo plugin depends on a higher Java version (1.5) than we use for the compilation (1.4), leaving it out enables a workaround --> + <target name="dist" depends="dist-prereq,dist-src,dist-bin,maven-artifacts" description="Generates the distribution package"/> <target name="dist-prereq" depends="init,dist-get-jai"> <fail message="A complete binary build requires JAI" unless="jai.present"/> <fail message="A complete binary build requires JCE" unless="jce.present"/> @@ -1259,7 +1314,7 @@ NOTE: <gzip zipfile="${name}-${version}-bin.tar.gz" src="${name}-${version}-bin.tar"/> <delete file="${name}-${version}-bin.tar"/> </target> - <target name="dist-src" depends="all"> + <target name="dist-src"> <echo message="Building the source distribution files (zip,tar)"/> <mkdir dir="${dist.src.result.dir}"/> <copy todir="${dist.src.result.dir}"> @@ -1298,6 +1353,7 @@ NOTE: <fileset dir="${build.dir}/maven"/> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> </jar> + <move file="${build.dir}/${name}-${version}-bundle.jar" todir="${basedir}"/> </target> <!-- =================================================================== --> <!-- Generate examples --> @@ -1368,6 +1424,7 @@ NOTE: <delete> <fileset dir="${basedir}" includes="${name}-*.tar.gz"/> <fileset dir="${basedir}" includes="${name}-*.zip"/> + <fileset dir="${basedir}" includes="${name}-bundle.jar"/> </delete> </target> <target name="validate-xdocs" description="Validate the xdocs. Point schemas.dir to Forrest's 'schemas' directory.">
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/PlanHints.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/PlanHints.java?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/PlanHints.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/PlanHints.java Wed Aug 25 16:49:26 2010 @@ -25,22 +25,22 @@ package org.apache.fop.plan; public interface PlanHints { /** Border attribute */ - public static final String PLAN_BORDER = "border"; + String PLAN_BORDER = "border"; /** Legend attribute */ - public static final String PLAN_LEGEND = "legend"; + String PLAN_LEGEND = "legend"; /** Font family attribute */ - public static final String FONT_FAMILY = "font-family"; + String FONT_FAMILY = "font-family"; /** Font size attribute */ - public static final String FONT_SIZE = "font-size"; + String FONT_SIZE = "font-size"; /** Legent type attribute */ - public static final String LEGEND_TYPE = "legendType"; + String LEGEND_TYPE = "legendType"; /** Locale attribute */ - public static final String LOCALE = "locale"; + String LOCALE = "locale"; /** Label type attribute */ - public static final String LABEL_TYPE = "labelType"; + String LABEL_TYPE = "labelType"; /** Label font size attribute */ - public static final String LABEL_FONT_SIZE = "labelFontSize"; + String LABEL_FONT_SIZE = "labelFontSize"; /** Label font attribute */ - public static final String LABEL_FONT = "labelFont"; + String LABEL_FONT = "labelFont"; } Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/PlanRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/PlanRenderer.java?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/PlanRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/PlanRenderer.java Wed Aug 25 16:49:26 2010 @@ -109,8 +109,8 @@ public class PlanRenderer { hints.put(PlanHints.FONT_FAMILY, fontFamily); hints.put(PlanHints.FONT_SIZE, new Float(fontSize)); hints.put(PlanHints.LOCALE, locale); - Document doc = - planDrawer.createDocument(data, width, height, hints); + Document doc + = planDrawer.createDocument(data, width, height, hints); return doc; } @@ -152,6 +152,7 @@ public class PlanRenderer { } else if (t.equals("grouping")) { data.setType(ActionInfo.GROUPING); } else { + throw new IllegalArgumentException("Unknown action type: " + t); } for (int i = 0; i < childs.getLength(); i++) { Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java Wed Aug 25 16:49:26 2010 @@ -243,8 +243,8 @@ public class SimplePlanDrawer implements - lastWeek.getTime() + 43200000) / 86400000); int days = (int)((end.getTime() - start.getTime() + 43200000) / 86400000); - int daysFromEnd = - (int)((future.getTime() - end.getTime() + int daysFromEnd + = (int)((future.getTime() - end.getTime() + 43200000) / 86400000); Element taskGraphic; switch (type) { @@ -299,8 +299,8 @@ public class SimplePlanDrawer implements topEdge = lastTop; } } - int currentDays = - (int)((currentDate.getTime() - lastWeek.getTime() + int currentDays + = (int)((currentDate.getTime() - lastWeek.getTime() + 43200000) / 86400000); text = SVGUtilities.createText(doc, Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.bat URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.bat?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.bat (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.bat Wed Aug 25 16:49:26 2010 @@ -13,6 +13,7 @@ REM distributed under the License is di REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. REM See the License for the specific language governing permissions and REM limitations under the License. +REM $Id$ rem %~dp0 is the expanded pathname of the current script under NT set LOCAL_FOP_HOME= @@ -61,7 +62,7 @@ set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIB set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.7.0.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\serializer-2.7.0.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik-all-1.7.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xmlgraphics-commons-1.4svn.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xmlgraphics-commons-1.4.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-4.2.0.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-io-1.3.1.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-logging-1.0.4.jar @@ -80,5 +81,5 @@ goto runFop if "%JAVACMD%" == "" set JAVACMD=java :runFop -rem ECHO "%JAVACMD%" +rem ECHO "%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS% "%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS% Added: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/lib/xmlgraphics-commons-1.5svn.jar URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/lib/xmlgraphics-commons-1.5svn.jar?rev=989216&view=auto ============================================================================== Binary file - no diff available. Propchange: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/lib/xmlgraphics-commons-1.5svn.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java Wed Aug 25 16:49:26 2010 @@ -117,6 +117,7 @@ public class EventProducerCollectorTask /** * Updates the translation file with new entries for newly found event producer methods. + * @param modelFile the model file to use * @throws IOException if an I/O error occurs */ protected void updateTranslationFile(File modelFile) throws IOException { Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/data/LineBreakPairTable.txt URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/data/LineBreakPairTable.txt?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/data/LineBreakPairTable.txt (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/data/LineBreakPairTable.txt Wed Aug 25 16:49:26 2010 @@ -1,28 +1,29 @@ - OP CL QU GL NS EX SY IS PR PO NU AL ID IN HY BA BB B2 ZW CM WJ H2 H3 JL JV JT -OP ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ @ ^ ^ ^ ^ ^ ^ -CL _ ^ % % ^ ^ ^ ^ % % % % _ _ % % _ _ ^ # ^ _ _ _ _ _ -QU ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % % -GL % ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % % -NS _ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _ -EX _ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _ -SY _ ^ % % % ^ ^ ^ _ _ % _ _ _ % % _ _ ^ # ^ _ _ _ _ _ -IS _ ^ % % % ^ ^ ^ _ _ % % _ _ % % _ _ ^ # ^ _ _ _ _ _ -PR % ^ % % % ^ ^ ^ _ _ % % % _ % % _ _ ^ # ^ % % % % % -PO % ^ % % % ^ ^ ^ _ _ % % _ _ % % _ _ ^ # ^ _ _ _ _ _ -NU % ^ % % % ^ ^ ^ % % % % _ % % % _ _ ^ # ^ _ _ _ _ _ -AL % ^ % % % ^ ^ ^ _ _ % % _ % % % _ _ ^ # ^ _ _ _ _ _ -ID _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ _ -IN _ ^ % % % ^ ^ ^ _ _ _ _ _ % % % _ _ ^ # ^ _ _ _ _ _ -HY _ ^ % % % ^ ^ ^ _ _ % _ _ _ % % _ _ ^ # ^ _ _ _ _ _ -BA _ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _ -BB % ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % % -B2 _ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ ^ ^ # ^ _ _ _ _ _ -ZW _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ^ _ _ _ _ _ _ _ -CM _ ^ % % % ^ ^ ^ _ _ % % _ % % % _ _ ^ # ^ _ _ _ _ _ -WJ % ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % % -H2 _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ % % -H3 _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ % -JL _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ % % % % _ -JV _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ % % -JT _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ % + OP CP CL QU GL NS EX SY IS PR PO NU AL ID IN HY BA BB B2 ZW CM WJ H2 H3 JL JV JT +OP ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ @ ^ ^ ^ ^ ^ ^ +CP _ ^ ^ % % ^ ^ ^ ^ % % % % _ _ % % _ _ ^ # ^ _ _ _ _ _ +CL _ ^ ^ % % ^ ^ ^ ^ % % % % _ _ % % _ _ ^ # ^ _ _ _ _ _ +QU ^ ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % % +GL % ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % % +NS _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _ +EX _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _ +SY _ ^ ^ % % % ^ ^ ^ _ _ % _ _ _ % % _ _ ^ # ^ _ _ _ _ _ +IS _ ^ ^ % % % ^ ^ ^ _ _ % % _ _ % % _ _ ^ # ^ _ _ _ _ _ +PR % ^ ^ % % % ^ ^ ^ _ _ % % % _ % % _ _ ^ # ^ % % % % % +PO % ^ ^ % % % ^ ^ ^ _ _ % % _ _ % % _ _ ^ # ^ _ _ _ _ _ +NU % ^ ^ % % % ^ ^ ^ % % % % _ % % % _ _ ^ # ^ _ _ _ _ _ +AL % ^ ^ % % % ^ ^ ^ _ _ % % _ % % % _ _ ^ # ^ _ _ _ _ _ +ID _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ _ +IN _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ % % % _ _ ^ # ^ _ _ _ _ _ +HY _ ^ ^ % % % ^ ^ ^ _ _ % _ _ _ % % _ _ ^ # ^ _ _ _ _ _ +BA _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _ +BB % ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % % +B2 _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ ^ ^ # ^ _ _ _ _ _ +ZW _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ^ _ _ _ _ _ _ _ +CM _ ^ ^ % % % ^ ^ ^ _ _ % % _ % % % _ _ ^ # ^ _ _ _ _ _ +WJ % ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % % +H2 _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ % % +H3 _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ % +JL _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ % % % % _ +JV _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ % % +JT _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ % Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java Wed Aug 25 16:49:26 2010 @@ -51,7 +51,8 @@ import org.apache.fop.util.License; */ public final class UnicodeClasses { - public static String UNICODE_DIR = "http://www.unicode.org/Public/UNIDATA/";; + /** directory containing unicode properties files */ + public static final String UNICODE_DIR = "http://www.unicode.org/Public/UNIDATA/";; /** * Disallow constructor for this utility class @@ -77,7 +78,7 @@ public final class UnicodeClasses { * Generate classes.xml from Java's compiled-in Unicode Character Database * @param hexcode whether to prefix each class with the hexcode (only for debugging purposes) * @param outfilePath output file - * @throws IOException + * @throws IOException if an I/O exception occurs */ public static void fromJava(boolean hexcode, String outfilePath) throws IOException { File f = new File(outfilePath); @@ -159,8 +160,7 @@ public final class UnicodeClasses { * @param unidataPath path to the directory with UCD files * @param outfilePath output file * @throws IOException if the input files are not found - * @throws URISyntaxException - * @throws FOPException + * @throws URISyntaxException if {...@code unidataPath} cannot be converted to a URI */ public static void fromUCD(boolean hexcode, String unidataPath, String outfilePath) throws IOException, URISyntaxException { @@ -286,7 +286,7 @@ public final class UnicodeClasses { * @param hexcode whether to prefix each class with the hexcode (only for debugging purposes) * @param lettersPath path to XeTeX's Unicode letters file unicode-letters-XeTeX.tex * @param outfilePath output file - * @throws IOException + * @throws IOException in case of an I/O exception */ public static void fromTeX(boolean hexcode, String lettersPath, String outfilePath) throws IOException { Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java Wed Aug 25 16:49:26 2010 @@ -33,6 +33,8 @@ import java.util.Map; import org.apache.fop.util.License; +// CSOFF: LineLengthCheck + /** * <p>Utility for generating a Java class representing line break properties * from the Unicode property files.</p> @@ -46,7 +48,10 @@ import org.apache.fop.util.License; * </ul> * */ -public class GenerateLineBreakUtils { +public final class GenerateLineBreakUtils { + + private GenerateLineBreakUtils() { + } private static final int MAX_LINE_LENGTH = 110; @@ -57,12 +62,14 @@ public class GenerateLineBreakUtils { private static final byte PROHIBITED_BREAK = 4; // ^ in table private static final byte EXPLICIT_BREAK = 5; // ! in rules private static final String BREAK_CLASS_TOKENS = "_...@^!"; - private static final String notInPairTable[] = { "AI", "BK", "CB", "CR", "LF", "NL", "SA", "SG", "SP", "XX" }; - - private static final byte lineBreakProperties[] = new byte[0x10000]; - private static final Map lineBreakPropertyValues = new HashMap(); - private static final List lineBreakPropertyShortNames = new ArrayList(); - private static final List lineBreakPropertyLongNames = new ArrayList(); + private static final String[] NOT_IN_PAIR_TABLE = { + "AI", "BK", "CB", "CR", "LF", "NL", "SA", "SG", "SP", "XX" + }; + + private static byte[] lineBreakProperties = new byte[0x10000]; + private static Map lineBreakPropertyValues = new HashMap(); + private static List lineBreakPropertyShortNames = new ArrayList(); + private static List lineBreakPropertyLongNames = new ArrayList(); /** * Generate a class managing line break properties for Unicode characters and a sample @@ -76,7 +83,7 @@ public class GenerateLineBreakUtils { * @param outFileName Name of the output file. * @throws Exception in case anything goes wrong. */ - private static void convertLineBreakProperties( + private static void convertLineBreakProperties( // CSOK: MethodLength String lineBreakFileName, String propertyValueFileName, String breakPairFileName, @@ -86,21 +93,21 @@ public class GenerateLineBreakUtils { readLineBreakProperties(lineBreakFileName, propertyValueFileName); // read break pair table int lineBreakPropertyValueCount = lineBreakPropertyValues.size(); - int tableSize = lineBreakPropertyValueCount - notInPairTable.length; - Map notInPairTableMap = new HashMap(notInPairTable.length); - for (int i = 0; i < notInPairTable.length; i++) { - Object v = lineBreakPropertyValues.get(notInPairTable[i]); + int tableSize = lineBreakPropertyValueCount - NOT_IN_PAIR_TABLE.length; + Map notInPairTableMap = new HashMap(NOT_IN_PAIR_TABLE.length); + for (int i = 0; i < NOT_IN_PAIR_TABLE.length; i++) { + Object v = lineBreakPropertyValues.get(NOT_IN_PAIR_TABLE[i]); if (v == null) { - throw new Exception("'not in pair table' property not found: " + notInPairTable[i]); + throw new Exception("'not in pair table' property not found: " + NOT_IN_PAIR_TABLE[i]); } - notInPairTableMap.put(notInPairTable[i], v); + notInPairTableMap.put(NOT_IN_PAIR_TABLE[i], v); } - byte pairTable[][] = new byte[tableSize][]; - byte columnHeader[] = new byte[tableSize]; - byte rowHeader[] = new byte[tableSize]; - byte columnMap[] = new byte[lineBreakPropertyValueCount + 1]; + byte[][] pairTable = new byte[tableSize][]; + byte[] columnHeader = new byte[tableSize]; + byte[] rowHeader = new byte[tableSize]; + byte[] columnMap = new byte[lineBreakPropertyValueCount + 1]; Arrays.fill(columnMap, (byte)255); - byte rowMap[] = new byte[lineBreakPropertyValueCount + 1]; + byte[] rowMap = new byte[lineBreakPropertyValueCount + 1]; Arrays.fill(rowMap, (byte)255); BufferedReader b = new BufferedReader(new FileReader(breakPairFileName)); String line = b.readLine(); @@ -224,7 +231,7 @@ public class GenerateLineBreakUtils { // generate class int rowsize = 512; int blocksize = lineBreakProperties.length / rowsize; - byte row[][] = new byte[rowsize][]; + byte[][] row = new byte[rowsize][]; int idx = 0; StringBuffer doStaticLinkCode = new StringBuffer(); PrintWriter out = new PrintWriter(new FileWriter(outFileName)); @@ -242,8 +249,15 @@ public class GenerateLineBreakUtils { out.println(" * - commit BOTH changed files"); out.println(" */"); out.println(); + out.println("// CSOFF: WhitespaceAfterCheck"); + out.println("// CSOFF: LineLengthCheck"); + out.println(); + out.println("/** Line breaking utilities. */"); out.println("public final class LineBreakUtils {"); out.println(); + out.println(" private LineBreakUtils() {"); + out.println(" }"); + out.println(); out.println(" /** Break class constant */"); out.println(" public static final byte DIRECT_BREAK = " + DIRECT_BREAK + ';'); out.println(" /** Break class constant */"); @@ -257,7 +271,7 @@ public class GenerateLineBreakUtils { out.println(" /** Break class constant */"); out.println(" public static final byte EXPLICIT_BREAK = " + EXPLICIT_BREAK + ';'); out.println(); - out.println(" private static final byte PAIR_TABLE[][] = {"); + out.println(" private static final byte[][] PAIR_TABLE = {"); boolean printComma = false; for (int i = 1; i <= lineBreakPropertyValueCount; i++) { if (printComma) { @@ -283,9 +297,9 @@ public class GenerateLineBreakUtils { } out.println("};"); out.println(); - out.println(" private static byte lineBreakProperties[][] = new byte[" + rowsize + "][];"); + out.println(" private static byte[][] lineBreakProperties = new byte[" + rowsize + "][];"); out.println(); - out.println(" private static void init_0() {"); + out.println(" private static void init0() {"); int rowsPrinted = 0; int initSections = 0; for (int i = 0; i < rowsize; i++) { @@ -315,7 +329,7 @@ public class GenerateLineBreakUtils { out.println(" }"); out.println(); initSections++; - out.println(" private static void init_" + initSections + "() {"); + out.println(" private static void init" + initSections + "() {"); rowsPrinted = 0; } row[i] = new byte[blocksize]; @@ -339,7 +353,7 @@ public class GenerateLineBreakUtils { out.println(); out.println(" static {"); for (int i = 0; i <= initSections; i++) { - out.println(" init_" + i + "();"); + out.println(" init" + i + "();"); } out.print(doStaticLinkCode); out.println(" }"); @@ -354,7 +368,7 @@ public class GenerateLineBreakUtils { out.println(';'); } out.println(); - final String shortNamePrefix = " private static String lineBreakPropertyShortNames[] = {"; + final String shortNamePrefix = " private static String[] lineBreakPropertyShortNames = {"; out.print(shortNamePrefix); int lineLength = shortNamePrefix.length(); printComma = false; @@ -383,7 +397,7 @@ public class GenerateLineBreakUtils { } out.println("};"); out.println(); - final String longNamePrefix = " private static String lineBreakPropertyLongNames[] = {"; + final String longNamePrefix = " private static String[] lineBreakPropertyLongNames = {"; out.print(longNamePrefix); lineLength = longNamePrefix.length(); printComma = false; @@ -600,11 +614,11 @@ public class GenerateLineBreakUtils { for (int i = 0; i < 16; i++) { int rowsize = 1 << i; int blocksize = lineBreakProperties.length / (rowsize); - byte row[][] = new byte[rowsize][]; + byte[][] row = new byte[rowsize][]; int idx = 0; int nrOfDistinctBlocks = 0; for (int j = 0; j < rowsize; j++) { - byte block[] = new byte[blocksize]; + byte[] block = new byte[blocksize]; for (int k = 0; k < blocksize; k++) { block[k] = lineBreakProperties[idx]; idx++; @@ -638,6 +652,10 @@ public class GenerateLineBreakUtils { } } + /** + * Main entry point for running GenerateLineBreakUtils + * @param args array of command line arg + */ public static void main(String[] args) { String lineBreakFileName = "http://www.unicode.org/Public/UNIDATA/LineBreak.txt";; String propertyValueFileName = "http://www.unicode.org/Public/UNIDATA/PropertyValueAliases.txt";; @@ -650,13 +668,13 @@ public class GenerateLineBreakUtils { } else { String opt = args[i]; if ("-l".equals(opt)) { - lineBreakFileName = args[i+1]; + lineBreakFileName = args[i + 1]; } else if ("-p".equals(opt)) { - propertyValueFileName = args[i+1]; + propertyValueFileName = args[i + 1]; } else if ("-b".equals(opt)) { - breakPairFileName = args[i+1]; - } else if("-o".equals(opt)) { - outFileName = args[i+1]; + breakPairFileName = args[i + 1]; + } else if ("-o".equals(opt)) { + outFileName = args[i + 1]; } else { ok = false; } Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/util/License.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/util/License.java?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/util/License.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/codegen/unicode/java/org/apache/fop/util/License.java Wed Aug 25 16:49:26 2010 @@ -29,10 +29,13 @@ import java.io.Writer; */ public final class License { + private License() { + } + /** * The Apache license text as a string array */ - public static final String[] license + public static final String[] LICENSE = {"Licensed to the Apache Software Foundation (ASF) under one or more", "contributor license agreements. See the NOTICE file distributed with", "this work for additional information regarding copyright ownership.", @@ -52,21 +55,21 @@ public final class License { /** * The subversion Id keyword line */ - public static final String id = "$Id$"; + public static final String ID = "$Id$"; /** * Calculate the maximum line length in the Apache license text * for use in formatting */ - private static int MAX_LENGTH; + private static int maxLength; static { int j = 0; - for (int i = 0; i < license.length; ++i) { - if (j < license[i].length()) { - j = license[i].length(); + for (int i = 0; i < LICENSE.length; ++i) { + if (j < LICENSE[i].length()) { + j = LICENSE[i].length(); } } - MAX_LENGTH = j; + maxLength = j; } /** @@ -76,16 +79,16 @@ public final class License { */ public static void writeJavaLicenseId(Writer w) throws IOException { w.write("/*\n"); - for (int i = 0; i < license.length; ++i) { - if (license[i].equals("")) { + for (int i = 0; i < LICENSE.length; ++i) { + if (LICENSE[i].equals("")) { w.write(" *\n"); } else { - w.write(" * " + license[i] + "\n"); + w.write(" * " + LICENSE[i] + "\n"); } } w.write(" */\n"); w.write("\n"); - w.write("/* " + id + " */\n"); + w.write("/* " + ID + " */\n"); } /** @@ -94,11 +97,11 @@ public final class License { * @throws IOException if the write operation fails */ public static void writeXMLLicenseId(Writer w) throws IOException { - for (int i = 0; i < license.length; ++i) { - w.write(String.format("<!-- %-" + MAX_LENGTH + "s -->\n", new Object[] {license[i]})); + for (int i = 0; i < LICENSE.length; ++i) { + w.write(String.format("<!-- %-" + maxLength + "s -->\n", new Object[] {LICENSE[i]})); } w.write("\n"); - w.write("<!-- " + id + " -->\n"); + w.write("<!-- " + ID + " -->\n"); } /** Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/.htaccess URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/.htaccess?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/.htaccess (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/.htaccess Wed Aug 25 16:49:26 2010 @@ -1,38 +1,39 @@ # redirect moved files -RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/0.95/anttask$1 -RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/0.95/compiling$1 -RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/0.95/configuration$1 -RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/0.95/embedding$1 -RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/0.95/extensions$1 -RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/0.95/fonts$1 -RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/0.95/graphics$1 -RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/0.95/hyphenation$1 -RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/0.95/intermediate$1 -RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/0.95/output$1 -RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/0.95/pdfa$1 -RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/0.95/pdfencryption$1 -RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/0.95/pdfx$1 -RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/0.95/running$1 -RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/0.95/servlets$1 -RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/0.95/upgrading$1 +RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/1.0/anttask$1 +RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/1.0/compiling$1 +RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/1.0/configuration$1 +RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/1.0/embedding$1 +RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/1.0/extensions$1 +RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/1.0/fonts$1 +RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/1.0/graphics$1 +RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/1.0/hyphenation$1 +RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/1.0/intermediate$1 +RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/1.0/output$1 +RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/1.0/pdfa$1 +RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/1.0/pdfencryption$1 +RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/1.0/pdfx$1 +RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/1.0/running$1 +RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/1.0/servlets$1 +RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/1.0/upgrading$1 # redirect to versioned documentation # Current stable release -Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/0.95 +Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/1.0 # Current unstable release (or trunk if no beta is the latest release) Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/trunk # Latest release -Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/0.95 -Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/0.95 +Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.0 +Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/1.0 # Previous stable release -Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.94 +Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.95 # Old releases -Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.94 -Redirect Temp /fop/0.90alpha1 http://xmlgraphics.apache.org/fop/0.94 -Redirect Temp /fop/0.91beta http://xmlgraphics.apache.org/fop/0.94 -Redirect Temp /fop/0.92beta http://xmlgraphics.apache.org/fop/0.94 -Redirect Temp /fop/0.93 http://xmlgraphics.apache.org/fop/0.94 +Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.95 +Redirect Temp /fop/0.90alpha1 http://xmlgraphics.apache.org/fop/0.95 +Redirect Temp /fop/0.91beta http://xmlgraphics.apache.org/fop/0.95 +Redirect Temp /fop/0.92beta http://xmlgraphics.apache.org/fop/0.95 +Redirect Temp /fop/0.93 http://xmlgraphics.apache.org/fop/0.95 +Redirect Temp /fop/0.94 http://xmlgraphics.apache.org/fop/0.95 Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/doap.rdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/doap.rdf?rev=989216&r1=989215&r2=989216&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/doap.rdf (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/doap.rdf Wed Aug 25 16:49:26 2010 @@ -77,22 +77,15 @@ <release> <Version> <name>Previous stable release</name> - <created>2007-08-23</created> - <revision>0.94</revision> - </Version> - </release> - <release> - <Version> - <name>Previous development release</name> - <created>2008-03-26</created> - <revision>0.95beta</revision> + <created>2008-08-05</created> + <revision>0.95</revision> </Version> </release> <release> <Version> <name>Latest stable release</name> - <created>2008-08-05</created> - <revision>0.95</revision> + <created>2010-07-21</created> + <revision>1.0</revision> </Version> </release> <repository> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
