zongaro 2003/01/30 07:57:57
Modified: java/samples/CompiledApplet Tag: xslt20 TransformApplet.java
java/samples/CompiledBrazil Tag: xslt20
TransformHandler.java
java/samples/CompiledEJB Tag: xslt20 TransformBean.java
TransformHome.java TransformRemote.java
TransformServlet.java
java/samples/CompiledJAXP Tag: xslt20 Compile.java
Transform.java
java/samples/CompiledServlet Tag: xslt20 CompileServlet.java
TransformServlet.java
java/samples/translets Tag: xslt20
JAXPTransletMultipleTransformations.java
JAXPTransletOneTransformation.java
Log:
Trying to minimize set of import statements.
Also, propagated Santiago's change from MAIN branch to drop use of old XSLTC
serialization API.
Revision Changes Path
No revision
No revision
1.3.8.2 +28 -16
xml-xalan/java/samples/CompiledApplet/TransformApplet.java
Index: TransformApplet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/samples/CompiledApplet/TransformApplet.java,v
retrieving revision 1.3.8.1
retrieving revision 1.3.8.2
diff -u -r1.3.8.1 -r1.3.8.2
--- TransformApplet.java 30 Jan 2003 00:48:43 -0000 1.3.8.1
+++ TransformApplet.java 30 Jan 2003 15:57:56 -0000 1.3.8.2
@@ -60,21 +60,30 @@
*
*/
-import java.io.*;
-import java.applet.*;
-import java.awt.*;
-import java.awt.event.*;
+import java.applet.Applet;
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Frame;
+import java.awt.Label;
+import java.awt.Panel;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.SAXException;
+import org.apache.xalan.xsltc.DOM;
+import org.apache.xalan.xsltc.dom.DOMImpl;
+import org.apache.xalan.xsltc.dom.DTDMonitor;
+import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import org.apache.xalan.xsltc.runtime.MessageHandler;
+import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.runtime.*;
-import org.apache.xalan.xsltc.dom.*;
+import org.xml.sax.XMLReader;
/**
* This applet demonstrates how XSL transformations can be made run in
@@ -214,10 +223,13 @@
AbstractTranslet translet = (AbstractTranslet)tc.newInstance();
((AbstractTranslet)translet).setMessageHandler(msgHandler);
- // Initialise the translet's output handler
- DefaultSAXOutputHandler saxHandler =
- new DefaultSAXOutputHandler(out);
- TextOutput textOutput = new TextOutput(saxHandler);
+ // Create output handler
+ TransletOutputHandlerFactory tohFactory =
+ TransletOutputHandlerFactory.newInstance();
+ tohFactory.setOutputType(TransletOutputHandlerFactory.STREAM);
+ tohFactory.setEncoding(translet._encoding);
+ tohFactory.setOutputMethod(translet._method);
+ tohFactory.setWriter(out);
getDOM(documentUrl);
@@ -232,7 +244,7 @@
translet.setUnparsedEntityURIs(_dtdMonitor.
getUnparsedEntityURIs());
// Do the actual transformation
- translet.transform(_dom, textOutput);
+ translet.transform(_dom, tohFactory.getTransletOutputHandler());
final long done = System.currentTimeMillis() - start;
out.println("<!-- transformed by XSLTC in "+done+"msecs -->");
No revision
No revision
1.2.8.2 +18 -12
xml-xalan/java/samples/CompiledBrazil/TransformHandler.java
Index: TransformHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/samples/CompiledBrazil/TransformHandler.java,v
retrieving revision 1.2.8.1
retrieving revision 1.2.8.2
diff -u -r1.2.8.1 -r1.2.8.2
--- TransformHandler.java 30 Jan 2003 00:48:44 -0000 1.2.8.1
+++ TransformHandler.java 30 Jan 2003 15:57:56 -0000 1.2.8.2
@@ -59,16 +59,18 @@
*
*/
-import java.io.*;
-import java.util.NoSuchElementException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
import java.util.StringTokenizer;
-import java.util.Vector;
-import org.xml.sax.*;
+import org.apache.xalan.xsltc.dom.DOMImpl;
+import org.apache.xalan.xsltc.dom.DocumentCache;
+import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.runtime.*;
-import org.apache.xalan.xsltc.dom.*;
+import org.xml.sax.SAXException;
import sunlabs.brazil.server.Handler;
import sunlabs.brazil.server.Request;
@@ -175,13 +177,17 @@
errorMessage("Could not locate: \"<b>"+document+"\"</b>");
}
else {
- // Initialise the translet's output handler
- DefaultSAXOutputHandler saxHandler =
- new DefaultSAXOutputHandler(_out);
+ // Create output handler
+ TransletOutputHandlerFactory tohFactory =
+ TransletOutputHandlerFactory.newInstance();
+
tohFactory.setOutputType(TransletOutputHandlerFactory.STREAM);
+ tohFactory.setEncoding(translet._encoding);
+ tohFactory.setOutputMethod(translet._method);
+ tohFactory.setWriter(_out);
// Do the actual transformation
final long start = System.currentTimeMillis();
- translet.transform(dom, new TextOutput(saxHandler));
+ translet.transform(dom,
tohFactory.getTransletOutputHandler());
final long done = System.currentTimeMillis() - start;
_out.println("<!-- transformed by XSLTC in "+done+"ms -->");
}
No revision
No revision
1.2.8.2 +18 -15 xml-xalan/java/samples/CompiledEJB/TransformBean.java
Index: TransformBean.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/CompiledEJB/TransformBean.java,v
retrieving revision 1.2.8.1
retrieving revision 1.2.8.2
diff -u -r1.2.8.1 -r1.2.8.2
--- TransformBean.java 30 Jan 2003 00:48:43 -0000 1.2.8.1
+++ TransformBean.java 30 Jan 2003 15:57:56 -0000 1.2.8.2
@@ -60,24 +60,23 @@
*
*/
-import java.io.*;
-import java.text.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
-import java.rmi.RemoteException;
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.SAXException;
+import org.apache.xalan.xsltc.dom.DOMImpl;
+import org.apache.xalan.xsltc.dom.DTDMonitor;
+import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.runtime.*;
-import org.apache.xalan.xsltc.dom.*;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
public class TransformBean implements SessionBean {
@@ -153,13 +152,17 @@
// Read input document from the DOM cache
DOMImpl dom = getDOM(document, translet);
- // Initialize the (default) SAX output handler
- DefaultSAXOutputHandler saxHandler =
- new DefaultSAXOutputHandler(out);
+ // Create output handler
+ TransletOutputHandlerFactory tohFactory =
+ TransletOutputHandlerFactory.newInstance();
+ tohFactory.setOutputType(TransletOutputHandlerFactory.STREAM);
+ tohFactory.setEncoding(translet._encoding);
+ tohFactory.setOutputMethod(translet._method);
+ tohFactory.setWriter(out);
// Start the transformation
final long start = System.currentTimeMillis();
- translet.transform(dom, new TextOutput(saxHandler));
+ translet.transform(dom, tohFactory.getTransletOutputHandler());
final long done = System.currentTimeMillis() - start;
out.println("<!-- transformed by XSLTC in "+done+"msecs -->");
}
1.1.12.2 +2 -1 xml-xalan/java/samples/CompiledEJB/TransformHome.java
Index: TransformHome.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/CompiledEJB/TransformHome.java,v
retrieving revision 1.1.12.1
retrieving revision 1.1.12.2
diff -u -r1.1.12.1 -r1.1.12.2
--- TransformHome.java 30 Jan 2003 00:48:43 -0000 1.1.12.1
+++ TransformHome.java 30 Jan 2003 15:57:56 -0000 1.1.12.2
@@ -61,6 +61,7 @@
*/
import java.rmi.RemoteException;
+
import javax.ejb.CreateException;
import javax.ejb.EJBHome;
1.1.12.2 +3 -2 xml-xalan/java/samples/CompiledEJB/TransformRemote.java
Index: TransformRemote.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/CompiledEJB/TransformRemote.java,v
retrieving revision 1.1.12.1
retrieving revision 1.1.12.2
diff -u -r1.1.12.1 -r1.1.12.2
--- TransformRemote.java 30 Jan 2003 00:48:43 -0000 1.1.12.1
+++ TransformRemote.java 30 Jan 2003 15:57:56 -0000 1.1.12.2
@@ -60,8 +60,9 @@
*
*/
-import javax.ejb.EJBObject;
import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
/**
* XSL transformation bean remote interface
1.1.12.2 +11 -5 xml-xalan/java/samples/CompiledEJB/TransformServlet.java
Index: TransformServlet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/CompiledEJB/TransformServlet.java,v
retrieving revision 1.1.12.1
retrieving revision 1.1.12.2
diff -u -r1.1.12.1 -r1.1.12.2
--- TransformServlet.java 30 Jan 2003 00:48:43 -0000 1.1.12.1
+++ TransformServlet.java 30 Jan 2003 15:57:56 -0000 1.1.12.2
@@ -60,11 +60,17 @@
*
*/
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import javax.naming.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
public class TransformServlet extends HttpServlet {
No revision
No revision
1.1.8.2 +1 -5 xml-xalan/java/samples/CompiledJAXP/Compile.java
Index: Compile.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/CompiledJAXP/Compile.java,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -u -r1.1.8.1 -r1.1.8.2
--- Compile.java 30 Jan 2003 00:48:44 -0000 1.1.8.1
+++ Compile.java 30 Jan 2003 15:57:57 -0000 1.1.8.2
@@ -60,13 +60,9 @@
import java.io.FileOutputStream;
import java.io.ObjectOutputStream;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
-
-import org.apache.xalan.xsltc.trax.TransformerFactoryImpl;
+import javax.xml.transform.stream.StreamSource;
public class Compile {
1.1.8.2 +3 -5 xml-xalan/java/samples/CompiledJAXP/Transform.java
Index: Transform.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/CompiledJAXP/Transform.java,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -u -r1.1.8.1 -r1.1.8.2
--- Transform.java 30 Jan 2003 00:48:44 -0000 1.1.8.1
+++ Transform.java 30 Jan 2003 15:57:57 -0000 1.1.8.2
@@ -59,14 +59,12 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.ObjectInputStream;
+import java.io.OutputStreamWriter;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.xalan.xsltc.trax.TransformerFactoryImpl;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
public class Transform {
No revision
No revision
1.2.8.2 +9 -9
xml-xalan/java/samples/CompiledServlet/CompileServlet.java
Index: CompileServlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/samples/CompiledServlet/CompileServlet.java,v
retrieving revision 1.2.8.1
retrieving revision 1.2.8.2
diff -u -r1.2.8.1 -r1.2.8.2
--- CompileServlet.java 30 Jan 2003 00:48:42 -0000 1.2.8.1
+++ CompileServlet.java 30 Jan 2003 15:57:57 -0000 1.2.8.2
@@ -62,17 +62,17 @@
package org.apache.xalan.xsltc.demo.servlet;
-import java.io.*;
-import java.text.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+
import java.net.URL;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-import org.apache.xalan.xsltc.compiler.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.util.getopt.*;
+import org.apache.xalan.xsltc.compiler.XSLTC;
public class CompileServlet extends HttpServlet {
1.1.12.2 +23 -17
xml-xalan/java/samples/CompiledServlet/TransformServlet.java
Index: TransformServlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/samples/CompiledServlet/TransformServlet.java,v
retrieving revision 1.1.12.1
retrieving revision 1.1.12.2
diff -u -r1.1.12.1 -r1.1.12.2
--- TransformServlet.java 30 Jan 2003 00:48:42 -0000 1.1.12.1
+++ TransformServlet.java 30 Jan 2003 15:57:57 -0000 1.1.12.2
@@ -61,18 +61,20 @@
*
*/
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import org.xml.sax.*;
-
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.runtime.*;
-import org.apache.xalan.xsltc.dom.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.xalan.xsltc.dom.DOMImpl;
+import org.apache.xalan.xsltc.dom.DocumentCache;
+import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
+
+import org.xml.sax.SAXException;
/**
* This servlet demonstrates how XSL transformations can be made available as
@@ -132,13 +134,17 @@
// Read input document from the DOM cache
DOMImpl dom = cache.retrieveDocument(documentURI, 0, translet);
- // Initialize the output handler
- DefaultSAXOutputHandler saxHandler =
- new DefaultSAXOutputHandler(out);
+ // Create output handler
+ TransletOutputHandlerFactory tohFactory =
+ TransletOutputHandlerFactory.newInstance();
+ tohFactory.setOutputType(TransletOutputHandlerFactory.STREAM);
+ tohFactory.setEncoding(translet._encoding);
+ tohFactory.setOutputMethod(translet._method);
+ tohFactory.setWriter(out);
// Start the transformation
final long start = System.currentTimeMillis();
- translet.transform(dom, new TextOutput(saxHandler));
+ translet.transform(dom, tohFactory.getTransletOutputHandler());
final long done = System.currentTimeMillis() - start;
out.println("<!-- transformed by XSLTC in "+done+"msecs -->");
}
No revision
No revision
1.6.8.2 +7 -10
xml-xalan/java/samples/translets/JAXPTransletMultipleTransformations.java
Index: JAXPTransletMultipleTransformations.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/samples/translets/JAXPTransletMultipleTransformations.java,v
retrieving revision 1.6.8.1
retrieving revision 1.6.8.2
diff -u -r1.6.8.1 -r1.6.8.2
--- JAXPTransletMultipleTransformations.java 30 Jan 2003 00:48:44 -0000
1.6.8.1
+++ JAXPTransletMultipleTransformations.java 30 Jan 2003 15:57:57 -0000
1.6.8.2
@@ -57,20 +57,17 @@
* @author Donald Leslie
*
*/
-import java.util.Properties;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+
+import java.util.Properties;
+
+import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Templates;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult;
-
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerConfigurationException;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import org.xml.sax.SAXException;
-import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.stream.StreamSource;
/**
1.7.8.2 +9 -8
xml-xalan/java/samples/translets/JAXPTransletOneTransformation.java
Index: JAXPTransletOneTransformation.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/samples/translets/JAXPTransletOneTransformation.java,v
retrieving revision 1.7.8.1
retrieving revision 1.7.8.2
diff -u -r1.7.8.1 -r1.7.8.2
--- JAXPTransletOneTransformation.java 30 Jan 2003 00:48:44 -0000
1.7.8.1
+++ JAXPTransletOneTransformation.java 30 Jan 2003 15:57:57 -0000
1.7.8.2
@@ -57,20 +57,21 @@
* @author Donald Leslie
*
*/
-import java.util.Properties;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.IOException;
+
+import java.util.Properties;
+
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Templates;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerConfigurationException;
-import java.io.IOException;
-import java.io.FileNotFoundException;
import org.xml.sax.SAXException;
-import javax.xml.parsers.ParserConfigurationException;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
