Changeset 21918

Show
Ignore:
Timestamp:
20.04.2010 14:46:09 (10 years ago)
Author:
sjm84
Message:

Further reorganising folders for GAI extension changes

Location:
main/trunk/greenstone3/src/java/org/greenstone/admin
Files:
1 added
9 removed
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/admin/GAI.java

    r10953 r21918  
    4040import org.greenstone.gsdl3.util.Dictionary; 
    4141import org.greenstone.admin.gui.SetServerPane; 
     42import org.greenstone.gsdl3.util.GSPath; 
    4243 
    4344/** Containing the top-level "core" for the GAI(Greenstone Administrator 
     
    8788 
    8889    } 
     90 
     91    public static String getGSDL3Home(){ 
     92     
     93    String gsdl3Home = gsdl3_web_home; 
     94    String os = "linux"; 
     95     
     96    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){ 
     97        gsdl3Home = gsdl3Home.replaceAll("\\\\", "/"); 
     98        os = "windows"; 
     99    } 
     100         
     101    gsdl3Home = GSPath.removeLastLink(gsdl3Home); 
     102     
     103    if(os.equals("windows")){ 
     104        gsdl3Home = gsdl3Home.replaceAll("/", "\\\\"); 
     105    } 
     106    return gsdl3Home; 
     107    } 
     108 
     109    public static String getGSDL3ExtensionHome(){ 
     110    String gsdl3ExtHome = gsdl3_web_home; 
     111    String os = "linux"; 
     112 
     113    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){ 
     114        gsdl3ExtHome = gsdl3ExtHome.replaceAll("\\\\", "/"); 
     115        os = "windows"; 
     116    } 
     117     
     118    gsdl3ExtHome = GSPath.removeLastLink(gsdl3ExtHome); 
     119    gsdl3ExtHome += "/ext"; 
     120     
     121    if(os.equals("windows")){ 
     122        gsdl3ExtHome = gsdl3ExtHome.replaceAll("/", "\\\\"); 
     123    } 
     124    return gsdl3ExtHome; 
     125    } 
    89126     
    90127    public static void main (String[] args){ 
  • main/trunk/greenstone3/src/java/org/greenstone/admin/GAIManager.java

    r18113 r21918  
    3434import org.greenstone.admin.gui.LogPane; 
    3535import org.greenstone.admin.gui.ConfPane; 
    36 import org.greenstone.admin.gui.ExtPane; 
     36import org.greenstone.admin.guiext.ExtPane; 
    3737 
    3838//import java AWT classes 
     
    126126        //set up the ext Pane 
    127127        if (Configuration.get("admin.ext")){ 
    128         ext_pane = new ExtPane(); 
    129             ext_pane.display(); 
     128        ext_pane = new ExtPane(); 
     129 
     130        ext_pane.display(); 
    130131        tab_pane.addTab("Extensions", EXT_ICON, ext_pane); 
    131132        tab_pane.setEnabledAt(tab_pane.indexOfComponent(ext_pane),Configuration.get("admin.ext"));