perfsonar development work

Author: dante.delvaux
Date: 2012-03-01 18:19:10 +0000 (Thu, 01 Mar 2012)
New Revision: 5898

Modified:
   branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml
   branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties
   branches/perfsonar-java-web-admin-1.0-stable/build/
   branches/perfsonar-java-web-admin-1.0-stable/lib/repository/
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/NSContext.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ComplexGroupUIType.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/GroupType.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/GroupsType.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/PageType.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ComplexGroupUITypeDriver.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ComplexGroupUITypeImpl.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupTypeDriver.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupTypeImpl.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupsTypeDriver.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupsTypeImpl.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeDriver.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeImpl.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
   
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
Log:
Smoother build process, refs #PSSERVICES-608
- improving ant build process (remove a few warnings, servlet-api version 
upgraded to 5.5.23)
- corrected most raw types and other warnings
- increased version number to 1.0.1


Modified: branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml
===================================================================
--- branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml  2012-03-01 
18:04:19 UTC (rev 5897)
+++ branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml  2012-03-01 
18:19:10 UTC (rev 5898)
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="WebAdmin" basedir=".." default="war-deploy">
+<project name="WebAdmin" basedir=".." default="war-deploy" 
xmlns:ca="catalinaant:org.apache.catalina.ant">
 
-
        <property file="${basedir}/ant/const.properties" />
        <property file="${basedir}/ant/tomcat.properties" />
 
@@ -16,7 +15,6 @@
        <property name="maven.jar" 
value="${basedir}/lib/maven-artifact-ant-2.0.4-dep.jar" />
 
        <macrodef name="init-lib-dependencies-macro" 
xmlns:artifact="urn:maven-artifact-ant">
-
                <attribute name="localRepositoryPath" />
                <attribute name="remoteRepositoryUri1" />
                <attribute name="remoteRepositoryUri2" />
@@ -29,7 +27,6 @@
                                <classpath refid="maven.classpath" />
                        </typedef>
                        <artifact:localRepository id="local.repository" 
location="${basedir}/@{localRepositoryPath}" layout="default" />
-
                        <artifact:remoteRepository id="remote.repository" 
url="@{remoteRepositoryUri1}" />
                        <artifact:remoteRepository id="remote.repository.2" 
url="@{remoteRepositoryUri2}" />
                </sequential>
@@ -51,8 +48,7 @@
 
        <target name="get-repo" depends="init-lib-dependencies" 
xmlns:artifact="urn:maven-artifact-ant">
                <artifact:dependencies>
-
-                       <dependency groupId="tomcat" artifactId="servlet-api" 
version="5.0.28" />
+                       <dependency groupId="tomcat" artifactId="servlet-api" 
version="5.5.23" />
                        <dependency groupId="Validation" artifactId="msv" 
version="1.0" />
                        <dependency groupId="Validation" artifactId="xsdlib" 
version="1.0" />
                        <dependency groupId="Validation" 
artifactId="isorelax" version="1.0" />
@@ -65,11 +61,11 @@
                        <dependency groupId="dom4j" artifactId="dom4j" 
version="1.6" />
                        <dependency groupId="jaxen" artifactId="jaxen" 
version="1.1" />
                        <dependency groupId="junit" artifactId="junit" 
version="4.7" />
+            <dependency groupId="net.jcip" artifactId="jcip-annotations" 
version="1.0" />
 
-
-
                        <localRepository refid="local.repository" />
                        <remoteRepository refid="remote.repository" />
+                       <remoteRepository refid="remote.repository.2" />
                </artifact:dependencies>
        </target>
 
@@ -150,7 +146,9 @@
                <mkdir dir="${build}/dependencies" />
 
                <mkdir dir="${build}/class" />
-               <javac srcdir="${src}" destdir="${build}/class" 
classpathref="lib.path" debug="on"/>
+               <javac srcdir="${src}" destdir="${build}/class" 
classpathref="lib.path" debug="off" includeAntRuntime="false">
+               <compilerarg value="-Xlint:unchecked"/>
+               </javac>
        </target>
 
        <!-- ======================= Validation stuff =================== -->
@@ -224,12 +222,11 @@
        <!-- ======================= JavaDoc =================== -->
        <target name="doc">
                <javadoc packagenames="org.perfsonar.*" sourcepath="${src}" 
defaultexcludes="yes" destdir="${basedir}/tmp/doc/api" author="true" 
version="true" use="true" linksource="yes" windowtitle="Test API" />
-
        </target>
-       
+
        <!-- ======================= preapre WAR structure 
=================== -->
        <target name="prepare-war-structure"  depends="build-web-admin">
-               
+
                <mkdir dir="${build}/flatten" />
                <copy todir="${build}/flatten" flatten="true">
                        <fileset dir="${lib}">
@@ -262,7 +259,7 @@
                <copy todir="build/war/WEB-INF/classes">
                        <fileset dir="log4j/production"/>
                </copy>
-               
+
                <copy todir="build/war/WEB-INF/lib">
                        <fileset dir="${build}/flatten">
                                <exclude name="${lib}/servlet/*"/>
@@ -270,7 +267,7 @@
                </copy>
 
        </target>
-       
+
        <!-- ======================= WAR creation =================== -->
        <target name="war" depends="build-web-admin">
 
@@ -327,32 +324,33 @@
 
        <!-- ======================= tomcat deployment =================== -->
 
-       <path id="tomcat.deployer.classpath">
-               <fileset dir="${tomcat.deployer.dir}">
-                       <include name="*.jar" />
-               </fileset>
-       </path>
+    <path id="tomcat.deployer.classpath">
+        <fileset dir="${tomcat.deployer.dir}">
+            <include name="*.jar" />
+        </fileset>
+    </path>
 
-       <taskdef resource="org/apache/catalina/ant/catalina.tasks" 
classpathref="tomcat.deployer.classpath" />
+       <!-- Uses another namespace and uri because of 
org.apache.catalina.ant.ResourcesTask resources conflict with ant > 1.7 -->
+    <taskdef resource="org/apache/catalina/ant/catalina.tasks" 
uri="catalinaant:org.apache.catalina.ant" 
classpathref="tomcat.deployer.classpath" />
 
        <target name="deploy" description="Deploy web application">
-               <deploy url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" war="file://${build}/${warfilename}-${version}.war" 
update="true" />
+               <ca:deploy url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" war="file://${build}/${warfilename}-${version}.war" 
update="true" />
        </target>
 
        <target name="undeploy" description="Undeploy web application">
-               <undeploy url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" />
+               <ca:undeploy url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" />
        </target>
 
        <!-- Webapp lifecycle control -->
        <target name="start" description="Start web application">
-               <start url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" />
+               <ca:start url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" />
        </target>
        <target name="reload" description="Reload web application">
-               <reload url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" />
+               <ca:reload url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" />
        </target>
 
        <target name="stop" description="Stop web application">
-               <stop url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" />
+               <ca:stop url="${tomcat.manager.url}" 
username="${tomcat.username}" password="${tomcat.password}" 
path="/${webapp.name}" />
        </target>
 
        <!-- ======================= Clean =================== -->
@@ -360,11 +358,12 @@
                <delete dir="${build}/class" />
                <delete dir="${build}/dependencies" />
                <delete dir="${build}/flatten" />
+        <delete dir="${build}/war" />
        </target>
 
        <target name="distclean" depends="clean">
                <delete file="${build}/${jarfilename}-${version}.jar" />
-               <delete file="${build}/${warfilename}-${version}.war" />
+               <delete file="${build}/${warfilename}.war" />
        </target>
 
        <!-- ======================= TESTING =================== -->

Modified: branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties
===================================================================
--- branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties   
2012-03-01 18:04:19 UTC (rev 5897)
+++ branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties   
2012-03-01 18:19:10 UTC (rev 5898)
@@ -7,7 +7,7 @@
 schema=${basedir}/schema
 xml.file=../conf/webAdminConfig.xml
 
-version=0.1
+version=1.0.1
 wa.version=20090201
 service.name=perfsonar-web-admin
 jarfilename=perfsonar-web-admin
@@ -29,7 +29,7 @@
 #api.title=perfSONAR
 #api.windowtitle=perfSONAR
 #api.bottom=perfSONAR
-servlet.dir=${basedir}/lib/repository/tomcat/servlet-api/5.0.28
+servlet.dir=${basedir}/lib/repository/tomcat/servlet-api/5.5.23
 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


Property changes on: branches/perfsonar-java-web-admin-1.0-stable/build
___________________________________________________________________
Added: svn:ignore
   + *



Property changes on: 
branches/perfsonar-java-web-admin-1.0-stable/lib/repository
___________________________________________________________________
Added: svn:ignore
   + *


Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
   2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
   2012-03-01 18:19:10 UTC (rev 5898)
@@ -132,7 +132,6 @@
                return result.toArray(new String[result.size()]);
        }
 
-       @SuppressWarnings("unchecked")
        public String[] getBasicLinks(ObjectMap o, boolean big) {
                WebAdminInterface wai;
                if (o == null)
@@ -160,7 +159,6 @@
                return wai.getServiceInformation().getVersion();
        }
 
-       @SuppressWarnings("unchecked")
        public String[] getAdvancedLinks(ObjectMap o, boolean big) {
                WebAdminInterface wai;
                if (o == null)
@@ -170,7 +168,6 @@
                return getLinksList(wai.getAdvancedlink(), big, true);
        }
 
-       @SuppressWarnings("unchecked")
        public boolean translate(String url, ObjectMap o, PrintStream o1) {
                objectMap = o;
                WebAdminInterface wai = objectMap.getWA();
@@ -178,7 +175,7 @@
                html = new HTMLUtil(out);
                if (wai == null)
                        return false;
-               List page = wai.getPage();
+               List<Object> page = wai.getPage();
                if (page != null)
                        for (int i = 0, sz = page.size(); i < sz; i++) {
                                PageType pt = (PageType) page.get(i);
@@ -195,7 +192,7 @@
                        return;
                // String u = pg.getUrl();
                // if( u != null ) url = u;
-               List plain = pg.getPlain();
+               List<Object> plain = pg.getPlain();
                GroupsType groups = pg.getGroups();
                if (groups != null) {
                        boolean oldContext = plainContext;
@@ -250,7 +247,7 @@
        public void translate(ComplexGroupUIType cgui, UIType u) {
                switch (u) {
                case RADIOGROUP:
-                       List plains = cgui.getPlain();
+                       List<Object> plains = cgui.getPlain();
                        if (plains == null)
                                return;
                        PrintStream oldOut = out;

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
       2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
       2012-03-01 18:19:10 UTC (rev 5898)
@@ -61,7 +61,7 @@
 
        private void makeMap() {
                NSContext nsc = new NSContext();
-               List map = getWA().getMap();
+               List<Object> map = getWA().getMap();
                NsMap ns;
                for (Object o : map) {
                        ns = (NsMap) o;

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
        2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
        2012-03-01 18:19:10 UTC (rev 5898)
@@ -1,6 +1,5 @@
 package org.perfsonar.webadmin.base2.servlet.util;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/NSContext.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/NSContext.java
 2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/NSContext.java
 2012-03-01 18:19:10 UTC (rev 5898)
@@ -7,7 +7,6 @@
 
 public class NSContext extends HashMap<String, String> implements
                NamespaceContext {
-       // private myurl = "";
        public NSContext() {
                put("xml", XMLConstants.XML_NS_URI);
        }
@@ -25,8 +24,7 @@
        }
 
        // This method isn't necessary for XPath processing either.
-       //
-       public Iterator getPrefixes(String uri) {
+       public Iterator<String> getPrefixes(String uri) {
                throw new UnsupportedOperationException();
        }
 };

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
       2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
       2012-03-01 18:19:10 UTC (rev 5898)
@@ -22,7 +22,7 @@
        // FIXME: Should read this from JAXB xml file
        "org.perfsonar.webadmin.base2.waschema.v20090201"; // 
.WebAdminInterface";
 
-       @SuppressWarnings({ "deprecation", "unchecked" })
+       @SuppressWarnings({ "deprecation"})
        public static Tuple<WebAdminInterface, JAXBContext> parseFile(
                        String fileName) throws FileNotFoundException,
                        MalformedURLException, JAXBException {
@@ -31,13 +31,13 @@
                isource.setSystemId(f.toURL().toString());
                JAXBContext context = JAXBContext.newInstance(CLASS_NAME);
                Unmarshaller unmarshaller = context.createUnmarshaller();
-               return new Tuple((WebAdminInterface) 
unmarshaller.unmarshal(isource),
+               return new Tuple<WebAdminInterface, 
JAXBContext>((WebAdminInterface) unmarshaller.unmarshal(isource),
                                context);
        }
 
        public static void main(String[] args) throws Exception {
                WebAdminInterface r = parseFile(args[0]).first();
-               List p = r.getPage();
+               List<Object> p = r.getPage();
                logger.debug("Pages " + p.size() + " " + 
p.get(0).getClass().getName());
        }
 };

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
   2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
   2012-03-01 18:19:10 UTC (rev 5898)
@@ -40,9 +40,7 @@
                BufferedInputStream bis = null;
                DataInputStream dis = null;
 
-               if (file == null)
-                       throw new Exception("Invalid file name " + fname);
-               else if (!file.exists())
+               if (!file.exists())
                        throw new Exception("File " + fname + " does not 
exist ");
                else {
                        try {

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ComplexGroupUIType.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ComplexGroupUIType.java
  2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ComplexGroupUIType.java
  2012-03-01 18:19:10 UTC (rev 5898)
@@ -8,6 +8,6 @@
 
   public void 
setValues(org.perfsonar.webadmin.base2.waschema.v20090201.BaseType pValues);
 
-  public java.util.List getPlain();
+  public java.util.List<Object> getPlain();
 
 }

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/GroupType.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/GroupType.java
   2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/GroupType.java
   2012-03-01 18:19:10 UTC (rev 5898)
@@ -4,7 +4,7 @@
   
 
 
-  public java.util.List getPlain();
+  public java.util.List<Object> getPlain();
 
   public java.lang.String getTitle();
 

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/GroupsType.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/GroupsType.java
  2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/GroupsType.java
  2012-03-01 18:19:10 UTC (rev 5898)
@@ -4,6 +4,6 @@
   
 
 
-  public java.util.List getGroup();
+  public java.util.List<Object> getGroup();
 
 }

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
       2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
       2012-03-01 18:19:10 UTC (rev 5898)
@@ -3,10 +3,10 @@
 public class ObjectFactory {
   private org.apache.ws.jaxme.impl.JAXBContextImpl jaxbContext;
 
-  private java.util.Map properties;
+  private java.util.Map<String,Object> properties;
 
 
-  public java.lang.Object newInstance(java.lang.Class pElementInterface) 
throws javax.xml.bind.JAXBException {
+  public java.lang.Object newInstance(@SuppressWarnings("rawtypes") 
java.lang.Class pElementInterface) throws javax.xml.bind.JAXBException {
     return jaxbContext.getManager(pElementInterface).getElementJ();
   }
 
@@ -19,7 +19,7 @@
 
   public void setProperty(java.lang.String pName, java.lang.Object pValue) {
     if (properties == null) {
-      properties = new java.util.HashMap();
+       properties = new java.util.HashMap<String,Object>();
     }
     properties.put(pName, pValue);
   }

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/PageType.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/PageType.java
    2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/PageType.java
    2012-03-01 18:19:10 UTC (rev 5898)
@@ -16,6 +16,6 @@
 
   public void 
setGroups(org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType pGroups);
 
-  public java.util.List getPlain();
+  public java.util.List<Object> getPlain();
 
 }

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
   2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
   2012-03-01 18:19:10 UTC (rev 5898)
@@ -18,12 +18,12 @@
 
   public void 
setCredential(org.perfsonar.webadmin.base2.waschema.v20090201.Credential 
pCredential);
 
-  public java.util.List getBasiclink();
+  public java.util.List<LinkType> getBasiclink();
 
-  public java.util.List getAdvancedlink();
+  public java.util.List<LinkType> getAdvancedlink();
 
-  public java.util.List getMap();
+  public java.util.List<Object> getMap();
 
-  public java.util.List getPage();
+  public java.util.List<Object> getPage();
 
 }

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ComplexGroupUITypeDriver.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ComplexGroupUITypeDriver.java
       2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ComplexGroupUITypeDriver.java
       2012-03-01 18:19:10 UTC (rev 5898)
@@ -33,7 +33,7 @@
       org.apache.ws.jaxme.impl.JMSAXDriver _7 = 
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.BaseType.class).getDriver();
       pController.marshal(_7, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "values", 
_1.getValues());
     }
-    java.util.List _8 = _1.getPlain();
+    java.util.List<Object> _8 = _1.getPlain();
     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.PlainType.class).getDriver();
       pController.marshal(_10, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "plain", 
(org.perfsonar.webadmin.base2.waschema.v20090201.PlainType)_8.get(_9));

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ComplexGroupUITypeImpl.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ComplexGroupUITypeImpl.java
 2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ComplexGroupUITypeImpl.java
 2012-03-01 18:19:10 UTC (rev 5898)
@@ -3,7 +3,7 @@
 public class ComplexGroupUITypeImpl extends 
org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeImpl 
implements org.perfsonar.webadmin.base2.waschema.v20090201.ComplexGroupUIType 
{
   private org.perfsonar.webadmin.base2.waschema.v20090201.BaseType _values;
 
-  private java.util.List _plain = new java.util.ArrayList();
+  private java.util.List<Object> _plain = new java.util.ArrayList<Object>();
 
 
   public org.perfsonar.webadmin.base2.waschema.v20090201.BaseType 
getValues() {
@@ -14,7 +14,7 @@
     _values = pValues;
   }
 
-  public java.util.List getPlain() {
+  public java.util.List<Object> getPlain() {
     return _plain;
   }
 

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupTypeDriver.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupTypeDriver.java
        2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupTypeDriver.java
        2012-03-01 18:19:10 UTC (rev 5898)
@@ -18,7 +18,7 @@
 
   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.GroupType _1 = 
(org.perfsonar.webadmin.base2.waschema.v20090201.GroupType) pObject;
-    java.util.List _2 = _1.getPlain();
+    java.util.List<Object> _2 = _1.getPlain();
     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.PlainType.class).getDriver();
       pController.marshal(_4, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "plain", 
(org.perfsonar.webadmin.base2.waschema.v20090201.PlainType)_2.get(_3));

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupTypeImpl.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupTypeImpl.java
  2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupTypeImpl.java
  2012-03-01 18:19:10 UTC (rev 5898)
@@ -1,12 +1,12 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
 
 public class GroupTypeImpl implements 
org.perfsonar.webadmin.base2.waschema.v20090201.GroupType {
-  private java.util.List _plain = new java.util.ArrayList();
+  private java.util.List<Object> _plain = new java.util.ArrayList<Object>();
 
   private java.lang.String _title;
 
 
-  public java.util.List getPlain() {
+  public java.util.List<Object> getPlain() {
     return _plain;
   }
 

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupsTypeDriver.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupsTypeDriver.java
       2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupsTypeDriver.java
       2012-03-01 18:19:10 UTC (rev 5898)
@@ -18,7 +18,7 @@
 
   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.GroupsType _1 = 
(org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType) pObject;
-    java.util.List _2 = _1.getGroup();
+    java.util.List<Object> _2 = _1.getGroup();
     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.GroupType.class).getDriver();
       pController.marshal(_4, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "group", 
(org.perfsonar.webadmin.base2.waschema.v20090201.GroupType)_2.get(_3));

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupsTypeImpl.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupsTypeImpl.java
 2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/GroupsTypeImpl.java
 2012-03-01 18:19:10 UTC (rev 5898)
@@ -1,10 +1,10 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
 
 public class GroupsTypeImpl implements 
org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType {
-  private java.util.List _group = new java.util.ArrayList();
+  private java.util.List<Object> _group = new java.util.ArrayList<Object>();
 
 
-  public java.util.List getGroup() {
+  public java.util.List<Object> getGroup() {
     return _group;
   }
 

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeDriver.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeDriver.java
 2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeDriver.java
 2012-03-01 18:19:10 UTC (rev 5898)
@@ -33,7 +33,7 @@
       org.apache.ws.jaxme.impl.JMSAXDriver _7 = 
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType.class).getDriver();
       pController.marshal(_7, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "groups", 
_1.getGroups());
     }
-    java.util.List _8 = _1.getPlain();
+    java.util.List<Object> _8 = _1.getPlain();
     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.PlainType.class).getDriver();
       pController.marshal(_10, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "plain", 
(org.perfsonar.webadmin.base2.waschema.v20090201.PlainType)_8.get(_9));

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeImpl.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeImpl.java
   2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeImpl.java
   2012-03-01 18:19:10 UTC (rev 5898)
@@ -7,7 +7,7 @@
 
   private org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType _groups;
 
-  private java.util.List _plain = new java.util.ArrayList();
+  private java.util.List<Object> _plain = new java.util.ArrayList<Object>();
 
 
   public org.perfsonar.webadmin.base2.waschema.v20090201.BaseType 
getPageId() {
@@ -34,7 +34,7 @@
     _groups = pGroups;
   }
 
-  public java.util.List getPlain() {
+  public java.util.List<Object> getPlain() {
     return _plain;
   }
 

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
        2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
        2012-03-01 18:19:10 UTC (rev 5898)
@@ -1,5 +1,7 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
 
+import org.perfsonar.webadmin.base2.waschema.v20090201.LinkType;
+
 public class WebAdminInterfaceDriver implements 
org.apache.ws.jaxme.impl.JMSAXDriver {
   public org.xml.sax.helpers.AttributesImpl 
getAttributes(org.apache.ws.jaxme.impl.JMSAXDriverController pController, 
java.lang.Object pObject) throws org.xml.sax.SAXException {
     org.xml.sax.helpers.AttributesImpl _1 = new 
org.xml.sax.helpers.AttributesImpl();
@@ -28,22 +30,22 @@
       org.apache.ws.jaxme.impl.JMSAXDriver _5 = 
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.Credential.class).getDriver();
       pController.marshal(_5, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "credential", 
_1.getCredential());
     }
-    java.util.List _6 = _1.getBasiclink();
+    java.util.List<LinkType> _6 = _1.getBasiclink();
     for (int _7 = 0;  _7 < (_6).size();  _7++) {
       org.apache.ws.jaxme.impl.JMSAXDriver _8 = 
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class).getDriver();
       pController.marshal(_8, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "basiclink", 
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)_6.get(_7));
     }
-    java.util.List _9 = _1.getAdvancedlink();
+    java.util.List<LinkType> _9 = _1.getAdvancedlink();
     for (int _10 = 0;  _10 < (_9).size();  _10++) {
       org.apache.ws.jaxme.impl.JMSAXDriver _11 = 
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class).getDriver();
       pController.marshal(_11, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink", 
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)_9.get(_10));
     }
-    java.util.List _12 = _1.getMap();
+    java.util.List<Object> _12 = _1.getMap();
     for (int _13 = 0;  _13 < (_12).size();  _13++) {
       org.apache.ws.jaxme.impl.JMSAXDriver _14 = 
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class).getDriver();
       pController.marshal(_14, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map", 
(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap)_12.get(_13));
     }
-    java.util.List _15 = _1.getPage();
+    java.util.List<Object> _15 = _1.getPage();
     for (int _16 = 0;  _16 < (_15).size();  _16++) {
       org.apache.ws.jaxme.impl.JMSAXDriver _17 = 
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class).getDriver();
       pController.marshal(_17, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page", 
(org.perfsonar.webadmin.base2.waschema.v20090201.PageType)_15.get(_16));

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
       2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
       2012-03-01 18:19:10 UTC (rev 5898)
@@ -1,5 +1,7 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
 
+import org.perfsonar.webadmin.base2.waschema.v20090201.LinkType;
+
 public class WebAdminInterfaceHandler extends 
org.apache.ws.jaxme.impl.JMSAXElementParser {
   /** The current state. The following values are valid states:
    *  0 = Before parsing the element
@@ -178,13 +180,13 @@
         break;
       case 3:
         if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "basiclink".equals(pLocalName)) {
-          _1.getBasiclink().add(pResult);
+          _1.getBasiclink().add((LinkType) pResult);
           return;
         }
         break;
       case 4:
         if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "advancedlink".equals(pLocalName)) {
-          _1.getAdvancedlink().add(pResult);
+          _1.getAdvancedlink().add((LinkType) pResult);
           return;
         }
         break;

Modified: 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
===================================================================
--- 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
  2012-03-01 18:04:19 UTC (rev 5897)
+++ 
branches/perfsonar-java-web-admin-1.0-stable/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
  2012-03-01 18:19:10 UTC (rev 5898)
@@ -1,17 +1,19 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
 
+import org.perfsonar.webadmin.base2.waschema.v20090201.LinkType;
+
 public class WebAdminInterfaceImpl implements 
org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface {
   private org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation 
_serviceInformation;
 
   private org.perfsonar.webadmin.base2.waschema.v20090201.Credential 
_credential;
 
-  private java.util.List _basiclink = new java.util.ArrayList();
+  private java.util.List<LinkType> _basiclink = new 
java.util.ArrayList<LinkType>();
 
-  private java.util.List _advancedlink = new java.util.ArrayList();
+  private java.util.List<LinkType> _advancedlink = new 
java.util.ArrayList<LinkType>();
 
-  private java.util.List _map = new java.util.ArrayList();
+  private java.util.List<Object> _map = new java.util.ArrayList<Object>();
 
-  private java.util.List _page = new java.util.ArrayList();
+  private java.util.List<Object> _page = new java.util.ArrayList<Object>();
 
 
   public org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation 
getServiceInformation() {
@@ -30,19 +32,19 @@
     _credential = pCredential;
   }
 
-  public java.util.List getBasiclink() {
+  public java.util.List<LinkType> getBasiclink() {
     return _basiclink;
   }
 
-  public java.util.List getAdvancedlink() {
+  public java.util.List<LinkType> getAdvancedlink() {
     return _advancedlink;
   }
 
-  public java.util.List getMap() {
+  public java.util.List<Object> getMap() {
     return _map;
   }
 
-  public java.util.List getPage() {
+  public java.util.List<Object> getPage() {
     return _page;
   }