[FOray-commit] SF.net SVN: foray: [7277] trunk/foray/foray-app/src/java/org/foray/app

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

Revision: 7277
Author:   victormote
Date:     2006-05-26 13:55:16 -0700 (Fri, 26 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7277&view=rev

Log Message:
-----------
Remove more dependencies on FOray output/render modules.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java
    trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java
    trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java
    trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java
    trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java
    trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java
Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java	2006-05-26 20:48:35 UTC (rev 7276)
+++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java	2006-05-26 20:55:16 UTC (rev 7277)
@@ -28,7 +28,6 @@
 import org.foray.core.SessionConfig;
 import org.foray.layout.LayoutStrategy;
 import org.foray.output.OutputConfig;
-import org.foray.output.OutputTarget;
 import org.foray.pioneer.PioneerLS;
 
 import org.axsl.areaW.AreaTreeFactory;
@@ -36,6 +35,7 @@
 import org.axsl.fontR.FontServer;
 import org.axsl.graphicR.GraphicServer;
 import org.axsl.layout.LayoutFactory;
+import org.axsl.output.OutputTarget;
 import org.axsl.text.TextServer;
 
 import org.apache.commons.logging.Log;

Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java	2006-05-26 20:48:35 UTC (rev 7276)
+++ trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java	2006-05-26 20:55:16 UTC (rev 7277)
@@ -31,7 +31,6 @@
 import org.foray.core.SessionConfig;
 import org.foray.output.MIFConverter;
 import org.foray.output.OutputConfig;
-import org.foray.output.OutputTarget;
 import org.foray.render.awt.AWTRenderer;
 import org.foray.render.pcl.PCLRenderer;
 import org.foray.render.pdf.PDFRenderer;
@@ -45,6 +44,7 @@
 import org.axsl.fontR.FontServer;
 import org.axsl.graphicR.GraphicServer;
 import org.axsl.layout.LayoutFactory;
+import org.axsl.output.OutputTarget;
 import org.axsl.pdfW.PDFDocument;
 import org.axsl.text.TextServer;
 

Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java	2006-05-26 20:48:35 UTC (rev 7276)
+++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java	2006-05-26 20:55:16 UTC (rev 7277)
@@ -34,8 +34,9 @@
 import org.foray.core.InputHandler;
 import org.foray.core.SessionConfig;
 import org.foray.output.OutputConfig;
-import org.foray.output.OutputTarget;
 
+import org.axsl.output.OutputTarget;
+
 import org.apache.commons.logging.Log;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;

Modified: trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java	2006-05-26 20:48:35 UTC (rev 7276)
+++ trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java	2006-05-26 20:55:16 UTC (rev 7277)
@@ -34,8 +34,9 @@
 import org.foray.core.SessionConfig;
 import org.foray.core.TraxInputHandler;
 import org.foray.output.OutputConfig;
-import org.foray.output.OutputTarget;
 
+import org.axsl.output.OutputTarget;
+
 import org.apache.commons.logging.Log;
 
 import org.w3c.dom.Document;

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java	2006-05-26 20:48:35 UTC (rev 7276)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java	2006-05-26 20:55:16 UTC (rev 7277)
@@ -24,11 +24,6 @@
  
 package org.foray.demo.embed;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
 import org.foray.app.FOrayDocument;
 import org.foray.app.FOraySession;
 import org.foray.app.FOrayTarget;
@@ -37,8 +32,14 @@
 import org.foray.core.FOrayException;
 import org.foray.core.InputHandler;
 import org.foray.core.SessionConfig;
-import org.foray.output.OutputTarget;
 
+import org.axsl.output.OutputTarget;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
 /**
  * This class demonstrates the conversion of an FO file to PDF using FOray.
  */

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java	2006-05-26 20:48:35 UTC (rev 7276)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java	2006-05-26 20:55:16 UTC (rev 7277)
@@ -24,27 +24,27 @@
  
 package org.foray.demo.embed;
 
+import org.foray.app.FOrayDocument;
+import org.foray.app.FOraySession;
+import org.foray.app.FOrayTarget;
+import org.foray.core.Application;
+import org.foray.core.FOrayException;
+import org.foray.core.SessionConfig;
+import org.foray.demo.embed.model.ProjectTeam;
+
+import org.axsl.output.OutputTarget;
+
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStream;
-import java.io.IOException;
 
+import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
-import org.foray.app.FOrayDocument;
-import org.foray.app.FOraySession;
-import org.foray.app.FOrayTarget;
-import org.foray.output.OutputTarget;
-
-import org.foray.core.Application;
-import org.foray.core.FOrayException;
-import org.foray.core.SessionConfig;
-import org.foray.demo.embed.model.ProjectTeam;
-
 /**
  * This class demonstrates the conversion of an arbitrary object file to a 
  * PDF using JAXP (XSLT) and FOray (XSL:FO).

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java	2006-05-26 20:48:35 UTC (rev 7276)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java	2006-05-26 20:55:16 UTC (rev 7277)
@@ -24,25 +24,26 @@
  
 package org.foray.demo.embed;
 
+import org.foray.app.FOrayDocument;
+import org.foray.app.FOraySession;
+import org.foray.app.FOrayTarget;
+import org.foray.core.Application;
+import org.foray.core.FOrayException;
+import org.foray.core.SessionConfig;
+
+import org.axsl.output.OutputTarget;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
-import org.foray.app.FOrayDocument;
-import org.foray.app.FOraySession;
-import org.foray.app.FOrayTarget;
-import org.foray.core.Application;
-import org.foray.core.FOrayException;
-import org.foray.core.SessionConfig;
-import org.foray.output.OutputTarget;
-
 /**
  * This class demonstrates the conversion of an XML file to PDF using 
  * JAXP (XSLT) and FOray (XSL:FO).

Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java	2006-05-26 20:48:35 UTC (rev 7276)
+++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java	2006-05-26 20:55:16 UTC (rev 7277)
@@ -32,8 +32,9 @@
 import org.foray.core.FOrayException;
 import org.foray.core.InputHandler;
 import org.foray.core.SessionConfig;
-import org.foray.output.OutputTarget;
 
+import org.axsl.output.OutputTarget;
+
 import org.apache.commons.logging.Log;
 
 import java.io.ByteArrayOutputStream;

Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java	2006-05-26 20:48:35 UTC (rev 7276)
+++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java	2006-05-26 20:55:16 UTC (rev 7277)
@@ -29,8 +29,9 @@
 import org.foray.app.FOrayTarget;
 import org.foray.core.FOrayException;
 import org.foray.core.InputHandler;
-import org.foray.output.OutputTarget;
 
+import org.axsl.output.OutputTarget;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;


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