perfsonar-dev - perfsonar: r3788 - in branches/WebAdmin/perfSONARWebAdmin: admin/exist auxiliary/sqlma auxiliary/wizard
Subject: perfsonar development work
List archive
perfsonar: r3788 - in branches/WebAdmin/perfSONARWebAdmin: admin/exist auxiliary/sqlma auxiliary/wizard
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3788 - in branches/WebAdmin/perfSONARWebAdmin: admin/exist auxiliary/sqlma auxiliary/wizard
- Date: Thu, 24 Apr 2008 05:31:08 -0400
Author: michalis
Date: 2008-04-24 05:31:08 -0400 (Thu, 24 Apr 2008)
New Revision: 3788
Modified:
branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/IbatisConf.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/ibatisFileManager.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
Log:
Updating the src with recent fixes
Modified: branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-04-24 09:27:18 UTC (rev 3787)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-04-24 09:31:08 UTC (rev 3788)
@@ -518,8 +518,16 @@
document =
currentCollection.getBinaryDocument(documents[i]);
}
+
+ if (change) {
+ cssclass = "darkgrey";
+ change = false;
+ } else {
+ cssclass = "lightgrey";
+ change = true;
+ }
- out.println("<tr><td align=\"center\">");
+ out.println("<tr class=\"" + cssclass + "\"><td
align=\"center\">");
out.println("<input type=\"radio\" name=\"document\"
value=\""
+ documents[i] + "\" >");
out.println("</td>");
Modified: branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/IbatisConf.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/IbatisConf.java
2008-04-24 09:27:18 UTC (rev 3787)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/IbatisConf.java
2008-04-24 09:31:08 UTC (rev 3788)
@@ -34,7 +34,9 @@
"<!-- $Id: "
+ fileName
- + "
"+(Calendar.getInstance().getTime().toString())+" -->\n"
+ + " "
+ +
(Calendar.getInstance().getTime().toString())
+ + " -->\n"
+
"<sqlMap namespace=\"Results\">\n"
@@ -57,7 +59,45 @@
+ "</parameterMap>\n\n"
+
- " <!-- this sql statement is prepared for
mySQL database -->\n"
+ "<!-- this sql statement is prepared for
mySQL database -->\n"
+ + "<select id=\"getResults1\"\n"
+ + " parameterMap=\"select-parameters1\"
resultMap=\"select-results\">\n"
+ + " <![CDATA[\n"
+ + " select status_oper, status_admin,
unix_timestamp(time) as time\n"
+ + " from "
+ + table
+ + "\n"
+ + " where id = ?\n"
+ + " and time >= from_unixtime(?)\n"
+ + " and time <= from_unixtime(?)\n"
+ + " order by time ASC\n"
+ + "]]>\n"
+ + "</select>\n\n"
+
+ + "<!-- this sql statement is prepared for
postgreSQL database -->\n"
+ + "<!-- uncomment if you use postgreSQL
database instead of mySQL (and comment mySQL counterpart above)-->\n"
+ + "<!--\n"
+ + "<select id=\"getResults1\"\n"
+ + " parameterMap=\"select-parameters1\"
resultMap=\"select-results\">\n"
+ + "<![CDATA[\n"
+ + " select status_oper, status_admin,
date_part('epoch', time) as time\n"
+ + " from "
+ + table
+ + "\n"
+ + " where id = ?\n"
+ + " and time >= to_timestamp(?)\n"
+ + " and time <= to_timestamp(?)\n"
+ + " order by time ASC\n"
+ + "]]>\n"
+ + "</select>\n"
+ + "-->\n\n"
+
+ + "<parameterMap id=\"select-parameters2\"
class=\"java.util.HashMap\">\n"
+ + "<parameter property=\"pathId\" />\n"
+ + "<parameter property=\"pathId\" />\n"
+ + "</parameterMap>\n\n"
+
+ + " <!-- this sql statement is prepared for
mySQL database -->\n"
+ "<select id=\"getResults2\"\n"
+ "parameterMap=\"select-parameters2\"
resultMap=\"select-results\">\n"
+ "<![CDATA[\n"
@@ -66,7 +106,9 @@
+ table
+ "\n"
+ " where id = ?\n"
- + " and time = (select MAX(time) from
domain_link where id = ?)\n"
+ + " and time = (select MAX(time) from "
+ + table
+ + " where id = ?)\n"
+ " ]]>\n"
+ "</select>\n"
+
@@ -82,7 +124,9 @@
+ table
+ "\n"
+ " where id = ?\n"
- + " and time = (select MAX(time) from
domain_link where id = ?)\n"
+ + " and time = (select MAX(time) from "
+ + table
+ + " where id = ?)\n"
+ " ]]>\n"
+ "</select>\n"
+ "-->\n\n"
@@ -140,7 +184,9 @@
"<!-- $Id: "
+ fileName
- + "
"+(Calendar.getInstance().getTime().toString())+" -->\n"
+ + " "
+ +
(Calendar.getInstance().getTime().toString())
+ + " -->\n"
+
"<sqlMap namespace=\"Results\">\n\n"
@@ -229,8 +275,8 @@
+ "PUBLIC \"-//iBATIS.com//DTD SQL Map Config
2.0//EN\"\n"
+
"\"http://www.ibatis.com/dtd/sql-map-config-2.dtd\";>\n\n" +
- "<!-- $Id: " + fileName
- + "
"+(Calendar.getInstance().getTime().toString())+" -->\n"
+ "<!-- $Id: " + fileName + " "
+ +
(Calendar.getInstance().getTime().toString()) + " -->\n"
+ "<sqlMapConfig>\n\n" +
"<settings useStatementNamespaces=\"false\"
/>\n\n" +
Modified:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/ibatisFileManager.java
===================================================================
---
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/ibatisFileManager.java
2008-04-24 09:27:18 UTC (rev 3787)
+++
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/ibatisFileManager.java
2008-04-24 09:31:08 UTC (rev 3788)
@@ -358,7 +358,7 @@
System.out.println(pr[i]);
}
}
-
+
manager.createIbatisFile("ibatis-SqlMapConfig-test.xml","jdbc:mysql://127.0.0.1","perfsonar_ma",
"testpass","test", "L2-Path-Status Metric", "ibatis-test.xml");
/*
* file = new File("C:/Documents and Settings/IBM/My
* Documents/ibatis"); File[] f=file.listFiles();
for(int i=0;i<f.length;i++){
Modified: branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-04-24 09:27:18 UTC (rev 3787)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-04-24 09:31:08 UTC (rev 3788)
@@ -251,7 +251,7 @@
if (group.equals("LS")) {
out
- .println("<tr><td>Do
you wish to register to a
LS?</td><td> ");
+ .println("<tr><td>Do
you wish to register with an
LS?</td><td> ");
out
.println("<input
type=\"radio\" name=\"useLS\" value=\"yes\" "
+
onClick + ">  yes </input>");
@@ -435,8 +435,8 @@
String checked =
values[i].equals(pr.getProposedValue()) ? "checked=\"checked\""
: "";
out.println("<input type=\"radio\"" + checked
+ " name=\""
- + pr.getKey() + "\" value=\""
+ values[i] + "\">"
- + values[i] + "</input>");
+ + pr.getKey() + "\" value=\""
+ values[i] + "\">   "
+ + values[i] +
" </input>");
}
} else {
String type = "text";
- perfsonar: r3788 - in branches/WebAdmin/perfSONARWebAdmin: admin/exist auxiliary/sqlma auxiliary/wizard, svnlog, 04/24/2008
Archive powered by MHonArc 2.6.16.