Changeset 26331 for main/trunk/gli

Timestamp:

2012-10-17T20:48:08+13:00 (12 years ago)

Author:

ak19

Message:

If local GS3 with a fedora installed as a webapp in GS3's tomcat packages, then we ask for fedora login details after starting up the local tomcat server.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -317 +317 @@
 
             if (fedora_info.isActive()) {
+
+                // if we have either a remote GS 2/3 server, or if we are dealing with a 
+                // local GS2, or else if it's a local GS3 but with fedora installed elsewhere, 
+                // we ask for fedora login details now
+                File fedora_webapp = new File(gsdl3_src_path+File.separator+"packages"+File.separator+"tomcat"+File.separator+"webapps"+File.separator+"fedora");
+                
+                if(isGsdlRemote || !GS3 || !fedora_webapp.exists()) {
                 popupFedoraInfo();
+                }
+
+                // else if we have a local GS3 with fedora installed within it, we'll be starting 
+                // up fedora further below, together with the local tomcat
             }
             
@@ -373 +384 @@
                 }
                 else if (!isGsdlRemote) { // local GS3, start the local tomcat
+                    
                     GS3ServerThread thread = new GS3ServerThread(gsdl3_src_path, "restart");
                     thread.start();
+
+                    // If fedora installed inside this local GS3, then ask for fedora login details now.
+                    if (fedora_info.isActive()) { 
+                        File fedora_webapp = new File(gsdl3_src_path+File.separator+"packages"+File.separator+"tomcat"+File.separator+"webapps"+File.separator+"fedora");
+                        
+                        if(fedora_webapp.exists()) {
+                        System.err.println("**** Waiting for the local Greenstone server to start up fedora...");
+                        popupFedoraInfo();
+                        }
+                    }
                 }
                 // else web library: GS server is local, but doesn't use the webserver included with GS2