Changeset 22370

Timestamp:

2010-07-09T15:00:11+12:00 (14 years ago)

Author:

ak19

Message:

1. Bugfix: Dr Bainbridge discovered that the reason the fedora pages off the GS3 tomcat server stopped functioning after visiting the GS3 pages off the same server, was that XMLTransformer was fixing the TransformerFactory property for the entire system. Unfortunately it set this to one (xalan) that is not included in the libraries that fedora ships with. The solution is to now let Java work out, which it already does correctly, that GS3 is using the one that's part of its included jar files (xalan.jar), instead of fixing this with System.setProperty. Now the Fedora pages run off the GS3 tomcat server at all times. 2. FedoraServiceProxy will use any fedora connection specifics in the info element coming from buildConfig.xml (for protocol, host, port, authentication), otherwise it will use defaults.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• service/FedoraServiceProxy.java (modified) (2 diffs)
• util/XMLTransformer.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java

@@ -108 +108 @@
     // Try to instantiate a Fedora dl handle
     try {
-        // The properties file containing the initial digital library connection
-        // settings which get displayed in the connection dialog fields
-        //final File propertiesFile = new File("gs3fedora.properties");
-        //fedoraServicesAPIA = new FedoraServicesAPIA(propertiesFile);
-        
-        // Defaults. Read host and port from global.properties
+        // Fedora connection settings defaults. 
+        // Read host and port from global.properties, since by default, we expect the Greenstone server to be used
         Properties globalProperties = new Properties();
         globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties"));
@@ -120 +116 @@
         String protocol = "http";
         String username = "fedoraIntCallUser"; //"fedoraAdmin"
-        String password = "changeme"; //"pounamu"
-
-        fedoraServicesAPIA = new FedoraServicesAPIA(protocol, host, Integer.parseInt(port), username, password); //"fedoraAdmin", "pounamu"
+        String password = "changeme"; //"<user password>"
+
+        // See if buildConfig.xml overrides any of the defaults
+        // info is the <serviceRack> Element from buildConfig.xml (extra_info are the Elements of collectionConfig.xml)
+
+        NodeList nodes = info.getElementsByTagName("fedoraConnection");
+        if(nodes != null && nodes.getLength() > 0) {
+
+        Element fedoraElement = (Element)nodes.item(0);
+        if(fedoraElement.hasAttribute("protocol")) {
+            protocol = fedoraElement.getAttribute("protocol");
+        }       
+        if(fedoraElement.hasAttribute("host")) {
+            host = fedoraElement.getAttribute("host");
+        }
+        if(fedoraElement.hasAttribute("port")) {
+            port = fedoraElement.getAttribute("port");
+        }
+        if(fedoraElement.hasAttribute("username")) {
+            username = fedoraElement.getAttribute("username");
+        }
+        if(fedoraElement.hasAttribute("password")) {
+            password = fedoraElement.getAttribute("password");
+        }       
+        }   
+
+        fedoraServicesAPIA = new FedoraServicesAPIA(protocol, host, Integer.parseInt(port), username, password);
+
     } catch(org.greenstone.fedora.services.FedoraGS3Exception.CancelledException e) {
-        // The user pressed cancel in the fedora services instantiation dlg
+        // The user pressed cancel in the fedora services instantiation dialog
         return false;
     } catch(Exception e) {

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

@@ -74 +74 @@
    */
     public XMLTransformer() {
-
     // make sure we are using the xalan transformer
-    System.setProperty("javax.xml.transform.TransformerFactory", "org.apache.xalan.processor.TransformerFactoryImpl");
+
+    // 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, 
+    // else it will use the "platform default"
+    // In this case: xalan.jar's META-INF/services/javax.xml.transform.TransformerFactory contains org.apache.xalan.processor.TransformerFactoryImpl
+    // as required.
+
+    // 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
+    // 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.
+
     try {
-        this.t_factory = org.apache.xalan.processor.TransformerFactoryImpl.newInstance();
-
+        this.t_factory = TransformerFactory.newInstance();
     } catch (Exception e) {
         logger.error("exception "+e.getMessage());