Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r5437 - in branches/new-structure-with-base2/ps-mdm-web-admin: schema/xsd src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201 src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl tomcat/classes/perfsonar/conf tomcat/html tomcat/html/parts

Subject: perfsonar development work

List archive

perfsonar: r5437 - in branches/new-structure-with-base2/ps-mdm-web-admin: schema/xsd src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201 src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl tomcat/classes/perfsonar/conf tomcat/html tomcat/html/parts


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r5437 - in branches/new-structure-with-base2/ps-mdm-web-admin: schema/xsd src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201 src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl tomcat/classes/perfsonar/conf tomcat/html tomcat/html/parts
  • Date: Wed, 30 Dec 2009 03:39:31 -0500
Author: trzaszcz
Date: 2009-12-30 03:39:31 -0500 (Wed, 30 Dec 2009)
New Revision: 5437

Added:

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
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/Configuration.xml

branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java

branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java

branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java

branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java

branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java

branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp

branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/banner.jsp
Log:
serviceInformation(version,name) added

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-29 15:14:10 UTC (rev 5436)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd
2009-12-30 08:39:31 UTC (rev 5437)
@@ -127,11 +127,20 @@
<xs:element name="password" type="xs:string"
minOccurs="1" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
+
+ <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:sequence>
+ </xs:complexType>

<!-- Root -->
<xs:complexType name="WebAdminInterface">
<xs:sequence>
-
+
+ <xs:element name="serviceInformation"
type="wa:ServiceInformation" minOccurs="1" maxOccurs="1"/>
+
<xs:element name="credential"
type="wa:Credential" minOccurs="1" maxOccurs="1"/>

<xs:element name="basiclink"
type="wa:LinkType"

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-29 15:14:10 UTC (rev 5436)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2009-12-30 08:39:31 UTC (rev 5437)
@@ -115,6 +115,24 @@
throw new RuntimeException("Null web admin
interface");
return getLinksList(wai.getBasiclink(), big, false);
}
+
+ public String getServiceName(ObjectMap o){
+ WebAdminInterface wai;
+ if (o == null)
+ throw new RuntimeException("Null object map");
+ else if ((wai = o.getWA()) == null)
+ throw new RuntimeException("Null web admin
interface");
+ return wai.getServiceInformation().getServiceName();
+ }
+
+ public String getVersion(ObjectMap o){
+ WebAdminInterface wai;
+ if (o == null)
+ throw new RuntimeException("Null object map");
+ else if ((wai = o.getWA()) == null)
+ throw new RuntimeException("Null web admin
interface");
+ return wai.getServiceInformation().getVersion();
+ }

@SuppressWarnings("unchecked")
public String[] getAdvancedLinks(ObjectMap o, boolean big) {

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-12-29 15:14:10 UTC (rev 5436)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/Configuration.xml
2009-12-30 08:39:31 UTC (rev 5437)
@@ -1 +1 @@
-<Configuration
xmlns="http://ws.apache.org/jaxme/namespaces/jaxme2/configuration";><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceValidator"
qName="{http://webadmin.perfsonar.org/base2/waschema/v20090201}interface";
prefix="wa"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.Interface"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.InterfaceImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.BaseType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeImpl"
driverClass="org.perfsonar.webadm
in.base2.waschema.v20090201.impl.BaseTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeHandler"

elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.BaseUIType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeHandler"

elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexUIType"

elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema
.v20090201.impl.ComplexGroupUITypeValidator" handlerClass="o!
rg.perfs
onar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexGroupUIType"

elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PlainType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeHandler"
elementInterface="org.perfsonar.webadmin
.base2.waschema.v20090201.GroupType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeHandler"

elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PageType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeImpl"
driverClass="org.
perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeDri!
ver"/><M
anager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.NsMap"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.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.CredentialValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl
.CredentialHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.Credential"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.CredentialImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.CredentialDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceHandler"

elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface"

elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceDriver"/></Configuration>
\ No newline at end of file
+<Configuration
xmlns="http://ws.apache.org/jaxme/namespaces/jaxme2/configuration";><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceValidator"
qName="{http://webadmin.perfsonar.org/base2/waschema/v20090201}interface";
prefix="wa"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.Interface"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.InterfaceImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.BaseType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseTypeImpl"
driverClass="org.perfsonar.webadm
in.base2.waschema.v20090201.impl.BaseTypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeHandler"

elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.BaseUIType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeHandler"

elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexUIType"

elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeDriver"/><Manager
validatorClass="org.perfsonar.webadmin.base2.waschema
.v20090201.impl.ComplexGroupUITypeValidator" handlerClass="o!
rg.perfs
onar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexGroupUIType"

elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PlainType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeHandler"
elementInterface="org.perfsonar.webadmin
.base2.waschema.v20090201.GroupType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeHandler"

elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PageType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeImpl"
driverClass="org.
perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeDri!
ver"/><M
anager
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.NsMap"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapImpl"
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.LinkType"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.CredentialValidator"
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl
.CredentialHandler"
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.Credential"
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.CredentialImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.CredentialDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ServiceInformationValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ServiceInformationHandler"

elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation"

elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ServiceInformationImpl"

driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ServiceInformationDriver"/><Manager

validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceValidator"

handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceHandler"
elementInterface="org.perfsonar.webadmin.base2.wasche
ma.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

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
2009-12-29 15:14:10 UTC (rev 5436)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
2009-12-30 08:39:31 UTC (rev 5437)
@@ -76,6 +76,10 @@
return (org.perfsonar.webadmin.base2.waschema.v20090201.Credential)
newInstance(org.perfsonar.webadmin.base2.waschema.v20090201.Credential.class);
}

+ public org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation
createServiceInformation() throws javax.xml.bind.JAXBException {
+ return
(org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation)
newInstance(org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation.class);
+ }
+
public ObjectFactory() throws javax.xml.bind.JAXBException {
jaxbContext = (org.apache.ws.jaxme.impl.JAXBContextImpl)
javax.xml.bind.JAXBContext.newInstance("org.perfsonar.webadmin.base2.waschema.v20090201");
}

Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ServiceInformation.java

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
2009-12-29 15:14:10 UTC (rev 5436)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
2009-12-30 08:39:31 UTC (rev 5437)
@@ -10,6 +10,10 @@



+ public org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation
getServiceInformation();
+
+ public void
setServiceInformation(org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation
pServiceInformation);
+
public org.perfsonar.webadmin.base2.waschema.v20090201.Credential
getCredential();

public void
setCredential(org.perfsonar.webadmin.base2.waschema.v20090201.Credential
pCredential);

Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationDriver.java

Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationHandler.java

Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/ServiceInformationImpl.java

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
2009-12-29 15:14:10 UTC (rev 5436)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
2009-12-30 08:39:31 UTC (rev 5437)
@@ -18,31 +18,36 @@

public void marshalChilds(org.apache.ws.jaxme.impl.JMSAXDriverController
pController, org.xml.sax.ContentHandler pHandler, java.lang.Object pObject)
throws org.xml.sax.SAXException {
org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface _1 =
(org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface) pObject;
- org.perfsonar.webadmin.base2.waschema.v20090201.Credential _2 =
_1.getCredential();
+ org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation _2 =
_1.getServiceInformation();
if (_2 != null) {
- org.apache.ws.jaxme.impl.JMSAXDriver _3 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.Credential.class).getDriver();
- pController.marshal(_3,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "credential",
_1.getCredential());
+ org.apache.ws.jaxme.impl.JMSAXDriver _3 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation.class).getDriver();
+ pController.marshal(_3,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";,
"serviceInformation", _1.getServiceInformation());
}
- java.util.List _4 = _1.getBasiclink();
- for (int _5 = 0; _5 < (_4).size(); _5++) {
- org.apache.ws.jaxme.impl.JMSAXDriver _6 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class).getDriver();
- pController.marshal(_6,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "basiclink",
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)_4.get(_5));
+ org.perfsonar.webadmin.base2.waschema.v20090201.Credential _4 =
_1.getCredential();
+ if (_4 != null) {
+ 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 _7 = _1.getAdvancedlink();
- for (int _8 = 0; _8 < (_7).size(); _8++) {
- org.apache.ws.jaxme.impl.JMSAXDriver _9 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class).getDriver();
- pController.marshal(_9,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink",
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)_7.get(_8));
+ java.util.List _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 _10 = _1.getMap();
- for (int _11 = 0; _11 < (_10).size(); _11++) {
- org.apache.ws.jaxme.impl.JMSAXDriver _12 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class).getDriver();
- pController.marshal(_12,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap)_10.get(_11));
+ java.util.List _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 _13 = _1.getPage();
- for (int _14 = 0; _14 < (_13).size(); _14++) {
- org.apache.ws.jaxme.impl.JMSAXDriver _15 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class).getDriver();
- pController.marshal(_15,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
(org.perfsonar.webadmin.base2.waschema.v20090201.PageType)_13.get(_14));
+ java.util.List _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();
+ 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/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
2009-12-29 15:14:10 UTC (rev 5436)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
2009-12-30 08:39:31 UTC (rev 5437)
@@ -3,11 +3,12 @@
public class WebAdminInterfaceHandler extends
org.apache.ws.jaxme.impl.JMSAXElementParser {
/** The current state. The following values are valid states:
* 0 = Before parsing the element
- * 1 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}credential
- * 2 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}basiclink
- * 3 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}advancedlink
- * 4 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}map
- * 5 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}page
+ * 1 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}serviceInformation
+ * 2 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}credential
+ * 3 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}basiclink
+ * 4 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}advancedlink
+ * 5 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}map
+ * 6 = While or after parsing the child element
{http://webadmin.perfsonar.org/base2/waschema/v20090201}page
*
*/
private int __state;
@@ -17,24 +18,24 @@
org.apache.ws.jaxme.impl.JMUnmarshallerHandlerImpl _1 = getHandler();
switch (__state) {
case 0:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "credential".equals(pLocalName)) {
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "serviceInformation".equals(pLocalName)) {
__state = 1;
- org.apache.ws.jaxme.JMManager _2 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.Credential.class);
+ org.apache.ws.jaxme.JMManager _2 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation.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";, "credential",
_1.getLevel());
+ _4.init(_1, _3,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";,
"serviceInformation", _1.getLevel());
_4.setAttributes(pAttr);
_1.addElementParser(_4);
return true;
}
break;
case 1:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "credential".equals(pLocalName)) {
__state = 2;
- org.apache.ws.jaxme.JMManager _5 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
+ org.apache.ws.jaxme.JMManager _5 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.Credential.class);
java.lang.Object _6 = _5.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _7 = _5.getHandler();
- _7.init(_1, _6,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "basiclink",
_1.getLevel());
+ _7.init(_1, _6,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "credential",
_1.getLevel());
_7.setAttributes(pAttr);
_1.addElementParser(_7);
return true;
@@ -42,7 +43,7 @@
break;
case 2:
if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
- __state = 2;
+ __state = 3;
org.apache.ws.jaxme.JMManager _8 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
java.lang.Object _9 = _8.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _10 = _8.getHandler();
@@ -50,89 +51,89 @@
_10.setAttributes(pAttr);
_1.addElementParser(_10);
return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".equals(pLocalName)) {
+ }
+ break;
+ case 3:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
__state = 3;
org.apache.ws.jaxme.JMManager _11 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
java.lang.Object _12 = _11.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _13 = _11.getHandler();
- _13.init(_1, _12,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink",
_1.getLevel());
+ _13.init(_1, _12,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "basiclink",
_1.getLevel());
_13.setAttributes(pAttr);
_1.addElementParser(_13);
return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".equals(pLocalName)) {
__state = 4;
- org.apache.ws.jaxme.JMManager _14 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
+ org.apache.ws.jaxme.JMManager _14 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
java.lang.Object _15 = _14.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _16 = _14.getHandler();
- _16.init(_1, _15,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
+ _16.init(_1, _15,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink",
_1.getLevel());
_16.setAttributes(pAttr);
_1.addElementParser(_16);
return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
__state = 5;
- org.apache.ws.jaxme.JMManager _17 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
+ org.apache.ws.jaxme.JMManager _17 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
java.lang.Object _18 = _17.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _19 = _17.getHandler();
- _19.init(_1, _18,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _19.init(_1, _18,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
_19.setAttributes(pAttr);
_1.addElementParser(_19);
return true;
- }
- break;
- case 3:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".equals(pLocalName)) {
- __state = 3;
- org.apache.ws.jaxme.JMManager _20 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 6;
+ org.apache.ws.jaxme.JMManager _20 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
java.lang.Object _21 = _20.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _22 = _20.getHandler();
- _22.init(_1, _21,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink",
_1.getLevel());
+ _22.init(_1, _21,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
_22.setAttributes(pAttr);
_1.addElementParser(_22);
return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
+ }
+ break;
+ case 4:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".equals(pLocalName)) {
__state = 4;
- org.apache.ws.jaxme.JMManager _23 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
+ org.apache.ws.jaxme.JMManager _23 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
java.lang.Object _24 = _23.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _25 = _23.getHandler();
- _25.init(_1, _24,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
+ _25.init(_1, _24,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink",
_1.getLevel());
_25.setAttributes(pAttr);
_1.addElementParser(_25);
return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
__state = 5;
- org.apache.ws.jaxme.JMManager _26 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
+ org.apache.ws.jaxme.JMManager _26 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
java.lang.Object _27 = _26.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _28 = _26.getHandler();
- _28.init(_1, _27,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _28.init(_1, _27,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
_28.setAttributes(pAttr);
_1.addElementParser(_28);
return true;
- }
- break;
- case 4:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
- __state = 4;
- org.apache.ws.jaxme.JMManager _29 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 6;
+ org.apache.ws.jaxme.JMManager _29 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
java.lang.Object _30 = _29.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _31 = _29.getHandler();
- _31.init(_1, _30,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
+ _31.init(_1, _30,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
_31.setAttributes(pAttr);
_1.addElementParser(_31);
return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ }
+ break;
+ case 5:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
__state = 5;
- org.apache.ws.jaxme.JMManager _32 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
+ org.apache.ws.jaxme.JMManager _32 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.class);
java.lang.Object _33 = _32.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _34 = _32.getHandler();
- _34.init(_1, _33,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _34.init(_1, _33,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
_1.getLevel());
_34.setAttributes(pAttr);
_1.addElementParser(_34);
return true;
- }
- break;
- case 5:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
- __state = 5;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 6;
org.apache.ws.jaxme.JMManager _35 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
java.lang.Object _36 = _35.getElementS();
org.apache.ws.jaxme.impl.JMSAXElementParser _37 = _35.getHandler();
@@ -142,6 +143,18 @@
return true;
}
break;
+ case 6:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 6;
+ org.apache.ws.jaxme.JMManager _38 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class);
+ java.lang.Object _39 = _38.getElementS();
+ org.apache.ws.jaxme.impl.JMSAXElementParser _40 = _38.getHandler();
+ _40.init(_1, _39,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _40.setAttributes(pAttr);
+ _1.addElementParser(_40);
+ return true;
+ }
+ break;
default:
throw new java.lang.IllegalStateException("Invalid state: " +
__state);
}
@@ -152,30 +165,36 @@
org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface _1 =
(org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface) result;
switch (__state) {
case 1:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "serviceInformation".equals(pLocalName)) {
+
_1.setServiceInformation(((org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation)
pResult));
+ return;
+ }
+ break;
+ case 2:
if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "credential".equals(pLocalName)) {

_1.setCredential(((org.perfsonar.webadmin.base2.waschema.v20090201.Credential)
pResult));
return;
}
break;
- case 2:
+ case 3:
if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
_1.getBasiclink().add(pResult);
return;
}
break;
- case 3:
+ case 4:
if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".equals(pLocalName)) {
_1.getAdvancedlink().add(pResult);
return;
}
break;
- case 4:
+ case 5:
if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
_1.getMap().add(pResult);
return;
}
break;
- case 5:
+ case 6:
if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
_1.getPage().add(pResult);
return;
@@ -188,7 +207,7 @@

public boolean isFinished() {
switch (__state) {
- case 5:
+ case 6:
return true;
default:
return false;

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
2009-12-29 15:14:10 UTC (rev 5436)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
2009-12-30 08:39:31 UTC (rev 5437)
@@ -1,6 +1,8 @@
package org.perfsonar.webadmin.base2.waschema.v20090201.impl;

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();
@@ -12,6 +14,14 @@
private java.util.List _page = new java.util.ArrayList();


+ public org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation
getServiceInformation() {
+ return _serviceInformation;
+ }
+
+ public void
setServiceInformation(org.perfsonar.webadmin.base2.waschema.v20090201.ServiceInformation
pServiceInformation) {
+ _serviceInformation = pServiceInformation;
+ }
+
public org.perfsonar.webadmin.base2.waschema.v20090201.Credential
getCredential() {
return _credential;
}

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-29 15:14:10 UTC (rev 5436)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
2009-12-30 08:39:31 UTC (rev 5437)
@@ -4,6 +4,11 @@
<wa:interface
xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>

+ <wa:serviceInformation>
+ <wa:serviceName>Service Name</wa:serviceName>
+ <wa:version>1.23</wa:version>
+ </wa:serviceInformation>
+
<!-- credential for WA -->
<wa:credential>
<wa:username>perfsonaruser</wa:username>

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
2009-12-29 15:14:10 UTC (rev 5436)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
2009-12-30 08:39:31 UTC (rev 5437)
@@ -1,6 +1,5 @@

<%@page

import="org.perfsonar.webadmin.base2.servlet.util.ConfigurationServletHelper"%>

<%@page
import="org.perfsonar.webadmin.base2.config.HTMLGenerator"%>
-<%@page
import="java.util.Enumeration"%>
<html>
<head>
<title>perfSONAR Service Web Administration page</title>
@@ -17,11 +16,13 @@
String[] menuAdvancedLinks=htmlGenerator.getAdvancedLinks(map,false);
String[] mainBasicLinks=htmlGenerator.getBasicLinks(map,true);
String[] mainAdvancedLinks=htmlGenerator.getAdvancedLinks(map,true);
+ String serviceName=htmlGenerator.getServiceName(map);
+ String serviceVersion=htmlGenerator.getVersion(map);
%>

<div class="adminPanel">
<div class="banner">
- <jsp:include page="parts/banner.jsp"/>
+
<%@include
file="parts/banner.jsp"%>
</div>
<div class="mainWindow">
<div class="sidebar">

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/banner.jsp
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/banner.jsp
2009-12-29 15:14:10 UTC (rev 5436)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/banner.jsp
2009-12-30 08:39:31 UTC (rev 5437)
@@ -2,13 +2,17 @@
pageEncoding="UTF-8"%>


-<table border="0" align="left" cellpadding="0" cellspacing="0">
+<table border="0" align="left" cellpadding="0" cellspacing="0"
style="width:100%">
<tr>
<td>
<a href="index.jsp" target="_self">
- <img src="graphics/perfsonar_logo.gif"
alt="perfSONAR" width="192" height="94" border="0" align="right"/>
+ <img src="graphics/perfsonar_logo.gif"
alt="perfSONAR" width="192" height="94" border="0" align="left"/>
</a>
</td>
- <td></td>
+ <td
style="text-align:right;padding-right:70px;font-weight:bold;color:#468C46">
+ <%
+ out.println(serviceName+" - "+serviceVersion);
+ %>
+ </td>
</tr>
</table>
\ No newline at end of file


  • perfsonar: r5437 - in branches/new-structure-with-base2/ps-mdm-web-admin: schema/xsd src/main/java/org/perfsonar/webadmin/base2/config src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201 src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl tomcat/classes/perfsonar/conf tomcat/html tomcat/html/parts, svnlog, 12/30/2009

Archive powered by MHonArc 2.6.16.

Top of Page