dims 00/11/08 12:35:21
Modified: lib Tag: xml-cocoon2 xalan.jar
src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
Constants.java
src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
Logicsheet.java LogicsheetCodeGenerator.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
XalanTransformer.java
Log:
Moving to new javax.xml.tranform (TRaX) interfaces in Xalan2
Revision Changes Path
No revision
No revision
1.1.2.4 +2328 -2222xml-cocoon/lib/Attic/xalan.jar
<<Binary file>>
No revision
No revision
1.4.2.35 +1 -9 xml-cocoon/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.4.2.34
retrieving revision 1.4.2.35
diff -u -r1.4.2.34 -r1.4.2.35
--- Cocoon.java 2000/11/01 15:52:29 1.4.2.34
+++ Cocoon.java 2000/11/08 20:34:46 1.4.2.35
@@ -43,7 +43,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4.2.34 $ $Date: 2000/11/01 15:52:29 $
+ * @version CVS $Revision: 1.4.2.35 $ $Date: 2000/11/08 20:34:46 $
*/
public class Cocoon
implements Component, Configurable, ComponentManager, Modifiable,
Processor, Constants {
@@ -94,14 +94,6 @@
throw new ConfigurationException("Could not load parser " +
parser + ": " + e.getMessage());
}
this.componentManager.addComponentInstance(Roles.COCOON, this);
-
- String processor = System.getProperty(PROCESSOR_PROPERTY,
DEFAULT_PROCESSOR);
- try {
- org.apache.trax.Processor.setPlatformDefaultProcessor(processor);
- this.components.put(Roles.PROCESSOR,
ClassUtils.loadClass(processor));
- } catch (Exception e) {
- throw new ConfigurationException("Error creating processor (" +
processor + ")");
- }
}
/**
1.1.2.10 +1 -4 xml-cocoon/src/org/apache/cocoon/Attic/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Constants.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Constants.java 2000/10/12 16:43:11 1.1.2.9
+++ Constants.java 2000/11/08 20:34:48 1.1.2.10
@@ -10,7 +10,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/10/12 16:43:11 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/11/08 20:34:48 $
*/
public interface Constants {
@@ -33,9 +33,6 @@
public static final String PARSER_PROPERTY =
"org.apache.cocoon.components.parser.Parser";
public static final String DEFAULT_PARSER =
"org.apache.cocoon.components.parser.XercesParser";
- public static final String PROCESSOR_PROPERTY = "trax.processor.xslt";
- public static final String DEFAULT_PROCESSOR =
"org.apache.xalan.processor.StylesheetProcessor";
-
public static final String XSP_PREFIX = "xsp";
public static final String XSP_URI = "http://apache.org/xsp";;
No revision
No revision
1.1.2.11 +1 -5
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- AbstractMarkupLanguage.java 2000/10/19 16:39:20 1.1.2.10
+++ AbstractMarkupLanguage.java 2000/11/08 20:35:02 1.1.2.11
@@ -28,10 +28,6 @@
import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.helpers.XMLReaderFactory;
-import org.apache.trax.Processor;
-import org.apache.trax.Transformer;
-import org.apache.trax.Templates;
-
import org.apache.avalon.Composer;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
@@ -51,7 +47,7 @@
* be decoupled from this context!!!
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/10/19 16:39:20 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/11/08 20:35:02 $
*/
public abstract class AbstractMarkupLanguage
implements MarkupLanguage, Composer, Configurable
1.1.2.7 +22 -25
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Logicsheet.java 2000/10/19 20:21:18 1.1.2.6
+++ Logicsheet.java 2000/11/08 20:35:07 1.1.2.7
@@ -31,12 +31,13 @@
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.XMLReaderFactory;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.Templates;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.TransformerConfigurationException;
+import org.apache.xalan.transformer.TrAXFilter;
-import org.apache.trax.Templates;
-import org.apache.trax.Processor;
-import org.apache.trax.Transformer;
-import org.apache.trax.TemplatesBuilder;
-
/**
* A code-generation logicsheet. This class is actually a wrapper for
* a "standard" XSLT stylesheet stored as <code>trax.Templates</code> object.
@@ -46,7 +47,7 @@
* This class should probably be based on an interface...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/10/19 20:21:18 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/11/08 20:35:07 $
*/
public class Logicsheet {
/**
@@ -64,22 +65,12 @@
public void setInputSource(InputSource inputSource)
throws SAXException, IOException
{
- Processor processor = Processor.newInstance("xslt");
-
- // Create a XMLReader with the namespace-prefixes feature
- XMLReader reader = XMLReaderFactory.createXMLReader();
- reader.setFeature("http://xml.org/sax/features/namespace-prefixes";,
true);
-
- // Create the TemplatesBuilder and register as ContentHandler
- TemplatesBuilder templatesBuilder = processor.getTemplatesBuilder();
- reader.setContentHandler(templatesBuilder);
- if(templatesBuilder instanceof org.xml.sax.ext.LexicalHandler)
- reader.setProperty("http://xml.org/sax/properties/lexical-handler";,
- templatesBuilder);
-
- // Parse and get the templates
- reader.parse(inputSource);
- this.templates = templatesBuilder.getTemplates();
+ try {
+ TransformerFactory tfactory = TransformerFactory.newInstance();
+ templates = tfactory.newTemplates(new SAXSource(inputSource));
+ } catch (TransformerConfigurationException e){
+ e.printStackTrace();
+ }
}
/**
@@ -87,9 +78,15 @@
*
* @return The XMLFilter for the associated stylesheet.
*/
- public XMLFilter getXMLFilter() {
- return templates.newTransformer();
-
+ public XMLFilter getXMLFilter()
+ {
+ XMLFilter filter = null;
+ try {
+ filter = new TrAXFilter(templates);
+ } catch (TransformerConfigurationException e){
+ e.printStackTrace();
+ }
+ return filter;
}
}
1.1.2.6 +1 -3
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/LogicsheetCodeGenerator.java
Index: LogicsheetCodeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/LogicsheetCodeGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LogicsheetCodeGenerator.java 2000/10/19 16:39:26 1.1.2.5
+++ LogicsheetCodeGenerator.java 2000/11/08 20:35:08 1.1.2.6
@@ -26,13 +26,11 @@
import org.apache.serialize.Serializer;
import org.apache.serialize.OutputFormat;
-import org.apache.trax.Transformer;
-
/**
* A logicsheet-based implementation of <code>MarkupCodeGenerator</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/10/19 16:39:26 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/11/08 20:35:08 $
*/
public class LogicsheetCodeGenerator implements MarkupCodeGenerator {
No revision
No revision
1.1.2.19 +20 -12
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java
Index: XalanTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- XalanTransformer.java 2000/11/07 16:47:08 1.1.2.18
+++ XalanTransformer.java 2000/11/08 20:35:18 1.1.2.19
@@ -39,15 +39,19 @@
import org.xml.sax.helpers.XMLReaderFactory;
import org.xml.sax.XMLReader;
-import org.apache.trax.Templates;
-import org.apache.trax.Processor;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.Templates;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.TransformerConfigurationException;
+import org.apache.xalan.transformer.TransformerImpl;
+
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2000/11/07 16:47:08 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2000/11/08 20:35:18 $
*/
public class XalanTransformer extends ContentHandlerWrapper
implements Transformer, Composer, Poolable, Configurable {
@@ -56,7 +60,7 @@
private Store store = null;
/** The XALAN Transformer */
- org.apache.trax.Transformer transformer = null;
+ javax.xml.transform.Transformer transformer = null;
/** Hash table for Templates */
private static Hashtable templatesCache = new Hashtable();
@@ -64,8 +68,8 @@
/** Is the cache turned on? (default is on) */
private boolean useCache = true;
- private org.apache.trax.Transformer getTransformer(EntityResolver
resolver, String xsluri)
- throws SAXException, ProcessingException, IOException
+ private javax.xml.transform.Transformer getTransformer(EntityResolver
resolver, String xsluri)
+ throws SAXException, ProcessingException, IOException,
TransformerConfigurationException
{
// Only local files are checked for midification for compatibility
reasons!
// Using the entity resolver we get the filename of the current file:
@@ -95,8 +99,8 @@
}
if(templates == null)
{
- Processor processor = Processor.newInstance("xslt");
- templates = processor.process(src);
+ TransformerFactory tfactory = TransformerFactory.newInstance();
+ templates = tfactory.newTemplates(new SAXSource(new
InputSource(systemID)));
if (this.useCache == true)
{
// Is this a local file
@@ -152,7 +156,11 @@
}
/** get a transformer */
- transformer = getTransformer(resolver,xsluri);
+ try {
+ transformer = getTransformer(resolver,xsluri);
+ } catch (TransformerConfigurationException e){
+ throw new ProcessingException("Problem in getTransformer:" +
e.toString());
+ }
if (request != null) {
Enumeration parameters = request.getParameterNames();
@@ -160,12 +168,12 @@
String name = (String) parameters.nextElement();
if (isValidXSLTParameterName(name)) {
String value = request.getParameter(name);
- transformer.setParameter(name, null /* namespace
*/,value);
+ transformer.setParameter(name,value);
}
}
}
- ContentHandler chandler = transformer.getInputContentHandler();
+ ContentHandler chandler =
((TransformerImpl)transformer).getInputContentHandler();
super.setContentHandler(chandler);
if(chandler instanceof org.xml.sax.ext.LexicalHandler)
this.setLexicalHandler((org.xml.sax.ext.LexicalHandler)chandler);
@@ -188,7 +196,7 @@
* accessing the protected <code>super.contentHandler</code> field.
*/
public void setContentHandler(ContentHandler content) {
- this.transformer.setContentHandler(content);
+ ((TransformerImpl)transformer).setContentHandler(content);
}
/**
