Changeset 26331 for main

Show
Ignore:
Timestamp:
17.10.2012 20:48:08 (7 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

    r26206 r26331  
    317317 
    318318            if (fedora_info.isActive()) { 
     319 
     320                // if we have either a remote GS 2/3 server, or if we are dealing with a  
     321                // local GS2, or else if it's a local GS3 but with fedora installed elsewhere,  
     322                // we ask for fedora login details now 
     323                File fedora_webapp = new File(gsdl3_src_path+File.separator+"packages"+File.separator+"tomcat"+File.separator+"webapps"+File.separator+"fedora"); 
     324                 
     325                if(isGsdlRemote || !GS3 || !fedora_webapp.exists()) { 
    319326                popupFedoraInfo(); 
     327                } 
     328 
     329                // else if we have a local GS3 with fedora installed within it, we'll be starting  
     330                // up fedora further below, together with the local tomcat 
    320331            } 
    321332             
     
    373384                } 
    374385                else if (!isGsdlRemote) { // local GS3, start the local tomcat 
     386                     
    375387                    GS3ServerThread thread = new GS3ServerThread(gsdl3_src_path, "restart"); 
    376388                    thread.start(); 
     389 
     390                    // If fedora installed inside this local GS3, then ask for fedora login details now. 
     391                    if (fedora_info.isActive()) {  
     392                        File fedora_webapp = new File(gsdl3_src_path+File.separator+"packages"+File.separator+"tomcat"+File.separator+"webapps"+File.separator+"fedora"); 
     393                         
     394                        if(fedora_webapp.exists()) { 
     395                        System.err.println("**** Waiting for the local Greenstone server to start up fedora..."); 
     396                        popupFedoraInfo(); 
     397                        } 
     398                    } 
    377399                } 
    378400                // else web library: GS server is local, but doesn't use the webserver included with GS2