/ - Diff - Metacat - Ecoinformatics Redmine

     dataone.replicationpolicy.default.preferredNodeList=
     dataone.replicationpolicy.default.blockedNodeList=
     # overall services (TODO: mn vs. cn?)
     dataone.mn.services.enabled=true
     dataone.mn.registration.submitted=false
     # state which versions of each MN tier service are availalble
     dataone.mnCore.serviceAvailable=true
     dataone.mnCore.serviceVersion=v1

     <form method="POST" name="configuration_form" action="<%= request.getContextPath() %>/admin"
                                             onsubmit="return submitForm(this);">
     	<h3>Member Node Services</h3>
     	Enable or disable DataONE Member Node Services for this deployment
     	<hr class="config-line">
     	<div class="form-row">
     		<img class="question-mark" src="style/images/question-mark.gif"
     			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
     		<div class="textinput-label"><label for="dataone.mn.services.enabled" title="Enable DataONE Member Node Services">Enable DataONE Services</label></div>
     		<%
     		boolean enableServices = false;
     		String enableServicesString = (String) request.getAttribute("dataone.mn.services.enabled");
     		if (enableServicesString != null) {
     			enableServices = Boolean.parseBoolean(enableServicesString);
+    		}
     		if (enableServices) {
     		%>
     		<input type="checkbox"
     				class="textinput"
     				id="dataone.mn.services.enabled"
     				name="ddataone.mn.services.enabled"
     				value="true"
     				checked="checked"/>
     		<% } else {%>
     		<input type="checkbox"
     				class="textinput"
     				id="dataone.mn.services.enabled"
     				name="dataone.mn.services.enabled"
     				value="true"/>
     		<% } %>
     	</div>
     	<h3>Member Node Configuration</h3>
     	General information identifiying this node, its owner, and contents.  You will need
     	   a certificate to identify the node, and a DataONE account to act as a node contact.
-...
     	<div class="form-row">
     		<img class="question-mark" src="style/images/question-mark.gif"
     			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
     		<div class="textinput-label"><label for="dataone.nodeSynchronize" title="Enable DataONE services by synchronizing metadata">Enable DataONE Services</label></div>
     		<div class="textinput-label"><label for="dataone.nodeSynchronize" title="Enable DataONE metadata synchronization">Enable Metadata Synchronization</label></div>
     		<%
-...
     		if (isUpdateString != null) {
     			isUpdate = Boolean.parseBoolean(isUpdateString);
+    		}
     		// do we know if it is pending approval?
     		boolean isSubmitted = false;
     		String isSubmittedString = (String) request.getAttribute("dataone.mn.registration.submitted");
     		if (isSubmittedString != null) {
     			isSubmitted = Boolean.parseBoolean(isSubmittedString);
+    		}
     	%>
     	<%if (isUpdate) { %>
     		<input class=button type="submit" value="Update"/>
     	<%} else if (isSubmitted) { %>
     		<input class=button type="submit" value="Update" disabled="disabled"/>
     	<%} else { %>
     		<input class=button type="submit" value="Register"/>
     	<%} %>
     	<input class=button type="button" value="Skip" onClick="forward('./admin?configureType=dataone&bypass=true&processForm=true')">
     	<%
     		// if have we already configured this section, then we cannot skip it
     		boolean previouslyConfigured = false;
     		String previouslyConfiguredString = (String) request.getAttribute("configutil.dataoneConfigured");
     		if (previouslyConfiguredString != null) {
     			previouslyConfigured = Boolean.parseBoolean(previouslyConfiguredString);
+    		}
     	%>
     	<%if (!previouslyConfigured) { %>
     		<input class=button type="button" value="Skip" onClick="forward('./admin?configureType=dataone&bypass=true&processForm=true')">
     	<%} %>
     	<input class=button type="button" value="Cancel" onClick="forward('./admin')">
     </form>

     import org.dataone.service.types.v1.Permission;
     import org.dataone.service.types.v1.Subject;
     import org.dataone.service.types.v1.SystemMetadata;
     import org.dataone.service.util.Constants;
     import org.dataone.service.util.DateTimeMarshaller;
     import org.dataone.service.util.ExceptionHandler;
     import org.dataone.service.util.TypeMarshaller;
-...
     import org.xml.sax.SAXException;
     import edu.ucsb.nceas.metacat.dataone.MNodeService;
     import edu.ucsb.nceas.metacat.properties.PropertyService;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     /**
      * MN REST service implementation handler
-...
         	super(servletContext, request, response);
             logMetacat = Logger.getLogger(MNResourceHandler.class);
+        }
         @Override
         protected boolean isD1Enabled() {
         	boolean enabled = false;
         	try {
     			enabled = Boolean.parseBoolean(PropertyService.getProperty("dataone.mn.services.enabled"));
     		} catch (PropertyNotFoundException e) {
     			logMetacat.error("Could not check if DataONE is enabled: " + e.getMessage());
+    		}
         	return enabled;
+        }
         /**
          * This function is called from REST API servlet and handles each request to the servlet
-...
         	super.handle(httpVerb);
             try {
             	// only service requests if we have D1 configured
             	if (!isD1Enabled()) {
             		ServiceFailure se = new ServiceFailure("0000", "DataONE services are not enabled on this node");
                     serializeException(se, response.getOutputStream());
                     return;
+            	}
             	// get the resource
                 String resource = request.getPathInfo();
                 resource = resource.substring(resource.indexOf("/") + 1);

             try {
             	// only service requests if we have D1 configured
             	if (!isD1Enabled()) {
             		ServiceFailure se = new ServiceFailure("0000", "DataONE services are not enabled on this node");
                     serializeException(se, response.getOutputStream());
                     return;
+            	}
                 // get the resource
                 String resource = request.getPathInfo();
                 resource = resource.substring(resource.indexOf("/") + 1);

     import edu.ucsb.nceas.metacat.MetacatHandler;
     import edu.ucsb.nceas.metacat.properties.PropertyService;
     import edu.ucsb.nceas.utilities.Log;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     /**
+     *
-...
                 logMetacat.error(e.getClass() + ": " + e.getMessage(), e);
+            }
+        }
         /**
          * subclasses should provide a more useful implementation
          * @return
          */
         protected boolean isD1Enabled() {
         	return true;
+        }
         protected String parseTrailing(String resource, String token) {
         	// get the rest

+    					}
+    				}
     				// do we know if this is an update or a new registration?
     				// set the configuration state so we know how to render the UI page buttons
     				// if we have already configured once, we cannot skip this page
     				request.setAttribute("configutil.dataoneConfigured", PropertyService.getProperty("configutil.dataoneConfigured"));
     				// do we know if this is an update, pending verification, or a new registration?
     				memberNodeId = (String) request.getAttribute("dataone.memberNodeId");
     				boolean update = isNodeRegistered(memberNodeId);
     				request.setAttribute("dataone.isUpdate", Boolean.toString(update));
     				request.setAttribute("dataone.mn.registration.submitted", PropertyService.getProperty("dataone.mn.registration.submitted"));
     				// enable the services?
     				request.setAttribute("dataone.mn.services.enabled", PropertyService.getProperty("dataone.mn.services.enabled"));
     				// Forward the request to the JSP page
     				RequestUtil.forwardRequest(request, response, "/admin/dataone-configuration.jsp", null);
     			} catch (GeneralPropertyException gpe) {
-...
     					replicate = Boolean.parseBoolean(nodeReplicate);
+    				}
     				// enable services as a whole?
                     boolean servicesEnabled = false;
                     String servicesEnabledString = (String) request.getParameter("dataone.mn.services.enabled");
                     if (servicesEnabledString != null) {
                     	servicesEnabled = Boolean.parseBoolean(servicesEnabledString);
+                    }
     				// process the values, checking for nulls etc..
     				if (nodeName == null ) {
     					validationErrors.add("nodeName cannot be null");
-...
                         PropertyService.setPropertyNoPersist("dataone.replicationpolicy.default.preferredNodeList", preferredNodeList);
                         PropertyService.setPropertyNoPersist("dataone.replicationpolicy.default.blockedNodeList", blockedNodeList);
                         // services
     					PropertyService.setPropertyNoPersist("dataone.mn.services.enabled", Boolean.toString(servicesEnabled));
     					PropertyService.persistProperties();
     			        // Register/update as a DataONE Member Node
-...
     						+ "processing system properties page: " + gpe.getMessage();
     				logMetacat.error(errorMessage);
     				processingErrors.add(errorMessage);
     			} catch (Exception e) {
     				String errorMessage = "D1Admin.configureDataONE error: " + e.getMessage();
     				logMetacat.error(errorMessage);
     				processingErrors.add(errorMessage);
+    			}
     			try {
-...
     	 * retrieved from the getCapabilities() service, and so this should only be called
     	 * after the properties have been properly set up in Metacat.
     	 */
     	private void registerDataONEMemberNode() {
             CNode cn;
             try {
                 logMetacat.debug("Get the Node description.");
                 Node node = MNodeService.getInstance(null).getCapabilities();
                 logMetacat.debug("Setting client certificate location.");
                 String mnCertificatePath = PropertyService.getProperty("D1Client.certificate.file");
                 CertificateManager.getInstance().setCertificateLocation(mnCertificatePath);
                 cn = D1Client.getCN();
     	private void registerDataONEMemberNode() throws BaseException, PropertyNotFoundException, GeneralPropertyException {
             logMetacat.debug("Get the Node description.");
             Node node = MNodeService.getInstance(null).getCapabilities();
             logMetacat.debug("Setting client certificate location.");
             String mnCertificatePath = PropertyService.getProperty("D1Client.certificate.file");
             CertificateManager.getInstance().setCertificateLocation(mnCertificatePath);
             CNode cn = D1Client.getCN();
             // check if this is new or an update
             boolean update = isNodeRegistered(node.getIdentifier().getValue());
             // Session is null, because the libclient code automatically sets up an
             // SSL session for us using the client certificate provided
             Session session = null;
             if (update) {
             	logMetacat.debug("Updating node with DataONE. " + cn.getNodeBaseServiceUrl());
                 boolean result = cn.updateNodeCapabilities(session, node.getIdentifier(), node);
             } else {
                 logMetacat.debug("Registering node with DataONE. " + cn.getNodeBaseServiceUrl());
                 NodeReference mnodeRef = cn.register(session, node);
                 // check if this is new or an update
                 boolean update = isNodeRegistered(node.getIdentifier().getValue());
                 String memberNodeId = mnodeRef.getValue();
                 String existingMemberNodeId = PropertyService.getProperty("dataone.memberNodeId");
     			if (!existingMemberNodeId.equals(memberNodeId)) {
     				// update all existing system Metadata for this node id
     				IdentifierManager.getInstance().updateAuthoritativeMemberNodeId(existingMemberNodeId, memberNodeId);
+    			}
     			// save that we submitted registration
     			PropertyService.setPropertyNoPersist("dataone.mn.registration.submitted", Boolean.TRUE.toString());
                 // save this assigned node id
                 PropertyService.setPropertyNoPersist("dataone.memberNodeId", memberNodeId);
                 // Session is null, because the libclient code automatically sets up an
                 // SSL session for us using the client certificate provided
                 Session session = null;
                 if (update) {
                 	logMetacat.debug("Updating node with DataONE. " + cn.getNodeBaseServiceUrl());
     	            boolean result = cn.updateNodeCapabilities(session, node.getIdentifier(), node);
                 } else {
     	            logMetacat.debug("Registering node with DataONE. " + cn.getNodeBaseServiceUrl());
     	            NodeReference mnodeRef = cn.register(session, node);
     	            String memberNodeId = mnodeRef.getValue();
     	            String existingMemberNodeId = PropertyService.getProperty("dataone.memberNodeId");
     				if (!existingMemberNodeId.equals(memberNodeId)) {
     					// update all existing system Metadata for this node id
     					IdentifierManager.getInstance().updateAuthoritativeMemberNodeId(existingMemberNodeId, memberNodeId);
+    				}
     	            // save this assigned node id
     	            PropertyService.setProperty("dataone.memberNodeId", memberNodeId);
+                }
             } catch (BaseException e) {
                 logMetacat.warn("Could not register as node with DataONE (" + e.getCode() + "/" + e.getDetail_code() + "): " + e.getDescription());
             } catch (PropertyNotFoundException e) {
                 logMetacat.warn("Could not find the location for client certificates: " + e.getMessage());
             } catch (GeneralPropertyException e) {
                 logMetacat.warn("Could not set the assigned node id: " + e.getMessage());
+    		}
                 // persist the properties
                 PropertyService.persistProperties();
+            }
+    	}
     	/**

Project

General

Profile

Metacat

Revision 6994

Added by ben leinfelder almost 13 years ago