Changeset 22085

Timestamp:

2010-05-14T10:14:31+12:00 (13 years ago)

Author:

sjm84

Message:

Created a util package from classes that could be useful outside of their original packages

Location:

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

Files:

• admin/GAI.java (modified) (1 diff)
• admin/GAIFirstSettingFrame.java (modified) (1 diff)
• admin/GAIManager.java (modified) (2 diffs)
• admin/gui/ConfPane.java (modified) (1 diff)
• admin/gui/LogPane.java (modified) (1 diff)
• admin/gui/MenuBar.java (modified) (1 diff)
• admin/gui/SetServerPane.java (modified) (1 diff)
• admin/guiext/BaseExt.java (modified) (1 diff)
• admin/guiext/ExtPane.java (modified) (1 diff)
• admin/guiext/PropertiesStep.java (modified) (1 diff)
• gsdl3/SOAPServerlocalsite.java (modified) (1 diff)
• gsdl3/action/PageAction.java (modified) (1 diff)
• gsdl3/comms/SOAPCommunicator.java (modified) (1 diff)
• gsdl3/core/MessageRouter.java (modified) (1 diff)
• gsdl3/core/Page.java (modified) (1 diff)
• gsdl3/core/Receptionist.java (modified) (1 diff)
• gsdl3/core/TransformingReceptionist.java (modified) (1 diff)
• gsdl3/service/AbstractDocumentRetrieve.java (modified) (2 diffs)
• gsdl3/service/BerryBasket.java (modified) (1 diff)
• gsdl3/service/IViaRetrieve.java (modified) (1 diff)
• gsdl3/service/IViaSearch.java (modified) (1 diff)
• gsdl3/util/OAIXML.java (modified) (1 diff)
• server/BaseServer.java (modified) (1 diff)
• server/BaseServerSettings.java (modified) (1 diff)
• server/Server2.java (modified) (1 diff)
• server/Server2Settings.java (modified) (1 diff)
• server/Server3.java (modified) (1 diff)
• server/Server3Settings.java (modified) (1 diff)
• util (added)
• util/BrowserLauncher.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/server/BrowserLauncher.java ) (3 diffs)
• util/Configuration.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/admin/Configuration.java ) (1 diff)
• util/GlobalProperties.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GlobalProperties.java ) (3 diffs)
• util/Misc.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/Misc.java ) (1 diff)
• util/PortFinder.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/server/PortFinder.java ) (1 diff)
• util/RunAnt.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/server/RunAnt.java ) (1 diff)
• util/RunMake.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/server/RunMake.java ) (1 diff)
• util/RunTarget.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/server/RunTarget.java ) (2 diffs)
• util/ScriptReadWrite.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/server/ScriptReadWrite.java ) (1 diff)
• util/StreamGobbler.java (moved) (moved from main/trunk/greenstone3/src/java/org/greenstone/server/StreamGobbler.java ) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/admin/GAI.java

@@ -38 +38 @@
 import javax.swing.text.*;
 
+import org.greenstone.util.Configuration;
 import org.greenstone.gsdl3.util.Dictionary;
 import org.greenstone.admin.gui.SetServerPane;

main/trunk/greenstone3/src/java/org/greenstone/admin/GAIFirstSettingFrame.java

@@ -49 +49 @@
 import javax.swing.tree.*;
 
+import org.greenstone.util.Configuration;
 import org.greenstone.core.ParsingProgress;
 import org.greenstone.admin.gui.SetServerPane;

main/trunk/greenstone3/src/java/org/greenstone/admin/GAIManager.java

@@ -35 +35 @@
 import org.greenstone.admin.gui.ConfPane;
 import org.greenstone.admin.guiext.ExtPane;
+
+import org.greenstone.util.Configuration;
 
 //import java AWT classes
@@ -87 +89 @@
     //this.addFocusListener(new GAIGUIFocusListener()); 
     //display();
+    Image img = Toolkit.getDefaultToolkit().getImage("admin32.png");
+    this.setIconImage(img);
     }
 

main/trunk/greenstone3/src/java/org/greenstone/admin/gui/ConfPane.java

@@ -56 +56 @@
 import org.greenstone.admin.GAI;
 import org.greenstone.admin.GAIManager;
-import org.greenstone.admin.Configuration;
 import org.greenstone.admin.gui.ThreadControl;
 //import org.greenstone.admin.gui.ConfSettingTableModel;
 import org.greenstone.admin.gui.SiteConfSetting;
 import org.greenstone.core.ParsingProgress;
+
+import org.greenstone.util.Configuration;
 import org.greenstone.gsdl3.util.GSFile;
 

main/trunk/greenstone3/src/java/org/greenstone/admin/gui/LogPane.java

@@ -48 +48 @@
 import org.greenstone.admin.GAIManager;
 import org.greenstone.admin.GAI;
-import org.greenstone.admin.Configuration;
+import org.greenstone.util.Configuration;
 
 /** The Log pane is to view the status of relevant log files in GSIII

main/trunk/greenstone3/src/java/org/greenstone/admin/gui/MenuBar.java

@@ -43 +43 @@
 
 import org.greenstone.admin.GAI;
-import org.greenstone.admin.Configuration;
+import org.greenstone.util.Configuration;
 
 /** The menu bar for the Administration tools main GUI. 

main/trunk/greenstone3/src/java/org/greenstone/admin/gui/SetServerPane.java

@@ -55 +55 @@
 import java.sql.*;
 
-import org.greenstone.admin.Configuration;
+import org.greenstone.util.Configuration;
 import org.greenstone.core.ParsingProgress;
 import org.greenstone.admin.GAI;

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/BaseExt.java

@@ -11 +11 @@
 
 import org.greenstone.gsdl3.util.GSPath;
-import org.greenstone.gsdl3.util.GlobalProperties;
+import org.greenstone.util.GlobalProperties;
 import org.w3c.dom.*;
 

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/ExtPane.java

@@ -26 +26 @@
 import org.greenstone.admin.GAIManager;
 import org.greenstone.admin.GAI;
-import org.greenstone.admin.Configuration;
+
+import org.greenstone.util.Configuration;
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.util.GSPath;
-import org.greenstone.gsdl3.util.GlobalProperties;
 
 import org.w3c.dom.Document;

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/PropertiesStep.java

@@ -31 +31 @@
 import org.w3c.dom.Element;
 
-import org.greenstone.admin.Configuration;
+import org.greenstone.util.Configuration;
 import org.greenstone.admin.LoggedMessageArea;
 

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

@@ -21 +21 @@
 
 import org.greenstone.gsdl3.core.MessageRouter;
-import org.greenstone.gsdl3.util.GlobalProperties;
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -1 +1 @@
 package org.greenstone.gsdl3.action;
 
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.core.ModuleInterface;
 import org.greenstone.gsdl3.util.*;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/comms/SOAPCommunicator.java

@@ -19 +19 @@
 package org.greenstone.gsdl3.comms;
 
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.util.*;
 import org.greenstone.gsdl3.core.*;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -19 +19 @@
 package org.greenstone.gsdl3.core;
 
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.util.*;
 import org.greenstone.gsdl3.service.*;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Page.java

@@ -4 +4 @@
 import java.util.HashMap;
 
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.util.*;
 import org.w3c.dom.*;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -1 +1 @@
 package org.greenstone.gsdl3.core;
 
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.util.*;
 import org.greenstone.gsdl3.action.*;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -1 +1 @@
 package org.greenstone.gsdl3.core;
 
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.util.*;
 import org.greenstone.gsdl3.action.*;

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

@@ -22 +22 @@
 
 // Greenstone classes
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSXML;
@@ -27 +28 @@
 import org.greenstone.gsdl3.util.MacroResolver;
 import org.greenstone.gsdl3.util.OID;
-import org.greenstone.gsdl3.util.GlobalProperties;
 import org.greenstone.gsdl3.util.GSConstants;
 

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

@@ -30 +30 @@
 import org.w3c.dom.NodeList;
 
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSPath;
-import org.greenstone.gsdl3.util.GlobalProperties;
 
 import java.net.InetAddress;

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

@@ -3 +3 @@
 // Greenstone classes
 import org.greenstone.gsdl3.core.GSException;
+import org.greenstone.util.Misc;
 import org.greenstone.gsdl3.util.*;
 

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

@@ -2 +2 @@
 
 // Greenstone classes
+import org.greenstone.util.Misc;
 import org.greenstone.gsdl3.util.*;
 

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

@@ -18 +18 @@
  */
 package org.greenstone.gsdl3.util;
+
+import org.greenstone.util.GlobalProperties;
 
 import org.w3c.dom.*;

main/trunk/greenstone3/src/java/org/greenstone/server/BaseServer.java

@@ -12 +12 @@
 
 import org.apache.log4j.*;
+
+import org.greenstone.util.RunTarget;
+import org.greenstone.util.BrowserLauncher;
 
 import org.greenstone.gsdl3.util.Dictionary;

main/trunk/greenstone3/src/java/org/greenstone/server/BaseServerSettings.java

@@ -11 +11 @@
 
 import org.apache.log4j.*;
+
+import org.greenstone.util.ScriptReadWrite;
 
 public abstract class BaseServerSettings extends JDialog implements ActionListener

main/trunk/greenstone3/src/java/org/greenstone/server/Server2.java

@@ -18 +18 @@
 
 import org.apache.log4j.*;
+
+import org.greenstone.util.PortFinder;
+import org.greenstone.util.ScriptReadWrite;
+import org.greenstone.util.RunMake;
+import org.greenstone.util.RunAnt;
 
 import org.greenstone.server.BaseServer;

main/trunk/greenstone3/src/java/org/greenstone/server/Server2Settings.java

@@ -12 +12 @@
 
 import org.greenstone.server.BaseServerSettings;
+import org.greenstone.util.ScriptReadWrite;
 
 public class Server2Settings extends BaseServerSettings

main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

@@ -4 +4 @@
 import java.io.File;
 
+import org.greenstone.util.RunAnt;
+
 import org.greenstone.server.BaseServer;
 import org.greenstone.server.BaseProperty;
-import org.greenstone.gsdl3.util.GlobalProperties;
+import org.greenstone.util.GlobalProperties;
 
 public class Server3 extends BaseServer

main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java

@@ -10 +10 @@
 import org.w3c.dom.*;
 
+import org.greenstone.util.ScriptReadWrite;
+
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.util.GSXML;
-import org.greenstone.gsdl3.util.GlobalProperties;
 import org.greenstone.gsdl3.util.XMLConverter;
 

main/trunk/greenstone3/src/java/org/greenstone/util/BrowserLauncher.java

@@ -1 @@
-package org.greenstone.server;
+package org.greenstone.util;
 
 import java.io.BufferedReader;
@@ -5 +5 @@
 import java.io.InputStreamReader;
 
-import org.greenstone.gsdl3.util.Misc;
+import org.greenstone.server.BaseProperty;
+import org.greenstone.util.Misc;
 import org.apache.log4j.*;
 
@@ -11 +12 @@
     extends Thread {
     private String url = "about:blank" ;
-    static Logger logger = Logger.getLogger(org.greenstone.server.BrowserLauncher.class.getName());
+    static Logger logger = Logger.getLogger(org.greenstone.util.BrowserLauncher.class.getName());
     private String[] default_browsers = new String[]{"firefox","mozilla"};
     private String command = "";

main/trunk/greenstone3/src/java/org/greenstone/util/Configuration.java

@@ -31 +31 @@
  *########################################################################
  */
-package org.greenstone.admin;
+package org.greenstone.util;
 
 import java.awt.Color;

main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java

@@ -17 +17 @@
  *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-package org.greenstone.gsdl3.util;
+package org.greenstone.util;
 
 import java.util.Properties;
@@ -29 +29 @@
 
 
-    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.GlobalProperties.class.getName());
+    static Logger logger = Logger.getLogger(org.greenstone.util.GlobalProperties.class.getName());
     private static Properties properties = null;
     private static String properties_filename = "global.properties";
@@ -66 +66 @@
 
 
-            InputStream in = Class.forName("org.greenstone.gsdl3.util.GlobalProperties").getClassLoader().getResourceAsStream(properties_filename);
+            InputStream in = Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream(properties_filename);
             if (in != null) {
             logger.debug("loading global properties");

main/trunk/greenstone3/src/java/org/greenstone/util/Misc.java

@@ -18 +18 @@
  */
 
-package org.greenstone.gsdl3.util;
+package org.greenstone.util;
 
 import java.util.HashMap;

main/trunk/greenstone3/src/java/org/greenstone/util/PortFinder.java

@@ -1 @@
-package org.greenstone.server;
+package org.greenstone.util;
 
 /** Verbatim copy of what's in GLI's org.greenstone.gatherer.util */

main/trunk/greenstone3/src/java/org/greenstone/util/RunAnt.java

@@ -1 @@
-package org.greenstone.server;
+package org.greenstone.util;
 
-import org.greenstone.server.RunTarget;
+import org.greenstone.util.RunTarget;
 
 public class RunAnt extends RunTarget 

main/trunk/greenstone3/src/java/org/greenstone/util/RunMake.java

@@ -1 @@
-package org.greenstone.server;
+package org.greenstone.util;
 
-import org.greenstone.server.RunTarget;
+import org.greenstone.util.RunTarget;
 
 public class RunMake extends RunTarget 

main/trunk/greenstone3/src/java/org/greenstone/util/RunTarget.java

@@ -1 @@
-package org.greenstone.server;
+package org.greenstone.util;
 
 import java.io.IOException;
@@ -6 +6 @@
 import java.io.InputStreamReader;
 
-import org.greenstone.server.StreamGobbler;
+import org.greenstone.util.StreamGobbler;
 
 import org.apache.log4j.*;

main/trunk/greenstone3/src/java/org/greenstone/util/ScriptReadWrite.java

@@ -1 @@
-package org.greenstone.server;
+package org.greenstone.util;
 
 import java.io.BufferedReader;

main/trunk/greenstone3/src/java/org/greenstone/util/StreamGobbler.java

@@ -1 @@
-package org.greenstone.server;
+package org.greenstone.util;
 
 import java.io.BufferedReader;
@@ -9 +9 @@
 
 class StreamGobbler{
-    static Logger logger = Logger.getLogger(org.greenstone.server.StreamGobbler.class.getName());
+    static Logger logger = Logger.getLogger(org.greenstone.util.StreamGobbler.class.getName());
     
     public static void logError(InputStream in)