xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spepp...@apache.org
Subject svn commit: r964711 [1/3] - in /xmlgraphics/fop/trunk: ./ src/documentation/ src/documentation/content/ src/documentation/content/xdocs/ src/documentation/content/xdocs/0.94/ src/documentation/content/xdocs/1.0/ src/documentation/content/xdocs/1.0/fotr...
Date Fri, 16 Jul 2010 08:33:39 GMT
Author: spepping
Date: Fri Jul 16 08:33:38 2010
New Revision: 964711

URL: http://svn.apache.org/viewvc?rev=964711&view=rev
Log:
Merging branches/fop-1_0 back into trunk

Added:
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/
      - copied from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/accessibility.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/accessibility.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/anttask.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/anttask.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/compiling.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/compiling.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/configuration.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/configuration.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/embedding.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/embedding.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/events.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/events.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/extensions.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/extensions.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/fonts.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/fonts.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/fotree/
      - copied from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/fotree/
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/fotree/disabled-testcases.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/fotree/disabled-testcases.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/graphics.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/graphics.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/hyphenation.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/hyphenation.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/index.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/index.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/intermediate.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/intermediate.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/known-issues.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/known-issues.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/knownissues_overview.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/knownissues_overview.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/layoutengine/
      - copied from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/layoutengine/
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/layoutengine/disabled-testcases.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/layoutengine/disabled-testcases.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/metadata.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/metadata.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/output.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/output.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/pdfa.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/pdfa.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/pdfencryption.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/pdfencryption.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/pdfx.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/pdfx.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/running.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/running.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/servlets.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/servlets.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.0/upgrading.xml
      - copied unchanged from r964707, xmlgraphics/fop/branches/fop-1_0/src/documentation/content/xdocs/1.0/upgrading.xml
Removed:
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.94/
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/relnotes.xml
Modified:
    xmlgraphics/fop/trunk/   (props changed)
    xmlgraphics/fop/trunk/NOTICE
    xmlgraphics/fop/trunk/README
    xmlgraphics/fop/trunk/build.xml
    xmlgraphics/fop/trunk/fop.bat
    xmlgraphics/fop/trunk/src/documentation/content/.htaccess
    xmlgraphics/fop/trunk/src/documentation/content/doap.rdf
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/compliance.ihtml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/dev/release.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/download.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/examples.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/faq.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/fo.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/index.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/maillist.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/news-data.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/quickstartguide.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/resources.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/site.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/status.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/tabs.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/fonts.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/graphics.xml
    xmlgraphics/fop/trunk/src/documentation/skinconf.xml
    xmlgraphics/fop/trunk/status.xml

Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 16 08:33:38 2010
@@ -11,3 +11,6 @@ dist-bin
 dist-src
 work
 .fbprefs
+fop*.zip
+fop*.gz
+fop*-bundle.jar

Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 08:33:38 2010
@@ -1,3 +1,3 @@
 /xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:603620-746655
 /xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
-/xmlgraphics/fop/branches/fop-1_0:960619
+/xmlgraphics/fop/branches/fop-1_0:959975-964707

Modified: xmlgraphics/fop/trunk/NOTICE
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/NOTICE?rev=964711&r1=964710&r2=964711&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/NOTICE (original)
+++ xmlgraphics/fop/trunk/NOTICE Fri Jul 16 08:33:38 2010
@@ -1,5 +1,5 @@
 Apache FOP
-Copyright 1999-2009 The Apache Software Foundation
+Copyright 1999-2010 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: xmlgraphics/fop/trunk/README
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/README?rev=964711&r1=964710&r2=964711&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/README (original)
+++ xmlgraphics/fop/trunk/README Fri Jul 16 08:33:38 2010
@@ -47,7 +47,10 @@ License version 2.0:
   Info: src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt
 - K3 3 of 9 barcode font (TrueType)
   File: examples/fo/advanced/K3.TTF
-  Info: example/fo/advanced/K3.README
+  Info: examples/fo/advanced/K3.README
+- DejaVu LGC Serif font (TrueType)
+  File: test/resources/fonts/DejaVuLGCSerif.ttf
+  Info: test/resources/fonts/DejaVuLGCSerif.LICENSE
 
     
 Where to get help?
@@ -90,6 +93,54 @@ http://xmlgraphics.apache.org/fop/stable
   RELEASE NOTES
 ==============================================================================
 
+Version 1.0
+===========
+
+This is a production grade release of Apache FOP.
+It contains many bug fixes and new features. See below for details.
+
+Compliance
+----------
+
+This release implements the XSL 1.0 and 1.1 recommendations to a high
+degree of compliance. See the compliance page
+http://xmlgraphics.apache.org/fop/compliance.html for a detailed
+overview.
+
+Known issues
+------------
+
+The known issues of this release are listed at
+http://xmlgraphics.apache.org/fop/1.0/knownissues_overview.html.
+
+Major Changes in Version 1.0
+----------------------------
+
+* Added support for addressing all glyphs available in a Type 1 font
+* Added support for auto-configuring TrueType Collections. XML font
+  metrics files for *.ttc fonts are not required anymore.
+* Added support for rendering pages using Java Printing System.
+* Support character-by-character font-selection strategy on
+  fo:character element.
+* Implemented word-by-ford font-selection strategy on text.
+* AFP Output: Various enhancements
+* FOP now creates ToUnicode CMaps for single-byte fonts that don't use
+  built-in encodings
+* Introduced a new, additional intermediate format optimized for
+  performance. See the intermediate format documentation for details.
+* Added an initial set of extensions for prepress support.
+* Added limited support for different page widths within a page-sequence.
+* Added support for TrueType fonts with symbol character maps (like
+  "Wingdings" and "Symbol").
+* Added an event handling framework which allows to get better feedback
+  from within FOP with the ability to customize problem management.
+
+The long list of changes in this release is available at
+http://xmlgraphics.apache.org/fop/1.0/changes_1.0.html.
+
+The long list of changes in this and earlier releases is available at
+http://xmlgraphics.apache.org/fop/changes.html.
+
 Version 0.95
 ============
 

Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=964711&r1=964710&r2=964711&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Fri Jul 16 08:33:38 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>
@@ -344,7 +355,7 @@ list of possible build targets.
       <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">
@@ -718,7 +729,7 @@ list of possible build targets.
       <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>
@@ -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}"/>
@@ -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,11 +1135,11 @@ 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.0.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"/>
+    <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"
classpathref="libs-tools-build-classpath"/>
     <checkstyle config="checkstyle-5.0.xml" failonviolation="false">
       <fileset dir="${src.java.dir}" includes="**/*.java"/>
       <formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/>
@@ -1142,7 +1153,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 +1171,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">
@@ -1298,6 +1309,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 +1380,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/trunk/fop.bat
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop.bat?rev=964711&r1=964710&r2=964711&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop.bat (original)
+++ xmlgraphics/fop/trunk/fop.bat Fri Jul 16 08:33:38 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%

Modified: xmlgraphics/fop/trunk/src/documentation/content/.htaccess
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/.htaccess?rev=964711&r1=964710&r2=964711&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/.htaccess (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/.htaccess Fri Jul 16 08:33:38 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/trunk/src/documentation/content/doap.rdf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/doap.rdf?rev=964711&r1=964710&r2=964711&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/doap.rdf (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/doap.rdf Fri Jul 16 08:33:38 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-31</created>
+        <revision>1.0</revision>
       </Version>
     </release>
     <repository>



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message