Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4673 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary/wizard

Subject: perfsonar development work

List archive

perfsonar: r4673 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary/wizard


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4673 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary/wizard
  • Date: Mon, 27 Oct 2008 13:24:41 -0400
Author: pgerakios
Date: 2008-10-27 13:24:41 -0400 (Mon, 27 Oct 2008)
New Revision: 4673

Modified:
branches/WebAdmin/CHANGELOG
branches/WebAdmin/ant/const.properties
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
Log:
0.9.0c

Modified: branches/WebAdmin/CHANGELOG
===================================================================
--- branches/WebAdmin/CHANGELOG 2008-10-26 23:15:41 UTC (rev 4672)
+++ branches/WebAdmin/CHANGELOG 2008-10-27 17:24:41 UTC (rev 4673)
@@ -16,3 +16,9 @@
Fixed section ordering issue - Groups in wizard.properties are displayed in
the order read in the .properties file
- LoadClass now matches the types of arguments with an appropriate
constructor super-type.

+
+0.9.0c:
+
+- Fixed HTML bug - Now HTML is displayed properly for all services
+- Fixed LS label bug in Wizard - radio button
+- Added debugging code

Modified: branches/WebAdmin/ant/const.properties
===================================================================
--- branches/WebAdmin/ant/const.properties 2008-10-26 23:15:41 UTC (rev
4672)
+++ branches/WebAdmin/ant/const.properties 2008-10-27 17:24:41 UTC (rev
4673)
@@ -9,7 +9,7 @@
target.server=127.0.0.1
service.name=perfsonar-web-admin
jarfilename=perfsonar-web-admin
-version=0.9.9b
+version=0.9.0c

antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080303.jar

Modified: branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-10-26 23:15:41 UTC (rev 4672)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-10-27 17:24:41 UTC (rev 4673)
@@ -39,6 +39,9 @@
private static final String nbsp = " ";
// The servlet output stream that will be used to output the html code
private static ServletOutputStream out = null;
+
+ private int debug = 0;
+ private String html = "";

// A Linked List containing the various grouped to be configured
private static LinkedList Groups;
@@ -69,6 +72,10 @@
public HTMLOutput() {
}

+ public String debugString()
+ {
+ return html;
+ }
//
-----------------------------------------------------------------------
// public methods

@@ -139,14 +146,13 @@
println("</td></tr>");
}
println("</table><p>");
- out
- .println("<p><input type=\"submit\"
name=\"Submit\" value=\"Submit\"></p>");
+ println("<p><input type=\"submit\" name=\"Submit\"
value=\"Submit\"></p>");
println("</form> ");
println("</div>");
println("</div>");
println("</body>");
println("</html>");
- out.close();
+ close();

}

@@ -184,14 +190,13 @@
+ "\" value=\"" + values[i] + "\" >"
+ values[i]
+ "</input>");
}
- out
- .println("<p><input type=\"submit\"
name=\"Submit\" value=\"Submit\" ></p>");
+ println("<p><input type=\"submit\" name=\"Submit\"
value=\"Submit\" ></p>");
println("</form> ");
println("</div>");
println("</div>");
println("</body>");
println("</html>");
- out.close();
+ close();

}

@@ -215,16 +220,26 @@
println("</div>");
println("</body>");
println("</html>");
- out.close();
+ close();

}

- String html = "";
+ public void setDebug( int d )
+ {
+ debug = d;
+ }
+
+ private void close() throws IOException
+ {
+ if( out != null ) out.close();
+ html += "\n";
+ }
+
private void println( String string ) throws IOException
{
- System.out.println(string);
- out.println(string);
- html += string + "\n";
+ if( debug < 5 ) System.out.println(string);
+ if( debug < 4 ) out.println(string);
+ if( debug >= 5 ) html += string + "\n";
}

private static String btag( String name , String body , String ...
atts )
@@ -429,8 +444,8 @@
println("<div class=\"top\"><br>" + message + "</br></div>");
println("<div id=\"properties\" class=\"properties\">");
println("<form action=\"Wizard\" name=\"wizardForm\"
method=\"GET\" onsubmit=\"return checkStarFields()\" > ");
- out
- .println("<input type=\"hidden\"
name=\"function\" value=\"finish\" >");
+
+ println("<input type=\"hidden\" name=\"function\"
value=\"finish\" />");
while (groupIt.hasNext()) {
String group = groupIt.next();
println("<p class=\"groupheading\">" + group + "
Configuration:</p>");
@@ -445,8 +460,7 @@
onClick = " onclick=\"checkIt(this);\"";
if (group.equals("LS")) {
it = pro.orderedKeys();
- out
- .println("<input
type=\"hidden\" value=\"yes\" id=\"Vl_useLS\" />");
+
println("<input type=\"hidden\" value=\"yes\" id=\"Vl_useLS\" />");
} else {
println("<input type=\"hidden\"
value=\""
+
pr.getProposedValue() + "\" id=\"Vl_"
@@ -461,18 +475,15 @@
if (group.equals("LS") || pr.getCheck()) {
if (group.equals("LS")) {

- out
- .println("<tr><td>Do
you wish to register with an LS?</td><td>" + times(13));
+ println("<tr><td>Do you wish to
register with an LS?</td><td>" + times(13));
//
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
//
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

//&nbsp;&nbsp;&nbsp;");
- out
- .println("<input
type=\"radio\" name=\"useLS\" value=\"yes\" "
+ println("<input type=\"radio\"
name=\"useLS\" value=\"yes\" "
+
onClick + ">" + times(2) + "yes" + nbsp + "</input>");
- out
- .println(times(5)+
+ println(times(5)+

"<input type=\"radio\" checked name=\"useLS\" value=\"no\" "
- +
onClick + ">" + times(14) + "</input></td><td>");
+ +
onClick + ">" + times(2) + "no" + times(14) + "</input></td><td>");

//&nbsp&nbsp;no&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

//&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

//&nbsp;&nbsp;&nbsp;&nbsp;
@@ -521,13 +532,14 @@
}

boolean check=false,closed=true;
- while (it.hasNext()) {
+ while (it.hasNext())
+ {
pr = pro.getWizardProperty((String)
it.next());
if(pr.getCheck()){
if(!check){
check=true;
}else{
- println("</div>");
+
println("</table></div></td></tr>");
}
display = "none";
onClick = "
onclick=\"checkIt(this);\"";
@@ -552,32 +564,35 @@
}
}
println(nbsp);
- println("</td></tr></td></tr>");
- println("<tr ><td colspan=\"2\"><div
class=\"inner_properties\" id=\"" + id + "\" style=\"display:"+ display +
";\">");
+ println("</td></tr>"); //CHANGED:
</td></tr>
+ println("<tr ><td colspan=\"2\"><div
class=\"inner_properties\" id=\"" + id + "\" style=\"display:"+ display +
";\"><table>");
closed=false;
}else{
if(pr.getDependency()==null && check){
+
println("</table></DIV></td></tr><!-- HERE -->");

//println("</table></div></td></tr>");
check=false;
}
this.showProperty(pr);
}
- }
+
+ } //end loop
+
if(check){
- //println("</table></div></td></tr>");
+ println("</table></div></td></tr>");
}

println("</table>");
println("</div>");
}
- out.print(times(126));
+ println(times(126));
println("<input align=\"right\" input id=\"Button\"
class=\"submit_button\" type=\"submit\" name=\"Submit\" value=\"Submit
Changes\" />");
println("</form> ");
println("</div>");
println("</div>");
println("</body>");
println("</html>");
- out.close();
+ close();
//parse(html,false);
}

@@ -643,12 +658,10 @@
String group = (String) it.next();

if (group.equals("exist")) {
- out
- .println("<li><a
href=\"ConfigurationWizard?function=exist&phase=initial\">Exist
Configuration</a></li>");
+ println("<li><a
href=\"ConfigurationWizard?function=exist&phase=initial\">Exist
Configuration</a></li>");
} else if (group.equals("ls")) {

- out
- .println("<li><a
href=\"ConfigurationWizard?function=ls&phase=initial\">LS Registration
Configuration</a></li>");
+ println("<li><a
href=\"ConfigurationWizard?function=ls&phase=initial\">LS Registration
Configuration</a></li>");
} else {

println("<li><a
href=\"ConfigurationWizard?function="
@@ -657,8 +670,7 @@
}

}
- out
- .println("<li><a
href=\"ConfigurationWizard?function=finish\">Finish Configuration</a></li>");
+ println("<li><a
href=\"ConfigurationWizard?function=finish\">Finish Configuration</a></li>");
println("</ul>");
println("</div>");
}
@@ -673,7 +685,7 @@
private void preemptModified(String cssFile) throws IOException {
println(doctype);
println("<html>");
- println("<head>" + getCSS(cssFile));
+ println("<head>" + getCSS(cssFile) + "</head>" );
println("<title>");
println("perfSONAR services configuration wizard");
println("</title>");
@@ -691,7 +703,7 @@
*/
private String getCSS(String cssFile) {
String css = "<link rel=\"stylesheet\" type=\"text/css\"
href=\""
- + cssFile + "\">";
+ + cssFile + "\"/>";
return css;
}



  • perfsonar: r4673 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary/wizard, svnlog, 10/27/2008

Archive powered by MHonArc 2.6.16.

Top of Page