perfsonar-dev - perfsonar: r5434 - in branches/new-structure-with-base2/ps-mdm-web-admin: src/main/java/org/perfsonar/webadmin/base2/config tomcat/classes/perfsonar/conf
Subject: perfsonar development work
List archive
perfsonar: r5434 - in branches/new-structure-with-base2/ps-mdm-web-admin: src/main/java/org/perfsonar/webadmin/base2/config tomcat/classes/perfsonar/conf
Chronological Thread
- From:
- To:
- Subject: perfsonar: r5434 - in branches/new-structure-with-base2/ps-mdm-web-admin: src/main/java/org/perfsonar/webadmin/base2/config tomcat/classes/perfsonar/conf
- Date: Tue, 29 Dec 2009 08:08:56 -0500
Author: trzaszcz
Date: 2009-12-29 08:08:56 -0500 (Tue, 29 Dec 2009)
New Revision: 5434
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
Log:
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2009-12-29 12:16:31 UTC (rev 5433)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2009-12-29 13:08:56 UTC (rev 5434)
@@ -56,7 +56,7 @@
private PrintStream out = null;
private boolean plainContext = true;
- private ObjectMap omap = null;
+ private ObjectMap objectMap = null;
private HTMLUtil html = null;
private void println(String s) {
@@ -64,11 +64,12 @@
out.println(s);
}
- private String[] getLinksList(List<LinkType> blist,boolean big,
boolean advanced) {
+ private String[] getLinksList(List<LinkType> blist, boolean big,
+ boolean advanced) {
String basic = "";
List<String> result = new ArrayList<String>();
-
- if(big){
+
+ if (big) {
String cls = advanced ? "configheadinglavender" :
"configheading";
for (Object o : blist) {
LinkType l = (LinkType) o;
@@ -84,7 +85,7 @@
+ "\n";
result.add(basic);
}
- }else{
+ } else {
for (Object o : blist) {
LinkType l = (LinkType) o;
basic = HTMLUtil.tag("a",
HTMLUtil.att("href", "config?page="
@@ -92,37 +93,38 @@
+ HTMLUtil.att("target",
"_self"), l.getTitle())
+ "<br/>";
if (!basic.equals("")) {
- result.add("<p><span
class=\"navtex\">" + basic + "</span> </p>");
+ result.add("<p><span
class=\"navtex\">" + basic
+ + "</span> </p>");
}
}
}
-
+
return result.toArray(new String[result.size()]);
}
@SuppressWarnings("unchecked")
- public String[] getBasicLinks(ObjectMap o,boolean big) {
+ public String[] getBasicLinks(ObjectMap o, boolean big) {
WebAdminInterface wai;
if (o == null)
throw new RuntimeException("Null object map");
else if ((wai = o.getWA()) == null)
throw new RuntimeException("Null web admin
interface");
- return getLinksList(wai.getBasiclink(),big,false);
+ return getLinksList(wai.getBasiclink(), big, false);
}
-
+
@SuppressWarnings("unchecked")
- public String[] getAdvancedLinks(ObjectMap o,boolean big) {
+ public String[] getAdvancedLinks(ObjectMap o, boolean big) {
WebAdminInterface wai;
if (o == null)
throw new RuntimeException("Null object map");
else if ((wai = o.getWA()) == null)
throw new RuntimeException("Null web admin
interface");
- return getLinksList(wai.getAdvancedlink(),big,true);
+ return getLinksList(wai.getAdvancedlink(), big, true);
}
public boolean translate(String url, ObjectMap o, PrintStream o1) {
- omap = o;
- WebAdminInterface wai = omap.getWA();
+ objectMap = o;
+ WebAdminInterface wai = objectMap.getWA();
out = o1;
html = new HTMLUtil(out);
if (wai == null)
@@ -262,30 +264,31 @@
private Tuple<Integer, String[]> getData(BaseType b) // FIXME
{
if (b.getText() != null && !b.getText().equals(""))
- return new Tuple<Integer,
String[]>(omap.registerObject(b),
+ return new Tuple<Integer,
String[]>(objectMap.registerObject(b),
new String[] { b.getText().trim() });
// maybe a list
else {
Tuple<String, String> t =
XMLUtil.parseXPath(b.getXpath());
- NSContext ns = omap.getMap();
+ NSContext ns = objectMap.getMap();
try {
- NodeList nl = XMLUtil.query(ns, t.second(),
omap.getDocument(t
- .first()));
+ NodeList nl = XMLUtil.query(ns, t.second(),
objectMap
+ .getDocument(t.first()));
int sz = nl.getLength();
String[] lst = new String[sz];
String value;
- for (int i = 0; i < sz; i++){
- value=nl.item(i).getNodeValue();
- if(value==null){
-
value=nl.item(i).getTextContent();
+ for (int i = 0; i < sz; i++) {
+ value = nl.item(i).getNodeValue();
+ if (value == null) {
+ value =
nl.item(i).getTextContent();
}
lst[i] = value;
}
- return new Tuple<Integer,
String[]>(omap.registerObject(nl),
- lst);
+ return new Tuple<Integer, String[]>(objectMap
+ .registerObject(nl), lst);
} catch (Exception e) {
e.printStackTrace();
- return new Tuple<Integer, String[]>(0, new
String[] { "" });
}
+
+ return null;
}
}
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
2009-12-29 12:16:31 UTC (rev 5433)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
2009-12-29 13:08:56 UTC (rev 5434)
@@ -192,7 +192,14 @@
for (int i = 1; i < valueArray.length; i++){
s += "," + valueArray[i];
}
- n.setNodeValue(s);
+ if(n.getNodeValue()!=null){
+ //if value comes from tag attribute
+ n.setNodeValue(s);
+ }else{
+ //if value comes from tag value
+ n.setTextContent(s);
+ }
+
logger.info("list node updated");
}
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
2009-12-29 12:16:31 UTC (rev 5433)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
2009-12-29 13:08:56 UTC (rev 5434)
@@ -41,9 +41,19 @@
<wa:textbox>
<wa:default>
<wa:xpath>
-
doc("classes/perfsonar/conf/configls.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:a
+
doc("classes/perfsonar/conf/wa.xml")//webAdmin:interface/webAdmin:credential/webAdmin:username
</wa:xpath>
</wa:default>
+
<wa:title><wa:text>username</wa:text></wa:title>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/wa.xml")//webAdmin:interface/webAdmin:credential/webAdmin:password
+ </wa:xpath>
+ </wa:default>
<wa:title><wa:text>password</wa:text></wa:title>
</wa:textbox>
</wa:plain>
- perfsonar: r5434 - in branches/new-structure-with-base2/ps-mdm-web-admin: src/main/java/org/perfsonar/webadmin/base2/config tomcat/classes/perfsonar/conf, svnlog, 12/29/2009
Archive powered by MHonArc 2.6.16.