perfsonar development work

Author: trzaszcz
Date: 2009-12-30 05:20:28 -0500 (Wed, 30 Dec 2009)
New Revision: 5440

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/waschema/v20090201/ServiceInformation.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationDriver.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationHandler.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationImpl.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 09:53:36 UTC (rev 5439)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd      
  2009-12-30 10:20:28 UTC (rev 5440)
@@ -130,8 +130,9 @@
                
                <xs:complexType name="ServiceInformation">
                         <xs:sequence>
-                                <xs:element name="serviceName" 
type="xs:string" minOccurs="1" maxOccurs="1"/>
-                                <xs:element name="version" type="xs:string" 
minOccurs="1" maxOccurs="1"/>
+                               <xs:element name="accessPoint" 
type="xs:string" minOccurs="1" maxOccurs="1"/>
+                               <xs:element name="serviceName" 
type="xs:string" minOccurs="1" maxOccurs="1"/>
+                               <xs:element name="version" 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/waschema/v20090201/ServiceInformation.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ServiceInformation.java
    2009-12-30 09:53:36 UTC (rev 5439)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ServiceInformation.java
    2009-12-30 10:20:28 UTC (rev 5440)
@@ -1,6 +1,10 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201;
 
 public interface ServiceInformation {
+  public java.lang.String getAccessPoint();
+
+  public void setAccessPoint(java.lang.String pAccessPoint);
+
   public java.lang.String getServiceName();
 
   public void setServiceName(java.lang.String pServiceName);

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationDriver.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationDriver.java
 2009-12-30 09:53:36 UTC (rev 5439)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationDriver.java
 2009-12-30 10:20:28 UTC (rev 5440)
@@ -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.ServiceInformation _1 = 
(org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation) pObject;
-    java.lang.String _2 = _1.getServiceName();
+    java.lang.String _2 = _1.getAccessPoint();
     if (_2 != null) {
+      pController.marshalSimpleChild(this, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "accessPoint", 
_1.getAccessPoint());
+    }
+    java.lang.String _3 = _1.getServiceName();
+    if (_3 != null) {
       pController.marshalSimpleChild(this, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "serviceName", 
_1.getServiceName());
     }
-    java.lang.String _3 = _1.getVersion();
-    if (_3 != null) {
+    java.lang.String _4 = _1.getVersion();
+    if (_4 != null) {
       pController.marshalSimpleChild(this, 
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "version", 
_1.getVersion());
     }
   }

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationHandler.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationHandler.java
        2009-12-30 09:53:36 UTC (rev 5439)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationHandler.java
        2009-12-30 10:20:28 UTC (rev 5440)
@@ -3,8 +3,9 @@
 public class ServiceInformationHandler 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}serviceName
-   *  2 = While or after parsing the child element 
{http://webadmin.perfsonar.org/base2/waschema/v20090201}version
+   *  1 = While or after parsing the child element 
{http://webadmin.perfsonar.org/base2/waschema/v20090201}accessPoint
+   *  2 = While or after parsing the child element 
{http://webadmin.perfsonar.org/base2/waschema/v20090201}serviceName
+   *  3 = While or after parsing the child element 
{http://webadmin.perfsonar.org/base2/waschema/v20090201}version
    * 
    */
   private int __state;
@@ -14,21 +15,28 @@
     org.apache.ws.jaxme.impl.JMUnmarshallerHandlerImpl _1 = getHandler();
     switch (__state) {
       case 0:
-        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "serviceName".equals(pLocalName)) {
+        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "accessPoint".equals(pLocalName)) {
           __state = 1;
           _1.addSimpleAtomicState();
           return true;
         }
         break;
       case 1:
-        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "version".equals(pLocalName)) {
+        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "serviceName".equals(pLocalName)) {
           __state = 2;
           _1.addSimpleAtomicState();
           return true;
         }
         break;
       case 2:
+        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "version".equals(pLocalName)) {
+          __state = 3;
+          _1.addSimpleAtomicState();
+          return true;
+        }
         break;
+      case 3:
+        break;
       default:
         throw new java.lang.IllegalStateException("Invalid state: " + 
__state);
     }
@@ -39,12 +47,18 @@
     org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation _1 = 
(org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation) result;
     switch (__state) {
       case 1:
+        if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "accessPoint".equals(pLocalName)) {
+          _1.setAccessPoint((java.lang.String) pResult);
+          return;
+        }
+        break;
+      case 2:
         if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "serviceName".equals(pLocalName)) {
           _1.setServiceName((java.lang.String) pResult);
           return;
         }
         break;
-      case 2:
+      case 3:
         if 
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
  &&  "version".equals(pLocalName)) {
           _1.setVersion((java.lang.String) pResult);
           return;
@@ -57,7 +71,7 @@
 
   public boolean isFinished() {
     switch (__state) {
-      case 2:
+      case 3:
         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/ServiceInformationImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationImpl.java
   2009-12-30 09:53:36 UTC (rev 5439)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationImpl.java
   2009-12-30 10:20:28 UTC (rev 5440)
@@ -1,11 +1,21 @@
 package org.perfsonar.webadmin.base2.waschema.v20090201.impl;
 
 public class ServiceInformationImpl implements 
org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation {
+  private java.lang.String _accessPoint;
+
   private java.lang.String _serviceName;
 
   private java.lang.String _version;
 
 
+  public java.lang.String getAccessPoint() {
+    return _accessPoint;
+  }
+
+  public void setAccessPoint(java.lang.String pAccessPoint) {
+    _accessPoint = pAccessPoint;
+  }
+
   public java.lang.String getServiceName() {
     return _serviceName;
   }

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 09:53:36 UTC (rev 5439)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
     2009-12-30 10:20:28 UTC (rev 5440)
@@ -4,7 +4,9 @@
 <wa:interface
        xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>
        
+       <!-- service information cosists of name nad version (only for 
displaying purpose) and accessPoint - selfTest -->
        <wa:serviceInformation>
+               
<wa:accessPoint>http://localhost:9000/wa/AccessPoint</wa:accessPoint>
                <wa:serviceName>Service Name</wa:serviceName>
                <wa:version>1.23</wa:version>
        </wa:serviceInformation>