/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 3083

Added by Matt Jones over 17 years ago

Modified the configuration classes to allow configuration through the web interface of all of the properties set in the metacat.properties file. The layout of this form still needs work, in particular because java.util.Properties does not maintain any order for the properties, nor does it allow for metadata about each property to be set and saved in the file. We can probably overcome this by creating a shadow file that lists all of the options and their metadata (such as grouping, controlled values, etc).

     <head>
     <title>Metacat Configuration Succeeded</title>
     <style language="Javascript">
     <!--
     body {
         font-family: Arial, sans-serif;
         font-size: 12pt;
         margin-left: 30px;
         margin-right: 30px;
         width: 700px;
+    }
     .section {
         font-size: 16pt;
         font-weight: bold;
         border-bottom: solid #dddddd 1px;
+    }
     -->
     </style>
     </head>
     <body>
     <p><img src="metacat-logo.png" width="75px" align="right"/>
     <p><img src="metacat-logo.png" width="100px" align="right"/>
     <h2>Metacat Configuration Succeeded</h2>
     </p>

     <%@ page    language="java" %>
     <%@ page    language="java" import="java.util.Enumeration" %>
     <%
     /**
      *  '$RCSfile$'
-...
     <head>
     <title>Metacat Configuration</title>
     <style language="Javascript">
     <!--
     body {
         font-family: Arial, sans-serif;
         font-size: 12pt;
         margin-left: 30px;
         margin-right: 30px;
         width: 700px;
+    }
     .section {
         font-size: 16pt;
         font-weight: bold;
         border-bottom: solid #dddddd 1px;
+    }
     -->
     label,input {
     	display: block;
     	width: 400px;
     	float: left;
     	margin-bottom: 10px;
+    }
     label {
     	text-align: right;
     	width: 250px;
     	padding-right: 20px;
+    }
     br {
     	clear: left;
+    }
     input[type="submit"] {
         width: 50px;
+    }
     </style>
     </head>
     <body>
     <p><img src="metacat-logo.png" width="75px" align="right"/>
     <p><img src="metacat-logo.png" width="100px" align="right"/>
     <h2>Metacat Configuration</h2>
     </p>
-...
        up and running.
     </p>
     <br clear="right"/>
     <p class="section">Database connection</p>
     <form method="POST" action="/knb/metacat">
     <p>Database Username:
        <input type="text" name="user" value="<%= request.getAttribute("user") %>"/></p>
     <p>Database Password: <input type="password" name="password" value="<%= request.getAttribute("password") %>"/></p>
     <p><input type="hidden" name="action" value="configure"/>
     <p class="section">All properties (unsorted, need to fix)</p>
     <%
        Enumeration optionsList = (Enumeration)request.getAttribute("optionslist");
        while (optionsList.hasMoreElements()) {
            String name = (String)optionsList.nextElement();
            if (!name.equals("configured")) {
     %>
             <label for="<%= name %>"><%= name %></label>
     	    <input id="<%= name %>" name="<%= name %>"
     	           value="<%= request.getAttribute(name) %>"
     	           <% if (name.equals("password")) { %>
     	           type="password"
     	           <% } else { %>
     	           type="text"
     	           <% } %>
     	           /><br/>
     <%
+           }
+       }
     %>
     <input type="hidden" name="action" value="configure"/>
     <p><input type="submit" value="Save"/></p>
     </form>
     <p class="section">Access controls</p>
     <p>More options go here.</p>
     </body>
     </html>

          */
         private void configureMetacat(HttpServletRequest request,
                 HttpServletResponse response) {
             Options options = (Options)Options.getInstance();
             String action = request.getParameter("action");
             if (action == null || !action.equals("configure")) {
                 // The servlet configuration parameters have not been set, so
                 // redirect to a web form for configuring metacat
                 // First add attributes to the request for all configuration options
                 // TODO: MBJ should not hard code these, but get them from the config
                 // Then the list of attributes can be passed to the form so that the
                 // form can autogenerate the right number of fields.  Still need
                 // to determine a way to get some metadata about each attribute to
                 // the form jsp, such as a description and possibly a widget type
                 // to use and possibly a controlled values list
                 request.setAttribute( "user", MetaCatUtil.getOption("user"));
                 request.setAttribute( "password", MetaCatUtil.getOption("password"));
                 // Add attributes to the request for all configuration options so
                 // that the configuration form can display the names and values of
                 // all configuration options.
                 // TODO: Still need to determine a way to get some metadata about
                 // each attribute to the form jsp, such as a description and
                 // possibly a label and widget type to use and possibly a
                 // controlled values list
                 Enumeration properties = options.propertyNames();
                 while (properties.hasMoreElements()) {
                     String name = (String)properties.nextElement();
                     request.setAttribute( name, MetaCatUtil.getOption(name));
+                }
                 properties = options.propertyNames();
                 request.setAttribute("optionslist", properties);
                 // Forward the request
                 forwardRequest(request, response,
-...
                 // legitimate, and possibly even test them (for example, use
                 // the database connection info to connect to the database)
                 // TODO: MBJ should not hard code these, but get them from the config
                 checkAndSetOption(request, response, "user");
                 checkAndSetOption(request, response, "password");
                 // For each property, check if it is changed and save it
                 Enumeration properties = options.propertyNames();
                 while (properties.hasMoreElements()) {
                     String name = (String)properties.nextElement();
                     checkAndSetOption(request, name);
+                }
                 // Now that the options have been set, change the 'configured'
                 // option to 'true' so that normal metacat requests will go through
-...
          * @param optionName the name of the option to be checked and set
          */
         private void checkAndSetOption(HttpServletRequest request,
                 HttpServletResponse response, String optionName) {
                 String optionName) {
             String value = MetaCatUtil.getOption(optionName);
             String newValue = request.getParameter(optionName);
             if (!newValue.equals(value)) {
             if (newValue != null && !newValue.equals(value)) {
                 MetaCatUtil.setOption(optionName, newValue);
+            }
+        }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 3083

Added by Matt Jones over 17 years ago