perfsonar development work

Author: trzaszcz
Date: 2009-12-30 10:05:19 -0500 (Wed, 30 Dec 2009)
New Revision: 5445

Modified:
   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/waschema/v20090201/LinkType.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/PageType.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/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeImpl.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeDriver.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeHandler.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeImpl.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
Log:


Modified: branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd      
  2009-12-30 14:08:37 UTC (rev 5444)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd      
  2009-12-30 15:05:19 UTC (rev 5445)
@@ -88,18 +88,14 @@
 
                  <!-- Pages  -->
                  <xs:complexType name="PageType">
-                         <xs:sequence>
-                                 <xs:element name="url" type="wa:BaseType"
-                                         minOccurs="1" maxOccurs="1"/>
-                                 <xs:element name="title" type="wa:BaseType"
-                                                               minOccurs="0" 
maxOccurs="1"/>
-                                 <xs:choice>
-                                         <xs:element name="groups" 
type="wa:GroupsType" 
-                                                                         
minOccurs="1" maxOccurs="1"/>
-                                    <xs:element name="plain" 
type="wa:PlainType" 
-                                                                         
minOccurs="1" maxOccurs="unbounded"/> 
+                       <xs:sequence>
+                               <xs:element name="pageId" type="wa:BaseType" 
minOccurs="1" maxOccurs="1"/>
+                               <xs:element name="title" type="wa:BaseType" 
minOccurs="0" maxOccurs="1"/>
+                               <xs:choice>
+                                       <xs:element name="groups" 
type="wa:GroupsType" minOccurs="1" maxOccurs="1"/>
+                                   <xs:element name="plain" 
type="wa:PlainType" minOccurs="1" maxOccurs="unbounded"/> 
                            </xs:choice>
-                               </xs:sequence>
+                       </xs:sequence>
                  </xs:complexType>
 
                
@@ -114,10 +110,11 @@
 
                <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:choice>
+                                       <xs:element name="pageId" 
type="xs:string" minOccurs="1" maxOccurs="1"/>
+                                       <xs:element name="redirectTo" 
type="xs:string" minOccurs="1" maxOccurs="1"/>
+                                </xs:choice>
+                                <xs:element name="title" type="xs:string" 
minOccurs="1" maxOccurs="1"/>
                         </xs:sequence>
                </xs:complexType>
                

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
     2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
     2009-12-30 15:05:19 UTC (rev 5445)
@@ -77,25 +77,49 @@
                        String cls = advanced ? "configheadinglavender" : 
"configheading";
                        for (Object o : blist) {
                                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", "&nbsp")
-                                               + HTMLUtil.tag("p", "&nbsp")))
-                                               + "\n";
+                               
+                               String pageId=l.getPageId();
+                               if(pageId!=null){
+                                       basic = HTMLUtil.tag("tr", 
HTMLUtil.tag("td", HTMLUtil.att(
+                                                       "class", cls), 
HTMLUtil.tag("p",
+                                                       HTMLUtil
+                                                                       
.tag("a", HTMLUtil.att("href", "config?page="
+                                                                             
          + pageId)
+                                                                             
          + HTMLUtil.att("target", "_self"), l
+                                                                             
          .getTitle()))
+                                                       + HTMLUtil.tag("p", 
"&nbsp")
+                                                       + HTMLUtil.tag("p", 
"&nbsp")))
+                                                       + "\n";
+                               }else{
+                                       basic = HTMLUtil.tag("tr", 
HTMLUtil.tag("td", HTMLUtil.att(
+                                                       "class", cls), 
HTMLUtil.tag("p",
+                                                       HTMLUtil
+                                                                       
.tag("a", HTMLUtil.att("href",l.getRedirectTo())
+                                                                             
          + HTMLUtil.att("target", "_blank"), l
+                                                                             
          .getTitle()))
+                                                       + HTMLUtil.tag("p", 
"&nbsp")
+                                                       + HTMLUtil.tag("p", 
"&nbsp")))
+                                                       + "\n";
+                               }
                                result.add(basic);
                        }
                } else {
                        for (Object o : blist) {
                                LinkType l = (LinkType) o;
-                               basic = HTMLUtil.tag("a", 
HTMLUtil.att("href", "config?page="
-                                               + l.getUrl())
-                                               + HTMLUtil.att("target", 
"_self"), l.getTitle())
-                                               + "<br/>";
+                               
+                               String pageId=l.getPageId();
+                               
+                               if(pageId!=null){
+                                       basic = HTMLUtil.tag("a", 
HTMLUtil.att("href", "config?page="
+                                                       + pageId)
+                                                       + 
HTMLUtil.att("target", "_self"), l.getTitle())
+                                                       + "<br/>";
+                               }else{
+                                       basic = HTMLUtil.tag("a", 
HTMLUtil.att("href", l.getRedirectTo())
+                                                       + 
HTMLUtil.att("target", "_blank"), l.getTitle())
+                                                       + "<br/>";
+                               }
+                               
                                if (!basic.equals("")) {
                                        result.add("<p><span 
class=\"navtex\">" + basic
                                                        + "</span> </p>");
@@ -155,7 +179,7 @@
                if (page != null)
                        for (int i = 0, sz = page.size(); i < sz; i++) {
                                PageType pt = (PageType) page.get(i);
-                               if (raw(getData(pt.getUrl())).equals(url)) {
+                               if (raw(getData(pt.getPageId())).equals(url)) 
{
                                        translate(pt);
                                        return true;
                                }

Modified: 
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/LinkType.java
      2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/LinkType.java
      2009-12-30 15:05:19 UTC (rev 5445)
@@ -1,10 +1,14 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201;
 
 public interface LinkType {
-  public java.lang.String getUrl();
+  public java.lang.String getPageId();
 
-  public void setUrl(java.lang.String pUrl);
+  public void setPageId(java.lang.String pPageId);
 
+  public java.lang.String getRedirectTo();
+
+  public void setRedirectTo(java.lang.String pRedirectTo);
+
   public java.lang.String getTitle();
 
   public void setTitle(java.lang.String pTitle);

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/PageType.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/PageType.java
      2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/PageType.java
      2009-12-30 15:05:19 UTC (rev 5445)
@@ -4,9 +4,9 @@
   
 
 
-  public org.perfsonar.webadmin.base2.waschema.v20090201.BaseType getUrl();
+  public org.perfsonar.webadmin.base2.waschema.v20090201.BaseType 
getPageId();
 
-  public void 
setUrl(org.perfsonar.webadmin.base2.waschema.v20090201.BaseType pUrl);
+  public void 
setPageId(org.perfsonar.webadmin.base2.waschema.v20090201.BaseType pPageId);
 
   public org.perfsonar.webadmin.base2.waschema.v20090201.BaseType getTitle();
 

Modified: 
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/LinkTypeDriver.java
   2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeDriver.java
   2009-12-30 15:05:19 UTC (rev 5445)
@@ -18,12 +18,16 @@
 
   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.LinkType _1 = 
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType) pObject;
-    java.lang.String _2 = _1.getUrl();
+    java.lang.String _2 = _1.getPageId();
     if (_2 != null) {
-      pController.marshalSimpleChild(this, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "url", _1.getUrl());
+      pController.marshalSimpleChild(this, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "pageId", 
_1.getPageId());
     }
-    java.lang.String _3 = _1.getTitle();
+    java.lang.String _3 = _1.getRedirectTo();
     if (_3 != null) {
+      pController.marshalSimpleChild(this, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "redirectTo", 
_1.getRedirectTo());
+    }
+    java.lang.String _4 = _1.getTitle();
+    if (_4 != null) {
       pController.marshalSimpleChild(this, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "title", 
_1.getTitle());
     }
   }

Modified: 
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/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeHandler.java
  2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeHandler.java
  2009-12-30 15:05:19 UTC (rev 5445)
@@ -1,9 +1,83 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
 
 public class LinkTypeHandler extends 
org.apache.ws.jaxme.impl.JMSAXElementParser {
+  public class PageIdChoiceRedirectToHandler extends 
org.apache.ws.jaxme.impl.JMSAXGroupParser {
+    /** Will be set to true, if the first child is parsed.
+     * It is an error, if another child is parsed, and the
+     * fields value is true.
+     * 
+     */
+    private boolean __state;
+  
+    /** Index of the particle being currently parsed
+     * 
+     */
+    private int __childNum;
+  
+  
+    public org.apache.ws.jaxme.impl.JMUnmarshallerHandlerImpl getHandler() {
+      return 
org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeHandler.this.getHandler();
+    }
+  
+    public boolean startElement(java.lang.String pNamespaceURI, 
java.lang.String pLocalName, java.lang.String pQName, org.xml.sax.Attributes 
pAttr) throws org.xml.sax.SAXException {
+      org.apache.ws.jaxme.impl.JMUnmarshallerHandlerImpl _1 = getHandler();
+      if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "pageId".equals(pLocalName)) {
+        if (__state) {
+          if (__childNum != 0) {
+            
getHandler().validationEvent(javax.xml.bind.ValidationEvent.WARNING, 
"Multiple different particles present in a choive group.", 
org.apache.ws.jaxme.ValidationEvents.EVENT_CHOICE_GROUP_REUSE, null);
+          } else {
+            
getHandler().validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The 
element {http://webadmin.perfsonar.org/base2/waschema/v20090201}pageId has 
already been defined.", 
org.apache.ws.jaxme.ValidationEvents.EVENT_CHOICE_GROUP_REUSE, null);
+          }
+        }
+        __state = true;
+        __childNum = 0;
+        _1.addSimpleAtomicState();
+        return true;
+      } else if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "redirectTo".equals(pLocalName)) {
+        if (__state) {
+          if (__childNum != 1) {
+            
getHandler().validationEvent(javax.xml.bind.ValidationEvent.WARNING, 
"Multiple different particles present in a choive group.", 
org.apache.ws.jaxme.ValidationEvents.EVENT_CHOICE_GROUP_REUSE, null);
+          } else {
+            
getHandler().validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The 
element {http://webadmin.perfsonar.org/base2/waschema/v20090201}redirectTo 
has already been defined.", 
org.apache.ws.jaxme.ValidationEvents.EVENT_CHOICE_GROUP_REUSE, null);
+          }
+        }
+        __state = true;
+        __childNum = 1;
+        _1.addSimpleAtomicState();
+        return true;
+      }
+      return false;
+    }
+  
+    public void endElement(java.lang.String pNamespaceURI, java.lang.String 
pLocalName, java.lang.String pQName, java.lang.Object pResult) throws 
org.xml.sax.SAXException {
+      org.perfsonar.webadmin.base2.waschema.v20090201.LinkType _1 = 
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType) result;
+      switch (__childNum) {
+        case 0:
+          if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "pageId".equals(pLocalName)) {
+            _1.setPageId((java.lang.String) pResult);
+            return;
+          }
+          break;
+        case 1:
+          if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "redirectTo".equals(pLocalName)) {
+            _1.setRedirectTo((java.lang.String) pResult);
+            return;
+          }
+          break;
+        default:
+          throw new java.lang.IllegalStateException("Illegal state: " + 
__childNum);
+      }
+    }
+  
+    public boolean isFinished() {
+      return __state;
+    }
+  
+  }
+
   /** 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}url
+   *  1 = While parsing the nested group PageIdChoiceRedirectTo
    *  2 = While or after parsing the child element 
{http://webadmin.perfsonar.org/base2/waschema/v20090201}title
    * 
    */
@@ -14,9 +88,8 @@
     org.apache.ws.jaxme.impl.JMUnmarshallerHandlerImpl _1 = getHandler();
     switch (__state) {
       case 0:
-        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "url".equals(pLocalName)) {
+        if (_1.testGroupParser(new 
org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeHandler.PageIdChoiceRedirectToHandler(),
 pNamespaceURI, pLocalName, pQName, pAttr)) {
           __state = 1;
-          _1.addSimpleAtomicState();
           return true;
         }
         break;
@@ -39,11 +112,7 @@
     org.perfsonar.webadmin.base2.waschema.v20090201.LinkType _1 = 
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType) result;
     switch (__state) {
       case 1:
-        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "url".equals(pLocalName)) {
-          _1.setUrl((java.lang.String) pResult);
-          return;
-        }
-        break;
+        throw new java.lang.IllegalStateException("This case should be 
handled by a nested group parser.");
       case 2:
         if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "title".equals(pLocalName)) {
           _1.setTitle((java.lang.String) pResult);

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeImpl.java
     2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/LinkTypeImpl.java
     2009-12-30 15:05:19 UTC (rev 5445)
@@ -1,19 +1,29 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
 
 public class LinkTypeImpl implements 
org.perfsonar.webadmin.base2.waschema.v20090201.LinkType {
-  private java.lang.String _url;
+  private java.lang.String _pageId;
 
+  private java.lang.String _redirectTo;
+
   private java.lang.String _title;
 
 
-  public java.lang.String getUrl() {
-    return _url;
+  public java.lang.String getPageId() {
+    return _pageId;
   }
 
-  public void setUrl(java.lang.String pUrl) {
-    _url = pUrl;
+  public void setPageId(java.lang.String pPageId) {
+    _pageId = pPageId;
   }
 
+  public java.lang.String getRedirectTo() {
+    return _redirectTo;
+  }
+
+  public void setRedirectTo(java.lang.String pRedirectTo) {
+    _redirectTo = pRedirectTo;
+  }
+
   public java.lang.String getTitle() {
     return _title;
   }

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeDriver.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeDriver.java
   2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeDriver.java
   2009-12-30 15:05:19 UTC (rev 5445)
@@ -18,10 +18,10 @@
 
   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.PageType _1 = 
(org.perfsonar.webadmin.base2.waschema.v20090201.PageType) pObject;
-    org.perfsonar.webadmin.base2.waschema.v20090201.BaseType _2 = 
_1.getUrl();
+    org.perfsonar.webadmin.base2.waschema.v20090201.BaseType _2 = 
_1.getPageId();
     if (_2 != null) {
       org.apache.ws.jaxme.impl.JMSAXDriver _3 = 
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.BaseType.class).getDriver();
-      pController.marshal(_3, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "url", _1.getUrl());
+      pController.marshal(_3, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "pageId", 
_1.getPageId());
     }
     org.perfsonar.webadmin.base2.waschema.v20090201.BaseType _4 = 
_1.getTitle();
     if (_4 != null) {

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeHandler.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeHandler.java
  2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeHandler.java
  2009-12-30 15:05:19 UTC (rev 5445)
@@ -85,7 +85,7 @@
 
   /** 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}url
+   *  1 = While or after parsing the child element 
{http://webadmin.perfsonar.org/base2/waschema/v20090201}pageId
    *  2 = While or after parsing the child element 
{http://webadmin.perfsonar.org/base2/waschema/v20090201}title
    *  3 = While parsing the nested group GroupsChoicePlain
    * 
@@ -97,12 +97,12 @@
     org.apache.ws.jaxme.impl.JMUnmarshallerHandlerImpl _1 = getHandler();
     switch (__state) {
       case 0:
-        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "url".equals(pLocalName)) {
+        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "pageId".equals(pLocalName)) {
           __state = 1;
           org.apache.ws.jaxme.JMManager _2 = 
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.BaseType.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";, "url", 
_1.getLevel());
+          _4.init(_1, _3, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "pageId", 
_1.getLevel());
           _4.setAttributes(pAttr);
           _1.addElementParser(_4);
           return true;
@@ -141,8 +141,8 @@
     org.perfsonar.webadmin.base2.waschema.v20090201.PageType _1 = 
(org.perfsonar.webadmin.base2.waschema.v20090201.PageType) result;
     switch (__state) {
       case 1:
-        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "url".equals(pLocalName)) {
-          
_1.setUrl(((org.perfsonar.webadmin.base2.waschema.v20090201.BaseType) 
pResult));
+        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "pageId".equals(pLocalName)) {
+          
_1.setPageId(((org.perfsonar.webadmin.base2.waschema.v20090201.BaseType) 
pResult));
           return;
         }
         break;

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeImpl.java
     2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/PageTypeImpl.java
     2009-12-30 15:05:19 UTC (rev 5445)
@@ -1,7 +1,7 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
 
 public class PageTypeImpl implements 
org.perfsonar.webadmin.base2.waschema.v20090201.PageType {
-  private org.perfsonar.webadmin.base2.waschema.v20090201.BaseType _url;
+  private org.perfsonar.webadmin.base2.waschema.v20090201.BaseType _pageId;
 
   private org.perfsonar.webadmin.base2.waschema.v20090201.BaseType _title;
 
@@ -10,12 +10,12 @@
   private java.util.List _plain = new java.util.ArrayList();
 
 
-  public org.perfsonar.webadmin.base2.waschema.v20090201.BaseType getUrl() {
-    return _url;
+  public org.perfsonar.webadmin.base2.waschema.v20090201.BaseType 
getPageId() {
+    return _pageId;
   }
 
-  public void 
setUrl(org.perfsonar.webadmin.base2.waschema.v20090201.BaseType pUrl) {
-    _url = pUrl;
+  public void 
setPageId(org.perfsonar.webadmin.base2.waschema.v20090201.BaseType pPageId) {
+    _pageId = pPageId;
   }
 
   public org.perfsonar.webadmin.base2.waschema.v20090201.BaseType getTitle() 
{

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
     2009-12-30 14:08:37 UTC (rev 5444)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
     2009-12-30 15:05:19 UTC (rev 5445)
@@ -18,19 +18,24 @@
        </wa:credential>
        
        <wa:basiclink>
-               <wa:url>basic</wa:url> <!-- page identifier -->
+               <wa:pageId>basic</wa:pageId> <!-- page identifier -->
                <wa:title>Service settings</wa:title>
        </wa:basiclink>
        
        <wa:basiclink>
-               <wa:url>changePassword</wa:url> <!-- page identifier -->
+               <wa:pageId>changePassword</wa:pageId> <!-- page identifier -->
                <wa:title>Change WA password</wa:title>
        </wa:basiclink>
 
        <wa:advancedlink>
-               <wa:url>advanced</wa:url> <!-- page identifier -->
+               <wa:pageId>advanced</wa:pageId> <!-- page identifier -->
                <wa:title>Advanced Service Settings</wa:title>
        </wa:advancedlink>
+       
+       <wa:advancedlink>
+               <wa:redirectTo>http://localhost:8080/exist</wa:redirectTo>
+               <wa:title>Exist configuration</wa:title>
+       </wa:advancedlink>
 
        <wa:map>
                
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
@@ -43,7 +48,7 @@
        </wa:map>
        
        <wa:page>
-               <wa:url><wa:text>changePassword</wa:text></wa:url>
+               <wa:pageId><wa:text>changePassword</wa:text></wa:pageId>
                <wa:title><wa:text>Change Password</wa:text></wa:title>
                <wa:plain>
                        <wa:textbox>
@@ -68,7 +73,7 @@
        </wa:page>
 
        <wa:page>
-               <wa:url><wa:text>basic</wa:text></wa:url>
+               <wa:pageId><wa:text>basic</wa:text></wa:pageId>
                <wa:title><wa:text>Title of this page</wa:text></wa:title>
                <wa:plain>
                        <wa:textbox>
@@ -116,7 +121,7 @@
        
        
        <wa:page>
-               <wa:url><wa:text>advanced</wa:text></wa:url>
+               <wa:pageId><wa:text>advanced</wa:text></wa:pageId>
                <wa:title><wa:text>Title of this page</wa:text></wa:title>
                <wa:plain>
                        <wa:textbox>