/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 1951

Added by Matt Jones almost 21 years ago

Moved the metacat.properties file from the jar file to now be located in
the tomcat context directory in WEB-INF. Now the metacat configuration is
editable in place. This change depends on a new Options.java class in the
utilities module, so be sure you do a "clean" build in metacat so that you
pick up this new class. This satisfies needs for bug 1230.

lib/metacat.properties
3	3	# Matt Jones, Dan Higgins, Jivka Bojilova
4	4	# '$Id$'
5	5	#
	6	configured=false
6	7	user=@user@
7	8	password=@password@
8	9	defaultDB=@jdbc-connect@

     import java.util.Vector;
     import edu.ucsb.nceas.dbadapter.AbstractDatabase;
     import edu.ucsb.nceas.utilities.Options;
     /**
      * A suite of utility classes for the metadata catalog server
-...
     public class MetaCatUtil {
       public static AbstractDatabase dbAdapter;
       private static PropertyResourceBundle options = null;
       private static String propertiesFile = "edu.ucsb.nceas.metacat.metacat";
       private static Options options = null;
       private static boolean debug = true;
       //private Hashtable connectionPool = new Hashtable();
-...
        * Utility method to get an option value from the properties file
+       *
        * @param optionName the name of the option requested
        * @return the String value for the option, or null if not set
        */
       public static String getOption(String optionName) {
           // Get the configuration file information
           if (options == null) {
             options = (PropertyResourceBundle)
               PropertyResourceBundle.getBundle(propertiesFile);
             options = Options.getInstance();
+          }
           String value = (String)options.handleGetObject(optionName);
           String value = options.getOption(optionName);
           return value;
+      }
       /**
        * Utility method to get an option value from a properties file
+       *
        * @param optionName the name of the option requested
        * @param propFile the name of the file where to get the properties from
        */
       public String getOption(String optionName, String propFile) {
         // Get the configuration file information
         PropertyResourceBundle options = (PropertyResourceBundle)
                                          PropertyResourceBundle.getBundle(propFile);
         String value = (String)options.handleGetObject(optionName);
         return value;
+      }
       /** Utility method to convert a file handle into a URL */
       public static URL fileToURL(File file)
+      {
-...
       public static Vector getOptionList(String optiontext)
+      {
         Vector options = new Vector();
         Vector optionsVector = new Vector();
         if(optiontext.indexOf(",") == -1)
+        {
           options.addElement(optiontext);
           return options;
           optionsVector.addElement(optiontext);
           return optionsVector;
+        }
         while(optiontext.indexOf(",") != -1)
+        {
           String s = optiontext.substring(0, optiontext.indexOf(","));
           options.addElement(s.trim());
           optionsVector.addElement(s.trim());
           optiontext = optiontext.substring(optiontext.indexOf(",") + 1,
                                             optiontext.length());
           if(optiontext.indexOf(",") == -1)
           { //catch the last list entry
             options.addElement(optiontext.trim());
             optionsVector.addElement(optiontext.trim());
+          }
+        }
         return options;
         return optionsVector;
+      }
       /** Normalizes the given string. Taken from configXML.java*/

     import javax.servlet.ServletOutputStream;
     import org.ecoinformatics.eml.EMLParser;
     import edu.ucsb.nceas.utilities.Options;
     import org.xml.sax.SAXException;
-...
       public static final String SCHEMALOCATIONKEYWORD = ":schemaLocation";
       public static final String NONAMESPACELOCATION = ":noNamespaceSchemaLocation";
       public static final String EML2KEYWORD =":eml";
       private static final String CONFIG_DIR  = "WEB-INF";
       private static final String CONFIG_NAME = "metacat.properties";
       /**
        * Initialize the servlet by creating appropriate database connections
-...
           this.context = config.getServletContext();
           System.out.println("MetaCatServlet Initialize");
           // Initialize the properties file for our options
           String dirPath = context.getRealPath(CONFIG_DIR);
           File propertyFile = new File(dirPath,CONFIG_NAME);
           Options options = null;
           try {
               options = Options.initialize(propertyFile);
               MetaCatUtil.debugMessage("Options configured: " +
                 options.getOption("configured"), 20);
           } catch (IOException ioe) {
             MetaCatUtil.debugMessage("Error in loading options: "
                +ioe.getMessage(), 20);
+          }
           util = new MetaCatUtil();
           //initial DBConnection pool

                   classpath="${cpath}"
                   debug="${debug}"
                   excludes="**/*.sql **/stringclient/** **/client/*.java"/>
            <copy file="lib/metacat.properties"
                  tofile="${build.dest}/${package.home}/metacat.properties"
                  filtering="yes" />
            <copy file="lib/srbProps.properties"
                  tofile="${build.dest}/${package.home}/srbProps.properties"/>
        </target>
-...
            <copy file="${jdbc}" tofile="${installdir}/WEB-INF/lib/jdbc.jar" />
            <copy file="lib/web.xml.${tomcatversion}"
                  tofile="${installdir}/WEB-INF/web.xml" />
            <copy file="lib/metacat.properties" todir="${installdir}/WEB-INF"
                  filtering="yes" />
            <copy todir="${installdir}" filtering="no">
              <fileset dir="lib">
                <include name="**/*.jpg"/>

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 1951

Added by Matt Jones almost 21 years ago