Revision 6994
Added by ben leinfelder almost 13 years ago
dataone-configuration.jsp | ||
---|---|---|
72 | 72 |
<form method="POST" name="configuration_form" action="<%= request.getContextPath() %>/admin" |
73 | 73 |
onsubmit="return submitForm(this);"> |
74 | 74 |
|
75 |
<h3>Member Node Services</h3> |
|
76 |
Enable or disable DataONE Member Node Services for this deployment |
|
77 |
|
|
78 |
<hr class="config-line"> |
|
79 |
<div class="form-row"> |
|
80 |
<img class="question-mark" src="style/images/question-mark.gif" |
|
81 |
onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/> |
|
82 |
<div class="textinput-label"><label for="dataone.mn.services.enabled" title="Enable DataONE Member Node Services">Enable DataONE Services</label></div> |
|
83 |
|
|
84 |
<% |
|
85 |
|
|
86 |
boolean enableServices = false; |
|
87 |
String enableServicesString = (String) request.getAttribute("dataone.mn.services.enabled"); |
|
88 |
if (enableServicesString != null) { |
|
89 |
enableServices = Boolean.parseBoolean(enableServicesString); |
|
90 |
} |
|
91 |
|
|
92 |
if (enableServices) { |
|
93 |
%> |
|
94 |
<input type="checkbox" |
|
95 |
class="textinput" |
|
96 |
id="dataone.mn.services.enabled" |
|
97 |
name="ddataone.mn.services.enabled" |
|
98 |
value="true" |
|
99 |
checked="checked"/> |
|
100 |
<% } else {%> |
|
101 |
<input type="checkbox" |
|
102 |
class="textinput" |
|
103 |
id="dataone.mn.services.enabled" |
|
104 |
name="dataone.mn.services.enabled" |
|
105 |
value="true"/> |
|
106 |
<% } %> |
|
107 |
|
|
108 |
</div> |
|
109 |
|
|
75 | 110 |
<h3>Member Node Configuration</h3> |
76 | 111 |
General information identifiying this node, its owner, and contents. You will need |
77 | 112 |
a certificate to identify the node, and a DataONE account to act as a node contact. |
... | ... | |
147 | 182 |
<div class="form-row"> |
148 | 183 |
<img class="question-mark" src="style/images/question-mark.gif" |
149 | 184 |
onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/> |
150 |
<div class="textinput-label"><label for="dataone.nodeSynchronize" title="Enable DataONE services by synchronizing metadata">Enable DataONE Services</label></div>
|
|
185 |
<div class="textinput-label"><label for="dataone.nodeSynchronize" title="Enable DataONE metadata synchronization">Enable Metadata Synchronization</label></div>
|
|
151 | 186 |
|
152 | 187 |
<% |
153 | 188 |
|
... | ... | |
336 | 371 |
if (isUpdateString != null) { |
337 | 372 |
isUpdate = Boolean.parseBoolean(isUpdateString); |
338 | 373 |
} |
374 |
// do we know if it is pending approval? |
|
375 |
boolean isSubmitted = false; |
|
376 |
String isSubmittedString = (String) request.getAttribute("dataone.mn.registration.submitted"); |
|
377 |
if (isSubmittedString != null) { |
|
378 |
isSubmitted = Boolean.parseBoolean(isSubmittedString); |
|
379 |
} |
|
339 | 380 |
%> |
340 | 381 |
<%if (isUpdate) { %> |
341 | 382 |
<input class=button type="submit" value="Update"/> |
383 |
<%} else if (isSubmitted) { %> |
|
384 |
<input class=button type="submit" value="Update" disabled="disabled"/> |
|
342 | 385 |
<%} else { %> |
343 | 386 |
<input class=button type="submit" value="Register"/> |
344 | 387 |
<%} %> |
345 |
<input class=button type="button" value="Skip" onClick="forward('./admin?configureType=dataone&bypass=true&processForm=true')"> |
|
388 |
<% |
|
389 |
// if have we already configured this section, then we cannot skip it |
|
390 |
boolean previouslyConfigured = false; |
|
391 |
String previouslyConfiguredString = (String) request.getAttribute("configutil.dataoneConfigured"); |
|
392 |
if (previouslyConfiguredString != null) { |
|
393 |
previouslyConfigured = Boolean.parseBoolean(previouslyConfiguredString); |
|
394 |
} |
|
395 |
%> |
|
396 |
<%if (!previouslyConfigured) { %> |
|
397 |
<input class=button type="button" value="Skip" onClick="forward('./admin?configureType=dataone&bypass=true&processForm=true')"> |
|
398 |
<%} %> |
|
346 | 399 |
<input class=button type="button" value="Cancel" onClick="forward('./admin')"> |
347 | 400 |
|
348 | 401 |
</form> |
Also available in: Unified diff
dataone configuration and registration enhancements:
include flag to disable D1 services, currently only the MN side enforces thisoften this is a client cert issue (at least for my testing)-do not allow multiple registration attempts if we have just submitted and are awaiting Node verification by the CN.
-do not allow configuration "bypass" if D1 settings have been configured previously.
-do not allow update if Node verification is pending
-report errors that occur when calling cn.register or cn.updateNodeCapabilities -