xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r332575 - in /xmlgraphics/fop/trunk: ./ src/java/org/apache/fop/render/ src/sandbox/ src/sandbox/META-INF/ src/sandbox/META-INF/services/ src/sandbox/org/ src/sandbox/org/apache/ src/sandbox/org/apache/fop/ src/sandbox/org/apache/fop/render...
Date Fri, 11 Nov 2005 14:58:52 GMT
Author: jeremias
Date: Fri Nov 11 06:58:37 2005
New Revision: 332575

URL: http://svn.apache.org/viewcvs?rev=332575&view=rev
Log:
Step 1 (SVN just doesn't want me to delete the old directories):
Created sandbox area (src/sandbox).
Moved MIF, PCL and SVG support to the sandbox due to their current state.
Build adjusted to build a fop-sandbox.jar (the three moved renderers automatically get registered
if they are in the classpath).

Added:
    xmlgraphics/fop/trunk/src/sandbox/
    xmlgraphics/fop/trunk/src/sandbox/META-INF/
    xmlgraphics/fop/trunk/src/sandbox/META-INF/services/
    xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.FOEventHandler
    xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.Renderer
    xmlgraphics/fop/trunk/src/sandbox/org/
    xmlgraphics/fop/trunk/src/sandbox/org/apache/
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/
      - copied from r332551, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/mif/
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/pcl/
      - copied from r332551, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/
      - copied from r332551, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/svg/
Modified:
    xmlgraphics/fop/trunk/build.xml
    xmlgraphics/fop/trunk/fop
    xmlgraphics/fop/trunk/fop.bat
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java

Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/build.xml?rev=332575&r1=332574&r2=332575&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Fri Nov 11 06:58:37 2005
@@ -164,6 +164,7 @@
   <property name="src.dir" value="${basedir}/src"/>
   <property name="src.codegen.dir" value="${src.dir}/codegen"/>
   <property name="src.java.dir" value="${src.dir}/java"/>
+  <property name="src.sandbox.dir" value="${src.dir}/sandbox"/>
   <property name="src.viewer.resources.dir" value="${src.java.dir}/org/apache/fop/render/awt/viewer/resources"/>
   <property name="src.viewer.images.dir" value="${src.java.dir}/org/apache/fop/render/awt/viewer/images"/>
   <property name="xdocs.dir" value="${src.dir}/documentation/content/xdocs"/>
@@ -174,6 +175,7 @@
   <property name="build.dir" value="${basedir}/build"/>
   <property name="build.gensrc.dir" value="${build.dir}/gensrc"/>
   <property name="build.classes.dir" value="${build.dir}/classes"/>
+  <property name="build.sandbox-classes.dir" value="${build.dir}/sandbox-classes"/>
   <property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
   <property name="build.examples.dir" value="${build.dir}/examples"/>
 
@@ -383,6 +385,23 @@
     <copy todir="${build.viewer.images.dir}">
       <fileset dir="${src.viewer.images.dir}"/>
     </copy>
+
+    <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}">
+      <src path="${src.sandbox.dir}"/>
+      <patternset includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <pathelement location="${build.classes.dir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${build.sandbox-classes.dir}">
+      <fileset dir="${src.sandbox.dir}">
+        <include name="META-INF/**"/>
+      </fileset>
+    </copy>
   </target>
 
 
@@ -433,16 +452,9 @@
     <tstamp>
       <format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
     </tstamp>
-    <pathconvert property="manifest-classpath" dirsep="/" pathsep=" " refid="libs-run-classpath">
-      <map from="${basedir}${file.separator}lib${file.separator}" to=""/>
-      <map from="${basedir}${file.separator}build${file.separator}fop.jar" to=""/>
-      <map from="${optional.lib.dir}${file.separator}" to=""/>
-    </pathconvert>
-
     <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}" includes="org/**">
       <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}])"/>
         <section name="org/apache/fop/">
           <attribute name="Specification-Title" value="XSL-FO - Extensible Stylesheet
Language"/>
@@ -458,10 +470,27 @@
     </jar>
   </target>
 
+  <target name="uptodate-jar-sandbox" depends="compile-java">
+    <uptodate property="jar.sandbox.uptodate" targetfile="${build.dir}/fop-sandbox.jar">
+      <srcfiles dir= "${build.sandbox-classes.dir}"/>
+    </uptodate>
+  </target>
+
+  <target name="jar-sandbox" depends="compile-java,uptodate-jar-sandbox" description="Generates
the sandbox jar file" unless="jar.sandbox.uptodate">
+    <tstamp>
+      <format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
+    </tstamp>
+    <jar jarfile="${build.dir}/fop-sandbox.jar" basedir="${build.sandbox-classes.dir}">
+      <manifest>
+        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version}
${os.arch}, Java ${java.runtime.version}])"/>
+      </manifest>
+    </jar>
+  </target>
+
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="jar-main,jar-hyphenation" description="Generates the
jar files"/>
+  <target name="package" depends="jar-main,jar-hyphenation,jar-sandbox" description="Generates
the jar files"/>
   
   <target name="servlet" depends="package" description="Generates the WAR with the sample
FOP servlet">
     <echo message="Creating the WAR file"/>
@@ -839,6 +868,7 @@
       </classpath>
       <sourcepath>
         <pathelement path="${src.java.dir}"/>
+        <pathelement path="${src.sandbox.dir}"/>
         <pathelement path="${build.gensrc.dir}"/>
         <path refid="graphics-configuration-adapter"/>
       </sourcepath>

Modified: xmlgraphics/fop/trunk/fop
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/fop?rev=332575&r1=332574&r2=332575&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop (original)
+++ xmlgraphics/fop/trunk/fop Fri Nov 11 06:58:37 2005
@@ -140,8 +140,8 @@
   LOCALCLASSPATH=$CLASSPATH
 fi
 
-# add fop.jar and fop-hyph.jar, which reside in $FOP_HOME/build
-LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:${FOP_HOME}/build/fop-hyph.jar:$LOCALCLASSPATH
+# add fop.jar, fop-sandbox and fop-hyph.jar, which reside in $FOP_HOME/build
+LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:${FOP_HOME}/build/fop-sandbox.jar:${FOP_HOME}/build/fop-hyph.jar:$LOCALCLASSPATH
 
 # add in the dependency .jar files, which reside in $FOP_HOME/lib
 DIRLIBS=${FOP_HOME}/lib/*.jar

Modified: xmlgraphics/fop/trunk/fop.bat
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/fop.bat?rev=332575&r1=332574&r2=332575&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop.bat (original)
+++ xmlgraphics/fop/trunk/fop.bat Fri Nov 11 06:58:37 2005
@@ -39,6 +39,7 @@
 set LIBDIR=%LOCAL_FOP_HOME%lib
 
 set LOCALCLASSPATH=%LOCAL_FOP_HOME%build\fop.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LOCAL_FOP_HOME%build\fop-sandbox.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LOCAL_FOP_HOME%build\fop-hyph.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis-1.3.02.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.7.1.jar

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java?rev=332575&r1=332574&r2=332575&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java Fri Nov 11 06:58:37
2005
@@ -64,8 +64,6 @@
     private void registerStandardRenderers() {
         addRendererMaker(new org.apache.fop.render.pdf.PDFRendererMaker());
         addRendererMaker(new org.apache.fop.render.ps.PSRendererMaker());
-        addRendererMaker(new org.apache.fop.render.pcl.PCLRendererMaker());
-        addRendererMaker(new org.apache.fop.render.svg.SVGRendererMaker());
         addRendererMaker(new org.apache.fop.render.txt.TXTRendererMaker());
         addRendererMaker(new org.apache.fop.render.bitmap.PNGRendererMaker());
         addRendererMaker(new org.apache.fop.render.bitmap.TIFFRendererMaker());
@@ -77,7 +75,6 @@
     
     private void registerStandardEventHandlers() {
         addFOEventHandlerMaker(new org.apache.fop.render.rtf.RTFFOEventHandlerMaker());
-        addFOEventHandlerMaker(new org.apache.fop.render.mif.MIFFOEventHandlerMaker());
     }
     
     /**

Added: xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.FOEventHandler
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.FOEventHandler?rev=332575&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.FOEventHandler (added)
+++ xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.FOEventHandler Fri
Nov 11 06:58:37 2005
@@ -0,0 +1 @@
+org.apache.fop.render.mif.MIFFOEventHandlerMaker
\ No newline at end of file

Added: xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.Renderer
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.Renderer?rev=332575&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.Renderer (added)
+++ xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.Renderer Fri
Nov 11 06:58:37 2005
@@ -0,0 +1,2 @@
+org.apache.fop.render.pcl.PCLRendererMaker
+org.apache.fop.render.svg.SVGRendererMaker
\ No newline at end of file



---------------------------------------------------------------------
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