Changeset 22390

Timestamp:

2010-07-13T17:08:22+12:00 (14 years ago)

Author:

ak19

Message:

Gone back to the old way of forcing use of xalan's TransformerFactory for generating a new instance of the factory, since we don't want to accidentally use some other TransformerFactory that might be on the classpath as could happen the way the code had recently been changed. Setting the System property to xalan's TransformerFactory, however, was a problem with running fedora which does not include xalan.jar and serializer.jar (and possibly necessary xsltc.jar). But now, by following Katherine's suggestion to include these jar files in packages/tomcat/lib, Fedora is finding them and the server working continuously.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java

@@ -74 +74 @@
    */
     public XMLTransformer() {
-    // make sure we are using the xalan transformer
-
     // http://download.oracle.com/docs/cd/E17476_01/javase/1.5.0/docs/api/index.html?javax/xml/transform/TransformerFactory.html states that
     // TransformerFactory.newInstance() looks in jar files for a Factory specified in META-INF/services/javax.xml.transform.TransformerFactory, 
@@ -84 +82 @@
     // This means we no longer have to do a System.setProperty("javax.xml.transform.TransformerFactory", "org.apache.xalan.processor.TransformerFactoryImpl");
     // followed by a this.t_factory = org.apache.xalan.processor.TransformerFactoryImpl.newInstance();
-    // The System.setProperty step to force the TransformerFactory implementation that gets used conflicts with
+    // The System.setProperty step to force the TransformerFactory implementation that gets used, conflicts with
     // Fedora (visiting the Greenstone server pages breaks the Greenstone-tomcat hosted Fedora pages) as Fedora 
     // does not include the xalan.jar and therefore can't then find the xalan TransformerFactory explicitly set.
 
+    // Gone back to forcing use of xalan transformer, since other jars like crimson.jar, which may be on some
+    // classpaths, could be be chosen as the TransformerFactory implementation over xalan. This is what used to
+    // give problems before. Instead, have placed copies of the jars that Fedora needs (xalan.jar and serializer.jar 
+    // and the related xsltc.jar which it may need) into packages/tomcat/lib so that it's on the server's classpath
+    // and will be found by Fedora.
+
+    // make sure we are using the xalan transformer
+    System.setProperty("javax.xml.transform.TransformerFactory", "org.apache.xalan.processor.TransformerFactoryImpl");
     try {
-        this.t_factory = TransformerFactory.newInstance();
+        this.t_factory = org.apache.xalan.processor.TransformerFactoryImpl.newInstance();
+        //this.t_factory = TransformerFactory.newInstance();
     } catch (Exception e) {
         logger.error("exception "+e.getMessage());