perfsonar-dev - perfsonar: r5039 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant schema/rnc schema/rng schema/xsd src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/servlet src/main/java/org/perfsonar/webadmin/base2/servlet/util src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201 src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl tomcat/classes/perfsonar/conf tomcat/html
Subject: perfsonar development work
List archive
perfsonar: r5039 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant schema/rnc schema/rng schema/xsd src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/servlet src/main/java/org/perfsonar/webadmin/base2/servlet/util src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201 src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl tomcat/classes/perfsonar/conf tomcat/html
Chronological Thread
- From:
- To:
- Subject: perfsonar: r5039 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant schema/rnc schema/rng schema/xsd src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/servlet src/main/java/org/perfsonar/webadmin/base2/servlet/util src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201 src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl tomcat/classes/perfsonar/conf tomcat/html
- Date: Sun, 8 Mar 2009 19:07:50 -0400
Author: pgerakios
Date: 2009-03-08 19:07:50 -0400 (Sun, 08 Mar 2009)
New Revision: 5039
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/LinkType.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeDriver.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeHandler.java
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/welcome.jsp
Removed:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/welcome.htm
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
branches/new-structure-with-base2/ps-mdm-web-admin/schema/rnc/wa.rnc
branches/new-structure-with-base2/ps-mdm-web-admin/schema/rng/wa.rng
branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd
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/src/main/java/org/perfsonar/webadmin/base2/servlet/BasicConfiguration.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/Abstraction.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/Configuration.xml
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/configls.xml
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/html/index.jsp
Log:
more changes
Modified: branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
2009-03-08 12:47:50 UTC (rev 5038)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
2009-03-08 23:07:50 UTC (rev 5039)
@@ -103,7 +103,7 @@
<pathelement
location="${lib}/jaxme2/jaxme2-${jaxme.version}.jar" />
<pathelement
location="${lib}/jaxme2/jaxmeapi-${jaxme.version}.jar" />
<pathelement
location="${libext}/jaxme2/jaxmejs-${jaxme.version}.jar" />
- <pathelement
location="${libext}/jaxme2/jaxmexs-${jaxme.version}.jar" />
+ <pathelement
location="${lib}/jaxme2/jaxmexs-${jaxme.version}.jar" />
</path>
<!--
@@ -184,9 +184,11 @@
<!-- ======================= Validation stuff =================== -->
<target name="validatewa">
<path id="validwa.lib.path">
- <fileset dir="${libext}/msv">
- <include name="*.jar"/>
- </fileset>
+ <pathelement location="${msv.jar}" />
+ <pathelement location="${xerces.jar}" />
+ <pathelement location="${isorelax.jar}" />
+ <pathelement location="${relaxngDatatype.jar}" />
+ <pathelement location="${xsdlib.jar}" />
</path>
<java classpathref="validwa.lib.path"
classname ="com.sun.msv.driver.textui.Driver"
@@ -197,10 +199,12 @@
</target>
<target name="validatefile">
- <path id="validwa.lib.path">
- <fileset dir="${libext}/msv">
- <include name="*.jar"/>
- </fileset>
+ <path id="validwa.lib.path">
+ <pathelement location="${msv.jar}" />
+ <pathelement location="${xerces.jar}" />
+ <pathelement location="${isorelax.jar}" />
+ <pathelement location="${relaxngDatatype.jar}" />
+ <pathelement location="${xsdlib.jar}" />
</path>
<java classpathref="validwa.lib.path"
classname ="com.sun.msv.driver.textui.Driver"
@@ -212,16 +216,19 @@
<!-- ======================= Generate RNG from XSD =================== -->
<target name="xsd2rng" >
- <path id="validwa.lib.path">
- <fileset dir="${libext}/msv">
- <include name="*.jar"/>
- </fileset>
+ <path id="validwa.lib.path">
+ <pathelement location="${msv.jar}" />
+ <pathelement location="${xerces.jar}" />
+ <pathelement location="${isorelax.jar}" />
+ <pathelement location="${relaxngDatatype.jar}" />
+ <pathelement location="${xsdlib.jar}" />
+ <pathelement location="${rngconv.jar}" />
</path>
<mkdir dir="${basedir}/schema/rng"/>
<java classpathref="validwa.lib.path"
classname ="com.sun.msv.writer.relaxng.Driver"
>
- <arg value=" ${basedir}/schema/xsd/wa.xsd"/>
+ <arg value="${schema}/xsd/wa.xsd"/>
<redirector output="${basedir}/schema/rng/wa.rng" />
</java>
</target>
@@ -232,10 +239,10 @@
<fileset dir="${libext}/trang">
<include name="trang.jar"/>
</fileset>
- <fileset dir="${lib}/saxon">
+ <!--<fileset dir="${lib}/saxon">
<include name="saxon.jar"/>
- </fileset>
-
+ </fileset>-->
+ <pathelement location="${xerces.jar}" />
</path>
<mkdir dir="${basedir}/schema/rnc"/>
<java classpathref="rng2rnc.lib.path"
@@ -369,6 +376,7 @@
</fileset>
<pathelement
location="${build}/${jarfilename}-${version}.jar" />
<pathelement location="${xalan.jar}" />
+ <pathelement location="${xerces.jar}" />
</path>
<java classpathref="runwa.lib.path"
classname ="${runwa.class}"
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
2009-03-08 12:47:50 UTC (rev 5038)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
2009-03-08 23:07:50 UTC (rev 5039)
@@ -31,3 +31,10 @@
servlet.dir=${basedir}/lib/repository/tomcat/servlet-api/5.0.28
jaxme.version=0.5.2
xalan.jar=${basedir}/lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar
+xerces.jar=${basedir}/lib/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar
+msv.dir=${basedir}/lib/repository/Validation/msv/1.0
+isorelax.jar=${basedir}/lib/repository/Validation/isorelax/1.0/isorelax-1.0.jar
+relaxngDatatype.jar=${basedir}/lib/repository/Validation/relaxngDatatype/1.0/relaxngDatatype-1.0.jar
+xsdlib.jar=${basedir}/lib/repository/Validation/xsdlib/1.0/xsdlib-1.0.jar
+rngconv.jar=${basedir}/lib/libext/rngconv/rngconv.jar
+msv.jar=${basedir}/lib/repository/Validation/msv/1.0/msv-1.0.jar
Modified: branches/new-structure-with-base2/ps-mdm-web-admin/schema/rnc/wa.rnc
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/schema/rnc/wa.rnc
2009-03-08 12:47:50 UTC (rev 5038)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/schema/rnc/wa.rnc
2009-03-08 23:07:50 UTC (rev 5039)
@@ -4,6 +4,8 @@
start =
notAllowed
| element interface {
+ element basiclink { LinkType }+,
+ element advancedlink { LinkType }*,
element map {
element url { \string },
element ns { \string }
@@ -20,17 +22,17 @@
| element plain { PlainType }+)
}+
}
+LinkType =
+ ((notAllowed
+ | element url { \string }),
+ (notAllowed
+ | element title { \string })),
+ empty
ComplexUIType =
(anonymous0,
(notAllowed
| element values { BaseType })?),
empty
-BaseType =
- ((notAllowed
- | element xpath { \string })
- | (notAllowed
- | element text { \string })),
- empty
PlainType =
((notAllowed
| element textbox { anonymous0 })
@@ -50,4 +52,10 @@
| element default { BaseType })?,
(notAllowed
| element title { BaseType })?
+BaseType =
+ ((notAllowed
+ | element xpath { \string })
+ | (notAllowed
+ | element text { \string })),
+ empty
\string = xsd:string
Modified: branches/new-structure-with-base2/ps-mdm-web-admin/schema/rng/wa.rng
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/schema/rng/wa.rng
2009-03-08 12:47:50 UTC (rev 5038)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/schema/rng/wa.rng
2009-03-08 23:07:50 UTC (rev 5039)
@@ -5,7 +5,17 @@
<choice>
<notAllowed/>
<element name="interface">
+ <oneOrMore>
+ <element name="basiclink">
+ <ref name="LinkType"/>
+ </element>
+ </oneOrMore>
<zeroOrMore>
+ <element name="advancedlink">
+ <ref name="LinkType"/>
+ </element>
+ </zeroOrMore>
+ <zeroOrMore>
<element name="map">
<element name="url">
<ref name="string"/>
@@ -51,6 +61,23 @@
</element>
</choice>
</start>
+ <define name="LinkType">
+ <group>
+ <choice>
+ <notAllowed/>
+ <element name="url">
+ <ref name="string"/>
+ </element>
+ </choice>
+ <choice>
+ <notAllowed/>
+ <element name="title">
+ <ref name="string"/>
+ </element>
+ </choice>
+ </group>
+ <empty/>
+ </define>
<define name="ComplexUIType">
<group>
<ref name="anonymous0"/>
@@ -65,23 +92,6 @@
</group>
<empty/>
</define>
- <define name="BaseType">
- <choice>
- <choice>
- <notAllowed/>
- <element name="xpath">
- <ref name="string"/>
- </element>
- </choice>
- <choice>
- <notAllowed/>
- <element name="text">
- <ref name="string"/>
- </element>
- </choice>
- </choice>
- <empty/>
- </define>
<define name="PlainType">
<choice>
<choice>
@@ -139,6 +149,23 @@
</choice>
</optional>
</define>
+ <define name="BaseType">
+ <choice>
+ <choice>
+ <notAllowed/>
+ <element name="xpath">
+ <ref name="string"/>
+ </element>
+ </choice>
+ <choice>
+ <notAllowed/>
+ <element name="text">
+ <ref name="string"/>
+ </element>
+ </choice>
+ </choice>
+ <empty/>
+ </define>
<define name="string">
<data type="string"/>
</define>
Modified: branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd
2009-03-08 12:47:50 UTC (rev 5038)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd
2009-03-08 23:07:50 UTC (rev 5039)
@@ -109,11 +109,25 @@
<xs:element name="ns" type="xs:string"
minOccurs="1" maxOccurs="1"/>
</xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="LinkType">
+ <xs:sequence>
+ <xs:element name="url" type="xs:string"
+ minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string"
+ minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
</xs:complexType>
<!-- Root -->
<xs:complexType name="WebAdminInterface">
<xs:sequence>
+ <xs:element name="basiclink"
type="wa:LinkType"
+ minOccurs="1"
maxOccurs="unbounded"/>
+ <xs:element name="advancedlink"
type="wa:LinkType"
+ minOccurs="0" maxOccurs="unbounded"/>
+
<xs:element name="map" type="wa:NsMap"
minOccurs="0"
maxOccurs="unbounded"/>
<xs:element name="page" type="wa:PageType"
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-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2009-03-08 23:07:50 UTC (rev 5039)
@@ -4,6 +4,8 @@
import java.io.PrintStream;
import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
import org.perfsonar.webadmin.base2.util.WAXMLReader;
import org.perfsonar.webadmin.base2.util.StringOutputStream;
@@ -51,58 +53,78 @@
private PrintStream out = null;
private String url = "";
private boolean plainContext = true;
- private ObjectMap omap;
- private HTMLUtil html;
+ private ObjectMap omap=null;
+ private HTMLUtil html=null;
private void println( String s ) { if( out != null ) out.println(s); }
- //public HTMLGenerator( PrintStream out, String configFile )
- //throws Exception
- //{ this.out = out; omap = new ObjectMap(configFile); }
- public HTMLGenerator(String basePath,
- String
confPath,
- String
configFile )
- throws Exception
- { omap = new ObjectMap(basePath,confPath,configFile); }
+ public HTMLGenerator(){}
- public ObjectMap getMap(){ return omap; }
+ public void translate( WebAdminInterface wai )
+ {
+ if( wai == null ) return;
+ List page = wai.getPage();
+ if( page != null )
+ for( int i=0, sz = page.size(); i < sz ; i++ )
+ translate((PageType) page.get(i));
+ }
- public synchronized void setOutput( PrintStream out0 )
+ private static String makeLinkList( List blist, boolean big, boolean
advanced )
{
- if( out != null )
+ String basic = "";
+ String cls = advanced?"configheadinglavender":"configheading";
+ if(big)
+ for( Object o : blist )
{
- try
+ LinkType l = (LinkType) o;
+ basic = HTMLUtil.tag("tr",
+ HTMLUtil.tag("td",HTMLUtil.att("class",cls),
+ HTMLUtil.tag("p",
+ HTMLUtil.tag("a",
+
HTMLUtil.att("href","config?page="+l.getUrl())+
+
HTMLUtil.att("target","_self")
+
,l.getTitle())
+ ) +
+ HTMLUtil.tag("p"," ")+
+ HTMLUtil.tag("p"," ")
+ )
+ ) + "\n";
+ }
+ else
+ {
+ for( Object o : blist )
{
- do{ wait(); } while( out != null );
- }
- catch(InterruptedException e)
- {
- System.out.println("InterruptedException
caught");
+ LinkType l = (LinkType) o;
+ basic = HTMLUtil.tag("a",
+
HTMLUtil.att("href","config?page="+l.getUrl())+
+
HTMLUtil.att("target","_self")
+
,l.getTitle()) + "<br/>";
}
+ if( basic.equals("") ) return "";
+ return "<p><span class=\"navtex\">"+
+ basic + "</span> </p>";
}
- out = out0;
- html = new HTMLUtil(out);
+ return basic;
}
- public synchronized void done()
- {
- html = null;
- out = null;
- notifyAll();
+ public static String[] makeLinks( ObjectMap o , boolean b)
+ {
+ 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 new String[]{ makeLinkList(wai.getBasiclink(),b,false),
+
makeLinkList(wai.getAdvancedlink(),b,true)
+ };
}
- public void translate( WebAdminInterface wai )
+ public boolean translate( String url , ObjectMap o, PrintStream o1 )
{
- if( wai == null ) return;
- List page = wai.getPage();
- if( page != null )
- for( int i=0, sz = page.size(); i < sz ; i++ )
- translate((PageType) page.get(i));
- }
-
- public boolean translate( String url )
- {
+ omap = o;
WebAdminInterface wai = omap.getWA();
+ out = o1;
+ html = new HTMLUtil(out);
if( wai == null ) return false;
List page = wai.getPage();
if( page != null )
@@ -192,15 +214,35 @@
public void translate( ComplexUIType cui , UIType u )
{
+ Tuple<Integer,String[]> def = getData(cui.getDefault());
+ Tuple<Integer,String[]> all = getData(cui.getValues());
+ String[] alls = all.second()[0].split(",");
+ Set<String> set = new HashSet<String>
+
(def.second().length+all.second().length);
+
+ for( String s : alls) set.add(s);
+ HashSet<String> singleton = new HashSet<String>(1);
+ singleton.add(def.second()[0]);
+ set.removeAll(singleton);
+
+ String[] rets = new String[set.size()+1];
+ rets[0] = def.second()[0];
+ int i=rets.length-1;
+ for( Object o : set ) rets[i--] = (String) o;
+
+ Tuple<Integer,String[]> ret =
+ new
Tuple<Integer,String[]>(def.first(),
+
rets);
+
switch(u)
{
case RADIO:
drawRadio(getSingleData(cui.getTitle()),
-
getData(cui.getDefault()));
+ ret);
break;
case DROPDOWN:
drawDropdown(getSingleData(cui.getTitle()),
-
getData(cui.getDefault()));
+ ret);
break;
default:
throw new RuntimeException("Unexpected
ComplexUI type.");
@@ -336,5 +378,44 @@
// gen.translate(wai);
// gen.registerObject(wai);
}
+ //// REMOVE THIS
+ // //public HTMLGenerator( PrintStream out, String configFile )
+ //throws Exception
+ //{ this.out = out; omap = new ObjectMap(configFile); }
+
+// public HTMLGenerator(String basePath,
+// String
confPath,
+// String
configFile )
+// throws Exception
+// { omap = new ObjectMap(basePath,confPath,configFile); }
+
+ /*
+ public synchronized void setOutput( PrintStream out0, ObjectMap o )
+ {
+ if( out != null )
+ {
+ try
+ {
+ do{ wait(); } while( out != null );
+ }
+ catch(InterruptedException e)
+ {
+ System.out.println("InterruptedException
caught");
+ }
+ }
+ out = out0;
+ omap = o;
+ html = new HTMLUtil(out);
+ }
+
+ public synchronized void done()
+ {
+ omap = null;
+ html = null;
+ out = null;
+ notifyAll();
+ }
+ */
+
};
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-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
2009-03-08 23:07:50 UTC (rev 5039)
@@ -31,6 +31,7 @@
String basePath = "";
String confPath = ""; //TODO: unused field
NSContext namespaces;
+ boolean sync = false;
public ObjectMap( String basePath, String confPath, String file)
throws Exception
@@ -120,24 +121,26 @@
return true;
}
- public boolean save()
+ public synchronized boolean save()
{
- return saveExternal() && saveWA();
+ boolean b= saveExternal() && saveWA();
+ if(b) sync = false;
+ return b;
}
- public int registerObject( BaseType ui )
+ public synchronized int registerObject( BaseType ui )
{
return _registerObject(ui);
}
- public int registerObject( NodeList n )
+ public synchronized int registerObject( NodeList n )
{
// Document doc = t.first().getOwnerDocument();
// Document old = file2doc.get(t.second())) == doc
return _registerObject(n);
}
- public Document getDocument( String uri ) throws Exception
+ public synchronized Document getDocument( String uri ) throws Exception
{
Document ret = file2doc.get(uri);
if( ret != null ) return ret;
@@ -147,7 +150,7 @@
return ret;
}
- public void updateObjects( Map pmap ) throws Exception
+ public synchronized void updateObjects( Map pmap ) throws Exception
{
Set entrySet = pmap.entrySet();
Object myobj = null;
@@ -178,8 +181,14 @@
"\" will not be updated.");
}
}
+ sync = true;
}
+ public synchronized boolean needSync()
+ {
+ return sync;
+ }
+
private void updateBase( BaseType o , String[] v )
{
System.out.println("WA --- Should update base type");
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/BasicConfiguration.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/BasicConfiguration.java
2009-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/BasicConfiguration.java
2009-03-08 23:07:50 UTC (rev 5039)
@@ -22,50 +22,39 @@
public class BasicConfiguration extends HttpServlet
{
//TODO: Fix Unix-paths
- private static final String confPath = "classes/perfsonar/conf";
- private static String basePath;
- private static HTMLGenerator gen;
+ //private static final String confPath = "classes/perfsonar/conf";
+ //private static String basePath;
+// private static HTMLGenerator gen;
public void init(ServletConfig arg0) throws ServletException
{
super.init(arg0);
- //TODO: Fix Unix-paths
- basePath = getServletContext().getRealPath("/") + "/" +
"WEB-INF";
- try
- {
- gen = new HTMLGenerator(basePath,confPath,"wa.xml");
- }
- catch( Exception e)
- {
- e.printStackTrace();
- gen = null;
- }
+ Abstraction.objectMap(getServletContext());
+// Abstraction.objectMap(
+// basePath = getServletContext().getRealPath("/") + "/" +
"WEB-INF";
+// try
+// {
+// gen = new HTMLGenerator(basePath,confPath,"wa.xml");
+// }
+// catch( Exception e)
+// {
+// e.printStackTrace();
+// gen = null;
+// }
}
protected void doGet(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException
{
- //doPost(arg0, arg1);
- if( gen == null )
- {
- response.setStatus(500);
- return;
- }
- doRead(new
Abstraction(request,response,getServletContext(),gen));
+ doRead(new Abstraction(request,response,getServletContext()));
}
protected void doPost(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException
{
- if( gen == null )
- {
- response.setStatus(500);
- return;
- }
- //abs.authenticate( map );
- doWrite(new
Abstraction(request,response,getServletContext(),gen));
+ doWrite(new
Abstraction(request,response,getServletContext()));
}
void doRead( Abstraction abs )
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/Abstraction.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/Abstraction.java
2009-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/Abstraction.java
2009-03-08 23:07:50 UTC (rev 5039)
@@ -23,6 +23,7 @@
public class Abstraction
{
+ static final String confPath = "classes/perfsonar/conf";
HttpServletRequest request;
HttpServletResponse response;
PrintStream out;
@@ -32,10 +33,27 @@
ServletContext context;
HTMLGenerator gen;
+ public static synchronized ObjectMap objectMap(ServletContext con)
+ {
+ ObjectMap ret = (ObjectMap) con.getAttribute("ObjectMap");
+ if( ret != null ) return ret;
+ //TODO: Fix Unix-paths
+ String basePath = con.getRealPath("/") + "/WEB-INF";
+ try
+ {
+ ret = new ObjectMap(basePath,confPath,"wa.xml");
+ con.setAttribute("ObjectMap",ret);
+ }
+ catch( Exception e)
+ {
+ e.printStackTrace();
+ }
+ return ret;
+ }
+
public Abstraction( HttpServletRequest request,
HttpServletResponse response,
-
ServletContext context,
- HTMLGenerator
gen )
+
ServletContext context)
{
this.request = request;
this.response = response;
@@ -48,7 +66,7 @@
{
e.printStackTrace();
}
- this.gen = gen;
+ this.gen = new HTMLGenerator();
this.session = request.getSession(true);
response.setContentType("text/html");
// Set max interval to session
@@ -56,9 +74,15 @@
session.setMaxInactiveInterval(3600);
}
+ public ObjectMap objectMap()
+ {
+ return objectMap(context);
+ }
+
public void displayPage()
{
String page = getParameter("page");
+ /*
if( "save".equals(page) )
{
try
@@ -66,7 +90,7 @@
response.sendRedirect(
response.encodeRedirectURL(
request.getContextPath() +
- "/index.jsp?save=" + gen.getMap().save()
+ "/index.jsp?save=" + objectMap().save()
));
}
catch( Exception e )
@@ -74,7 +98,7 @@
e.printStackTrace();
}
}
- else
+ else */
displayPage(page);
}
@@ -117,7 +141,7 @@
System.out.println("WA --- Processing client data.");
try
{
- gen.getMap().updateObjects(request.getParameterMap());
+ objectMap().updateObjects(request.getParameterMap());
}
catch( Exception e )
{
@@ -193,19 +217,11 @@
{
boolean found = false;
StringOutputStream sout = new StringOutputStream();
- try
- {
if( page.equals("") )
return new Tuple<String,String>(null,"");
System.out.println("WA --- Looking up page \"" + page + "\""
);
- gen.setOutput(new PrintStream(sout));
- found = gen.translate(page);
+ found = gen.translate(page,objectMap(),new
PrintStream(sout));
System.out.println("WA --- Page \"" + page + "\" found " +
found);
- }
- finally
- {
- gen.done();
- }
return new
Tuple<String,String>(found?page:null,sout.toString());
}
@@ -216,6 +232,7 @@
forward(request,response);
}
};
+
class Base64 {
// Mapping table from 6-bit nibbles to Base64 characters.
@@ -334,6 +351,4 @@
// Dummy constructor.
private Base64() {}
-
-}
-
+};
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/Configuration.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/Configuration.xml
2009-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/Configuration.xml
2009-03-08 23:07:50 UTC (rev 5039)
@@ -1 +1 @@
-<Configuration
xmlns="http://ws.apache.org/jaxme/namespaces/jaxme2/configuration";><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceValidator"
qName="{http://webadmin.perfsonar.org/base2/waschema/v20090201}interface";
prefix="wa"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.Interface"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.InterfaceImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.BaseType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeImpl"
driverClass="org.perfsonar.webadm
in.base2.waschema.v20090201.impl.BaseTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.BaseUIType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexUIType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema
.v20090201.impl.ComplexGroupUITypeValidator" handlerClass="o!
rg.perfs
onar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexGroupUIType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PlainType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeHandler"
elementInterface="org.perfsonar.webadmin
.base2.waschema.v20090201.GroupType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PageType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeImpl"
driverClass="org.
perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeDri!
ver"/><M
anager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.NsMap"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceDriver"/></Configuration>
\ No newline at end of file
+<Configuration
xmlns="http://ws.apache.org/jaxme/namespaces/jaxme2/configuration";><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceValidator"
qName="{http://webadmin.perfsonar.org/base2/waschema/v20090201}interface";
prefix="wa"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.Interface"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.InterfaceImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.BaseType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeImpl"
driverClass="org.perfsonar.webadm
in.base2.waschema.v20090201.impl.BaseTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.BaseUIType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexUIType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema
.v20090201.impl.ComplexGroupUITypeValidator" handlerClass="o!
rg.perfs
onar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexGroupUIType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PlainType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeHandler"
elementInterface="org.perfsonar.webadmin
.base2.waschema.v20090201.GroupType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PageType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeImpl"
driverClass="org.
perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeDri!
ver"/><M
anager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.NsMap"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.LinkType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v200902
01.impl.WebAdminInterfaceHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceDriver"/></Configuration>
\ No newline at end of file
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/LinkType.java
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
2009-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
2009-03-08 23:07:50 UTC (rev 5039)
@@ -68,6 +68,10 @@
return (org.perfsonar.webadmin.base2.waschema.v20090201.NsMap)
newInstance(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
}
+ public org.perfsonar.webadmin.base2.waschema.v20090201.LinkType
createLinkType() throws javax.xml.bind.JAXBException {
+ return (org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)
newInstance(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
+ }
+
public ObjectFactory() throws javax.xml.bind.JAXBException {
jaxbContext = (org.apache.ws.jaxme.impl.JAXBContextImpl)
javax.xml.bind.JAXBContext.newInstance("org.perfsonar.webadmin.base2.waschema.v20090201");
}
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
2009-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
2009-03-08 23:07:50 UTC (rev 5039)
@@ -5,7 +5,15 @@
+
+
+
+
+ public java.util.List getBasiclink();
+
+ public java.util.List getAdvancedlink();
+
public java.util.List getMap();
public java.util.List getPage();
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeDriver.java
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeHandler.java
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
2009-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
2009-03-08 23:07:50 UTC (rev 5039)
@@ -18,16 +18,26 @@
public void marshalChilds(org.apache.ws.jaxme.impl.JMSAXDriverController
pController, org.xml.sax.ContentHandler pHandler, java.lang.Object pObject)
throws org.xml.sax.SAXException {
org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface _1 =
(org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface) pObject;
- java.util.List _2 = _1.getMap();
+ java.util.List _2 = _1.getBasiclink();
for (int _3 = 0; _3 < (_2).size(); _3++) {
- org.apache.ws.jaxme.impl.JMSAXDriver _4 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class).getDriver();
- pController.marshal(_4,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap)_2.get(_3));
+ org.apache.ws.jaxme.impl.JMSAXDriver _4 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class).getDriver();
+ pController.marshal(_4,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "basiclink",
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)_2.get(_3));
}
- java.util.List _5 = _1.getPage();
+ java.util.List _5 = _1.getAdvancedlink();
for (int _6 = 0; _6 < (_5).size(); _6++) {
- org.apache.ws.jaxme.impl.JMSAXDriver _7 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class).getDriver();
- pController.marshal(_7,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
(org.perfsonar.webadmin.base2.waschema.v20090201.PageType)_5.get(_6));
+ org.apache.ws.jaxme.impl.JMSAXDriver _7 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class).getDriver();
+ pController.marshal(_7,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink",
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)_5.get(_6));
}
+ java.util.List _8 = _1.getMap();
+ for (int _9 = 0; _9 < (_8).size(); _9++) {
+ org.apache.ws.jaxme.impl.JMSAXDriver _10 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class).getDriver();
+ pController.marshal(_10,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap)_8.get(_9));
+ }
+ java.util.List _11 = _1.getPage();
+ for (int _12 = 0; _12 < (_11).size(); _12++) {
+ org.apache.ws.jaxme.impl.JMSAXDriver _13 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class).getDriver();
+ pController.marshal(_13,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
(org.perfsonar.webadmin.base2.waschema.v20090201.PageType)_11.get(_12));
+ }
}
}
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
2009-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
2009-03-08 23:07:50 UTC (rev 5039)
@@ -3,8 +3,10 @@
public class WebAdminInterfaceHandler extends
org.apache.ws.jaxme.impl.JMSAXElementParser {
/** The current state. The following values are valid states:
* 0 = Before parsing the element
- * 1 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}map
- * 2 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}page
+ * 1 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}basiclink
+ * 2 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}advancedlink
+ * 3 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}map
+ * 4 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}page
*
*/
private int __state;
@@ -14,50 +16,47 @@
org.apache.ws.jaxme.impl.JMUnmarshallerHandlerImpl _1 = getHandler();
switch (__state) {
case 0:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
__state = 1;
- org.apache.ws.jaxme.JMManager _2 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
+ org.apache.ws.jaxme.JMManager _2 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
java.lang.Object _3 = _2.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _4 = _2.getHandler();
- _4.init(_1, _3,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
+ _4.init(_1, _3,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "basiclink",
_1.getLevel());
_4.setAttributes(pAttr);
_1.addElementParser(_4);
return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
- __state = 2;
- org.apache.ws.jaxme.JMManager _5 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
+ }
+ break;
+ case 1:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
+ __state = 1;
+ org.apache.ws.jaxme.JMManager _5 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
java.lang.Object _6 = _5.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _7 = _5.getHandler();
- _7.init(_1, _6,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _7.init(_1, _6,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "basiclink",
_1.getLevel());
_7.setAttributes(pAttr);
_1.addElementParser(_7);
return true;
- }
- break;
- case 1:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
- __state = 1;
- org.apache.ws.jaxme.JMManager _8 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".equals(pLocalName)) {
+ __state = 2;
+ org.apache.ws.jaxme.JMManager _8 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
java.lang.Object _9 = _8.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _10 = _8.getHandler();
- _10.init(_1, _9,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
+ _10.init(_1, _9,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink",
_1.getLevel());
_10.setAttributes(pAttr);
_1.addElementParser(_10);
return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
- __state = 2;
- org.apache.ws.jaxme.JMManager _11 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
+ __state = 3;
+ org.apache.ws.jaxme.JMManager _11 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
java.lang.Object _12 = _11.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _13 = _11.getHandler();
- _13.init(_1, _12,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _13.init(_1, _12,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
_13.setAttributes(pAttr);
_1.addElementParser(_13);
return true;
- }
- break;
- case 2:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
- __state = 2;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 4;
org.apache.ws.jaxme.JMManager _14 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
java.lang.Object _15 = _14.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _16 = _14.getHandler();
@@ -67,6 +66,69 @@
return true;
}
break;
+ case 2:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".equals(pLocalName)) {
+ __state = 2;
+ org.apache.ws.jaxme.JMManager _17 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
+ java.lang.Object _18 = _17.getElementS();
+ org.apache.ws.jaxme.impl.JMSAXElementParser _19 = _17.getHandler();
+ _19.init(_1, _18,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink",
_1.getLevel());
+ _19.setAttributes(pAttr);
+ _1.addElementParser(_19);
+ return true;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
+ __state = 3;
+ org.apache.ws.jaxme.JMManager _20 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
+ java.lang.Object _21 = _20.getElementS();
+ org.apache.ws.jaxme.impl.JMSAXElementParser _22 = _20.getHandler();
+ _22.init(_1, _21,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
+ _22.setAttributes(pAttr);
+ _1.addElementParser(_22);
+ return true;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 4;
+ org.apache.ws.jaxme.JMManager _23 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
+ java.lang.Object _24 = _23.getElementS();
+ org.apache.ws.jaxme.impl.JMSAXElementParser _25 = _23.getHandler();
+ _25.init(_1, _24,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _25.setAttributes(pAttr);
+ _1.addElementParser(_25);
+ return true;
+ }
+ break;
+ case 3:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
+ __state = 3;
+ org.apache.ws.jaxme.JMManager _26 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
+ java.lang.Object _27 = _26.getElementS();
+ org.apache.ws.jaxme.impl.JMSAXElementParser _28 = _26.getHandler();
+ _28.init(_1, _27,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
+ _28.setAttributes(pAttr);
+ _1.addElementParser(_28);
+ return true;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 4;
+ org.apache.ws.jaxme.JMManager _29 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
+ java.lang.Object _30 = _29.getElementS();
+ org.apache.ws.jaxme.impl.JMSAXElementParser _31 = _29.getHandler();
+ _31.init(_1, _30,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _31.setAttributes(pAttr);
+ _1.addElementParser(_31);
+ return true;
+ }
+ break;
+ case 4:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 4;
+ org.apache.ws.jaxme.JMManager _32 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
+ java.lang.Object _33 = _32.getElementS();
+ org.apache.ws.jaxme.impl.JMSAXElementParser _34 = _32.getHandler();
+ _34.init(_1, _33,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _34.setAttributes(pAttr);
+ _1.addElementParser(_34);
+ return true;
+ }
+ break;
default:
throw new java.lang.IllegalStateException("Invalid state: " +
__state);
}
@@ -77,12 +139,24 @@
org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface _1 =
(org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface) result;
switch (__state) {
case 1:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
+ _1.getBasiclink().add(pResult);
+ return;
+ }
+ break;
+ case 2:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".equals(pLocalName)) {
+ _1.getAdvancedlink().add(pResult);
+ return;
+ }
+ break;
+ case 3:
if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
_1.getMap().add(pResult);
return;
}
break;
- case 2:
+ case 4:
if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
_1.getPage().add(pResult);
return;
@@ -95,7 +169,7 @@
public boolean isFinished() {
switch (__state) {
- case 2:
+ case 4:
return true;
default:
return false;
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
2009-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
2009-03-08 23:07:50 UTC (rev 5039)
@@ -1,11 +1,23 @@
package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
public class WebAdminInterfaceImpl implements
org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface {
+ private java.util.List _basiclink = new java.util.ArrayList();
+
+ private java.util.List _advancedlink = new java.util.ArrayList();
+
private java.util.List _map = new java.util.ArrayList();
private java.util.List _page = new java.util.ArrayList();
+ public java.util.List getBasiclink() {
+ return _basiclink;
+ }
+
+ public java.util.List getAdvancedlink() {
+ return _advancedlink;
+ }
+
public java.util.List getMap() {
return _map;
}
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/configls.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/configls.xml
2009-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/configls.xml
2009-03-08 23:07:50 UTC (rev 5039)
@@ -15,6 +15,7 @@
<option name="name" value="SimpleService - Echo"/>
<option name="type" value="Echo"/>
<option name="acessPoints" value="Point1,Point2,Point3"/>
+ <option name="authorization" value="yes"/>
</lookupInformation>
<!--
....................................................................................
-->
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-03-08 12:47:50 UTC (rev 5038)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
2009-03-08 23:07:50 UTC (rev 5039)
@@ -4,12 +4,22 @@
<wa:interface
xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";
>
+ <wa:basiclink>
+ <wa:url>basic</wa:url> <!-- page identifier -->
+ <wa:title>Service Settings</wa:title>
+ </wa:basiclink>
+ <wa:advancedlink>
+ <wa:url>basic</wa:url> <!-- page identifier -->
+ <wa:title>Advanced Service Settings</wa:title>
+ </wa:advancedlink>
+
<wa:map>
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
<wa:ns>ns1</wa:ns>
</wa:map>
+
<wa:page>
<wa:url><wa:text>basic</wa:text></wa:url>
<wa:title><wa:text>Title of this page</wa:text></wa:title>
@@ -45,27 +55,15 @@
</wa:dropdown>
</wa:plain>
- <!---->
- <!-- -->
- <!-- <wa:plain>
+ <wa:plain>
<wa:radio>
<wa:default>
-
<wa:xpath>doc("configls.xml")/first</wa:xpath>
+
<wa:xpath>doc("classes/perfsonar/conf/configls.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:lookupInformation/ns1:option[@name="authorization"]/@value</wa:xpath>
</wa:default>
- <wa:title><wa:text>Default
title</wa:text></wa:title>
-
<wa:values><wa:text>val1,val2,val3</wa:text></wa:values>
+ <wa:title><wa:text>Require authorization
?</wa:text></wa:title>
+
<wa:values><wa:text>yes,no</wa:text></wa:values>
</wa:radio>
</wa:plain>
- <wa:plain>
- <wa:dropdown>
- <wa:default>
-
<wa:xpath>doc("configls.xml")/first</wa:xpath>
- </wa:default>
- <wa:title><wa:text>Default
title</wa:text></wa:title>
- <wa:values><wa:xpath>doc("configls.xml")
- </wa:xpath></wa:values>
- </wa:dropdown>
- </wa:plain>-->
</wa:page>
</wa:interface>
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
2009-03-08 12:47:50 UTC (rev 5038)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
2009-03-08 23:07:50 UTC (rev 5039)
@@ -2,6 +2,7 @@
public void jspInit()
{
super.jspInit();
+
org.perfsonar.webadmin.base2.servlet.util.Abstraction.objectMap(getServletContext());
}
public void jspDestroy()
@@ -64,10 +65,36 @@
<body>
<%
- String save = request.getParameter("save");
- if( save != null)
+ org.perfsonar.webadmin.base2.config.ObjectMap map =
+
org.perfsonar.webadmin.base2.
+
servlet.util.Abstraction.
+
objectMap(getServletContext());
+
+ if( map == null )
{
- if( "true".equals(save) )
+ %>
+ <center>
+ <h2> Failed to load web admin configuration
file(s).
+ <br/>
+ Please check
+ Tomcat log files for further information.
+ <br/>
+ Restart Tomcat after saving web admin
configuration
+ files and click
+ <a href="index.jsp" target="_self">
+ here</a>.
+
+ </h2>
+ </center>
+ </body>
+ </html>
+ <%
+ return;
+ }
+ String save = request.getParameter("page");
+ if( save != null && save.equals("save") &&
map.needSync() )
+ {
+ if( map.save() )
{
%>
@@ -88,13 +115,17 @@
<%
}
}
+
+ String[] smallLinks =
+ org.perfsonar.webadmin.base2.config.
+ HTMLGenerator.makeLinks(map,false);
%>
<div class="adminPanel">
<div class="banner">
<table border="0" align="left" cellpadding="0"
cellspacing="0">
<tr>
<td>
- <a href="welcome.htm" target="main"><img
src="graphics/perfsonar_logo.gif" alt="perfSONAR" width="192" height="94"
border="0" align="right"></a>
+ <a href="index.jsp" target="_self"><img
src="graphics/perfsonar_logo.gif" alt="perfSONAR" width="192" height="94"
border="0" align="right"></a>
</td>
<td>
</td>
@@ -109,7 +140,7 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<th>
- <a href="welcome.htm" class="button"
target="main">Admin home </a>
+ <a href="index.jsp" class="button"
target="_self">Admin home </a>
</th>
</tr>
<tr>
@@ -120,44 +151,41 @@
Configuration
</span>
</p>
- <p>
- <span class="navtex"><a
href="/wa/index.jsp" target="main">Service</a></span>
- <br>
- <a href="/wa/index.jsp"
target="main">Test</a>
- </p>
+ <%
+
out.println(smallLinks[0]);
+ %>
</td>
</tr>
-
- <tr>
+ <%
+ if(
smallLinks[1].equals("") == false )
+ {
+ %>
+
+ <tr>
<td>
<p>
- <span class="navtexheading
style3">Advanced
+ <span class="navtexheading">Advanced
<br>
Configuration
</span>
</p>
- <p>
- <span class="navtex style3"><a
href="/wa/index.jsp" target="main">Service</a>
- <br>
- <a href="/wa/index.jsp"
target="main">Logging</a>
- <br>
- <a href="/wa/index.jsp"
target="main">eXist Database</a>
- <br>
- <a href="/wa/index.jsp"
target="main">Config File Management</a>
- <br>
-
- </span>
- </p>
+ <%
+
out.println(smallLinks[1]);
+ %>
</td>
</tr>
+ <%
+ }
+ %>
<tr>
</tr>
</table>
<img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
</div>
<div class="centerWindow">
- <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
- </object>
+ <!-- <object data="index.jsp" type="text/html"
name="main" width="99%" height="100%"> </object>-->
+ <%@ include
file="welcome.jsp" %>
+
</div>
</div>
<div class="footer">
Deleted:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/welcome.htm
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/welcome.jsp
- perfsonar: r5039 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant schema/rnc schema/rng schema/xsd src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/servlet src/main/java/org/perfsonar/webadmin/base2/servlet/util src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201 src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl tomcat/classes/perfsonar/conf tomcat/html, svnlog, 03/08/2009
Archive powered by MHonArc 2.6.16.