perfsonar-dev - perfsonar: r3650 - in branches/WebAdmin: . perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary/wizard
Subject: perfsonar development work
List archive
perfsonar: r3650 - in branches/WebAdmin: . perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary/wizard
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3650 - in branches/WebAdmin: . perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary/wizard
- Date: Tue, 15 Apr 2008 02:56:26 -0400
Author: michalis
Date: 2008-04-15 02:56:26 -0400 (Tue, 15 Apr 2008)
New Revision: 3650
Modified:
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/RRDMAHandler.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
branches/WebAdmin/wizard.properties
Log:
Changes in wizard.properties, in ConfigurationHandler and on HTMLOUtput to
handle some aligning problems
Modified:
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/RRDMAHandler.java
===================================================================
---
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/RRDMAHandler.java
2008-04-14 14:53:36 UTC (rev 3649)
+++
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/RRDMAHandler.java
2008-04-15 06:56:26 UTC (rev 3650)
@@ -440,7 +440,7 @@
// groupig and description
// In order to keep that functionality we need in this case
to use the
// PerfsonarProperties class
- if (group.equals("Store")) {
+ if (!group.equals("Administration")) {
// Using PerfsonarProperties in order to keep the
grouping and
// description
@@ -465,7 +465,13 @@
throw new IOException("Key is invalid
" + key + " ");
} else {
// Change the value of the property
-
property.setValue(functionProperties.getProperty(key));
+
if(functionProperties.getProperty(key).equals("yes"))
+ property.setValue("on");
+ else if
(functionProperties.getProperty(key).equals("no"))
+ property.setValue("off");
+ else
+
property.setValue(functionProperties.getProperty(key));
+
serviceProperties.setProperty(key,
property);
}
properties.setWizardProperty(key,
functionProperties
Modified: branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-04-14 14:53:36 UTC (rev 3649)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-04-15 06:56:26 UTC (rev 3650)
@@ -257,24 +257,25 @@
+
onClick + ">  yes </input>");
out
.println(" <input type=\"radio\" checked
name=\"useLS\" value=\"no\" "
- +
onClick +
">  no </input></td><td>");
+ +
onClick +
">  no </input></td><td>");
} else {
out.println("<tr><td>" +
pr.getPropertyComment()
- +
"</td><td> ");
+ +
"</td><td> ");
String[] values =
pr.getAcceptedValues();
if (values != null) {
for (int i = 0; i <
values.length; i++) {
- String checked =
values[i].equals(pr
+ String checked =
!values[i].equals(pr
.getProposedValue()) ? "checked=\"checked\""
: "";
out.println("<input
type=\"radio\"" + checked
+ "
name=\"" + pr.getKey() + "\" value=\""
+
values[i] + "\" " + onClick + ">  "
- +
values[i] + " </input></td><td>");
+ +
values[i] + " </input></td><td>");
}
}
+
out.println(" ");
}
out.println("</td></tr>");
out.println("</table>");
Modified: branches/WebAdmin/wizard.properties
===================================================================
--- branches/WebAdmin/wizard.properties 2008-04-14 14:53:36 UTC (rev 3649)
+++ branches/WebAdmin/wizard.properties 2008-04-15 06:56:26 UTC (rev 3650)
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties [
- <!ELEMENT properties ( comment?, property* )>
-<!ATTLIST properties version CDATA #FIXED "0.1">
-<!ELEMENT comment (#PCDATA) >
-<!ELEMENT property (entry,Comment,ProposedValue,Group+,AcceptedValue*) >
-<!ELEMENT entry (#PCDATA) >
-<!ATTLIST entry
-key CDATA #REQUIRED
- password (true|false) #IMPLIED
- required (true|false) #IMPLIED >
-<!ELEMENT Comment (#PCDATA) >
-<!ELEMENT ProposedValue (#PCDATA) >
-<!ELEMENT Group (#PCDATA) >
-<!ATTLIST Group
- order CDATA #REQUIRED
- check (true|false) #IMPLIED
->
-<!ELEMENT AcceptedValue (#PCDATA) >
+<!DOCTYPE properties [
+ <!ELEMENT properties ( comment?, property* )>
+<!ATTLIST properties version CDATA #FIXED "0.1">
+<!ELEMENT comment (#PCDATA) >
+<!ELEMENT property (entry,Comment,ProposedValue,Group+,AcceptedValue*) >
+<!ELEMENT entry (#PCDATA) >
+<!ATTLIST entry
+key CDATA #REQUIRED
+ password (true|false) #IMPLIED
+ required (true|false) #IMPLIED >
+<!ELEMENT Comment (#PCDATA) >
+<!ELEMENT ProposedValue (#PCDATA) >
+<!ELEMENT Group (#PCDATA) >
+<!ATTLIST Group
+ order CDATA #REQUIRED
+ check (true|false) #IMPLIED
+>
+<!ELEMENT AcceptedValue (#PCDATA) >
]>
<properties>
- <comment>Last Modification Wed Mar 26 11:50:33 EET 2008</comment>
+ <comment>Last Modification Tue Apr 15 11:11:11 EEST 2008</comment>
<property>
<entry key="component.ma.xmldb.db_username"
required="true">rrdmaservice</entry>
<Comment>Enter the service username for the eXist user:</Comment>
@@ -39,15 +39,15 @@
<Group order="4">eXist</Group>
</property>
<property>
- <entry key="servlet.password" required="true" password="true" />
+ <entry key="servlet.password" required="true"
password="true">test</entry>
<Comment>Enter the password for logging in to the admin pages:</Comment>
- <ProposedValue />
+ <ProposedValue>test</ProposedValue>
<Group order="2">Administration</Group>
</property>
<property>
- <entry key="servlet.username" required="true">perfsonaruser</entry>
+ <entry key="servlet.username" required="true">test</entry>
<Comment>Enter the username for logging in to the admin pages:</Comment>
- <ProposedValue>perfsonaruser</ProposedValue>
+ <ProposedValue>test</ProposedValue>
<Group order="1" check="false">Administration</Group>
</property>
<property>
@@ -110,5 +110,19 @@
<ProposedValue>30000</ProposedValue>
<Group order="6">LS</Group>
</property>
+ <property>
+ <entry key="service.as.authn_active" required="true">no</entry>
+ <Comment>Do you wish to enable authentication?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="1" check="true">AS</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
+ <Comment>Enter the URL address of the Authentication Service:</Comment>
+
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
+ <Group order="2">AS</Group>
+ </property>
</properties>
- perfsonar: r3650 - in branches/WebAdmin: . perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary/wizard, svnlog, 04/15/2008
Archive powered by MHonArc 2.6.16.