perfsonar development work

Author: wiku
Date: 2009-10-09 06:56:01 -0400 (Fri, 09 Oct 2009)
New Revision: 5303

Added:
   branches/new-structure-with-base2/ps-mdm-web-admin/.classpath
   branches/new-structure-with-base2/ps-mdm-web-admin/.project
Modified:
   branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/Tuple.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/Configuration.xml
Log:
Added files for Eclipse


Added: branches/new-structure-with-base2/ps-mdm-web-admin/.classpath

Added: branches/new-structure-with-base2/ps-mdm-web-admin/.project

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-10-08 14:15:11 UTC (rev 5302)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml    
2009-10-09 10:56:01 UTC (rev 5303)
@@ -283,7 +283,7 @@
                </fileset>
        </copy>
                                                                        
-  <war destfile="${build}/${warfilename}-${version}.war" 
+  <war destfile="${build}/${warfilename}.war" 
        webxml="${temp.dir.web-inf}/web.xml" 
                 excludes="${lib}/servlet/*">
                 <fileset dir="${pages.dir}"/>

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/Tuple.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/Tuple.java
       2009-10-08 14:15:11 UTC (rev 5302)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/Tuple.java
       2009-10-09 10:56:01 UTC (rev 5303)
@@ -1,12 +1,19 @@
 package org.perfsonar.webadmin.base2.util;
 
-public class Tuple<A,B>
-{
-  A a;
-  B b;
-  public Tuple( A a , B b )
-  { this.a = a ; this.b = b; } 
+public class Tuple<A, B> {
+       A a;
+       B b;
 
-  public A first(){ return a;}
-  public B second(){ return b;}
+       public Tuple(A a, B b) {
+               this.a = a;
+               this.b = b;
+       }
+
+       public A first() {
+               return a;
+       }
+
+       public B second() {
+               return b;
+       }
 };

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
 2009-10-08 14:15:11 UTC (rev 5302)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
 2009-10-09 10:56:01 UTC (rev 5303)
@@ -15,30 +15,26 @@
 
 import org.perfsonar.webadmin.base2.waschema.v20090201.*;
 
-public class WAXMLReader
-{
-   private final static String CLASS_NAME = 
-               //FIXME: Should read this from JAXB xml file
-               "org.perfsonar.webadmin.base2.waschema.v20090201"; 
//.WebAdminInterface";
-       public static Tuple<WebAdminInterface,JAXBContext>
-                                       parseFile( String fileName ) 
-       throws Exception
-       {
+public class WAXMLReader {
+       private final static String CLASS_NAME =
+       // FIXME: Should read this from JAXB xml file
+       "org.perfsonar.webadmin.base2.waschema.v20090201"; // 
.WebAdminInterface";
+
+       public static Tuple<WebAdminInterface, JAXBContext> parseFile(
+                       String fileName) throws Exception {
                File f = new File(fileName);
                InputSource isource = new InputSource(new FileInputStream(f));
-                    isource.setSystemId(f.toURL().toString());
-               JAXBContext context = JAXBContext.newInstance(CLASS_NAME);
-      Unmarshaller unmarshaller = context.createUnmarshaller();
-               return new Tuple(
-                               (WebAdminInterface) 
unmarshaller.unmarshal(isource),
+               isource.setSystemId(f.toURL().toString());
+               JAXBContext context = JAXBContext.newInstance(CLASS_NAME);
+               Unmarshaller unmarshaller = context.createUnmarshaller();
+               return new Tuple((WebAdminInterface) 
unmarshaller.unmarshal(isource),
                                context);
        }
 
-       public static void main( String[] args )
-       throws Exception
-       {
+       public static void main(String[] args) throws Exception {
                WebAdminInterface r = parseFile(args[0]).first();
                List p = r.getPage();
-               System.out.println("Pages " + p.size() + " " + 
p.get(0).getClass().getName()  );
-       }       
+               System.out.println("Pages " + p.size() + " "
+                               + p.get(0).getClass().getName());
+       }
 };

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-10-08 14:15:11 UTC (rev 5302)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/Configuration.xml
  2009-10-09 10:56:01 UTC (rev 5303)
@@ -1 +1,77 @@
-<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
+<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.webadmin.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="org.perfsonar.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.PageTypeDriver"
 />
+       <Manager
+               
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.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