Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r5433 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant schema/xsd src/main/java/org/perfsonar/webadmin/base2 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

Subject: perfsonar development work

List archive

perfsonar: r5433 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant schema/xsd src/main/java/org/perfsonar/webadmin/base2 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


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r5433 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant schema/xsd src/main/java/org/perfsonar/webadmin/base2 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
  • Date: Tue, 29 Dec 2009 07:16:31 -0500
Author: trzaszcz
Date: 2009-12-29 07:16:31 -0500 (Tue, 29 Dec 2009)
New Revision: 5433

Added:

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

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

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

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

branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/xupdate/
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
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/config/ObjectMap.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/configls.xml

branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
Log:
credential tag

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
2009-12-29 09:45:57 UTC (rev 5432)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
2009-12-29 12:16:31 UTC (rev 5433)
@@ -5,6 +5,7 @@
libext=${basedir}/lib/libext

schema=${basedir}/schema
+xml.file=../tomcat/classes/perfsonar/conf/wa.xml

version=0.1
wa.version=20090201

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 09:45:57 UTC (rev 5432)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/schema/xsd/wa.xsd
2009-12-29 12:16:31 UTC (rev 5433)
@@ -6,10 +6,9 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";
elementFormDefault="qualified"
- attributeFormDefault="qualified"
- >
- <xs:element name="interface" type="wa:WebAdminInterface"
- minOccurs="1" maxOccurs="1"/>
+ attributeFormDefault="qualified">
+
+ <xs:element name="interface" type="wa:WebAdminInterface"/>

<xs:complexType name="BaseType">
<xs:choice>
@@ -119,10 +118,20 @@
minOccurs="1" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
+
+ <xs:complexType name="Credential">
+ <xs:sequence>
+ <xs:element name="username" type="xs:string"
minOccurs="1" maxOccurs="1"/>
+ <xs:element name="password" type="xs:string"
minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>

<!-- Root -->
<xs:complexType name="WebAdminInterface">
<xs:sequence>
+
+ <xs:element name="credential"
type="wa:Credential" minOccurs="1" maxOccurs="1"/>
+
<xs:element name="basiclink"
type="wa:LinkType"
minOccurs="1"
maxOccurs="unbounded"/>
<xs:element name="advancedlink"
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 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2009-12-29 12:16:31 UTC (rev 5433)
@@ -272,8 +272,14 @@
.first()));
int sz = nl.getLength();
String[] lst = new String[sz];
- for (int i = 0; i < sz; i++)
- lst[i] = nl.item(i).getNodeValue();
+ String value;
+ for (int i = 0; i < sz; i++){
+ value=nl.item(i).getNodeValue();
+ if(value==null){
+
value=nl.item(i).getTextContent();
+ }
+ lst[i] = value;
+ }
return new Tuple<Integer,
String[]>(omap.registerObject(nl),
lst);
} catch (Exception e) {

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
2009-12-29 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
2009-12-29 12:16:31 UTC (rev 5433)
@@ -25,7 +25,6 @@
*
* wrapper for Hashtable
*
- * @author czacha
*
*/
@SuppressWarnings("serial")

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 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/Configuration.xml
2009-12-29 12:16:31 UTC (rev 5433)
@@ -1,77 +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.webadmin.base2.waschema.v20090201.impl.BaseTypeDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.BaseUIType"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.BaseUITypeDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexUIType"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexUITypeDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.ComplexGroupUIType"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.ComplexGroupUITypeDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PlainType"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PlainTypeDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.GroupType"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupTypeDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.GroupsType"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.GroupsTypeDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.PageType"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.PageTypeDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.NsMap"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.NsMapDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.LinkType"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.LinkTypeDriver"
/>
- <Manager
-
validatorClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceValidator"
-
handlerClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceHandler"
-
elementInterface="org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface"
-
elementClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceImpl"
-
driverClass="org.perfsonar.webadmin.base2.waschema.v20090201.impl.WebAdminInterfaceDriver"
/>
-</Configuration>
\ No newline at end of file
+<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

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

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 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/ObjectFactory.java
2009-12-29 12:16:31 UTC (rev 5433)
@@ -72,6 +72,10 @@
return (org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)
newInstance(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class);
}

+ public org.perfsonar.webadmin.base2.waschema.v20090201.Credential
createCredential() throws javax.xml.bind.JAXBException {
+ return (org.perfsonar.webadmin.base2.waschema.v20090201.Credential)
newInstance(org.perfsonar.webadmin.base2.waschema.v20090201.Credential.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");
}

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 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/WebAdminInterface.java
2009-12-29 12:16:31 UTC (rev 5433)
@@ -10,6 +10,10 @@



+ public org.perfsonar.webadmin.base2.waschema.v20090201.Credential
getCredential();
+
+ public void
setCredential(org.perfsonar.webadmin.base2.waschema.v20090201.Credential
pCredential);
+
public java.util.List getBasiclink();

public java.util.List getAdvancedlink();

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

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

Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/CredentialImpl.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 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceDriver.java
2009-12-29 12:16:31 UTC (rev 5433)
@@ -18,26 +18,31 @@

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;
- java.util.List _2 = _1.getBasiclink();
- 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.LinkType.class).getDriver();
- pController.marshal(_4,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "basiclink",
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)_2.get(_3));
+ org.perfsonar.webadmin.base2.waschema.v20090201.Credential _2 =
_1.getCredential();
+ 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());
}
- java.util.List _5 = _1.getAdvancedlink();
- for (int _6 = 0; _6 < (_5).size(); _6++) {
- org.apache.ws.jaxme.impl.JMSAXDriver _7 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.class).getDriver();
- pController.marshal(_7,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "advancedlink",
(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType)_5.get(_6));
+ 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));
}
- java.util.List _8 = _1.getMap();
- 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.NsMap.class).getDriver();
- pController.marshal(_10,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "map",
(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap)_8.get(_9));
+ 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 _11 = _1.getPage();
- for (int _12 = 0; _12 < (_11).size(); _12++) {
- org.apache.ws.jaxme.impl.JMSAXDriver _13 =
pController.getJMMarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.class).getDriver();
- pController.marshal(_13,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
(org.perfsonar.webadmin.base2.waschema.v20090201.PageType)_11.get(_12));
+ 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 _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));
+ }
}

}

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 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceHandler.java
2009-12-29 12:16:31 UTC (rev 5433)
@@ -1,329 +1,198 @@
package org.perfsonar.webadmin.base2.waschema.v20090201.impl;

-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}basiclink
2 =
- * While or after parsing the child element
- *
{http://webadmin.perfsonar.org/base2/waschema/v20090201}advancedlink 3 =
- * While or after parsing the child element
- * {http://webadmin.perfsonar.org/base2/waschema/v20090201}map 4 =
While or
- * after parsing the child element
- * {http://webadmin.perfsonar.org/base2/waschema/v20090201}page
- *
- */
- private int __state;
+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
+ *
+ */
+ private int __state;

- 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();
- switch (__state) {
- case 0:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "basiclink".equals(pLocalName)) {
- __state = 1;
- org.apache.ws.jaxme.JMManager _2 =
getHandler()
- .getJMUnmarshaller()
- .getJAXBContextImpl()
- .getManagerS(
-
org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.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";,
- "basiclink",
_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)) {
- __state = 1;
- org.apache.ws.jaxme.JMManager _5 =
getHandler()
- .getJMUnmarshaller()
- .getJAXBContextImpl()
- .getManagerS(
-
org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.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.setAttributes(pAttr);
- _1.addElementParser(_7);
- return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "advancedlink".equals(pLocalName))
{
- __state = 2;
- 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();
- _10
- .init(
- _1,
- _9,
-
"http://webadmin.perfsonar.org/base2/waschema/v20090201";,
-
"advancedlink", _1.getLevel());
- _10.setAttributes(pAttr);
- _1.addElementParser(_10);
- return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "map".equals(pLocalName)) {
- __state = 3;
- org.apache.ws.jaxme.JMManager _11 =
getHandler()
- .getJMUnmarshaller()
- .getJAXBContextImpl()
- .getManagerS(
-
org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.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";,
- "map",
_1.getLevel());
- _13.setAttributes(pAttr);
- _1.addElementParser(_13);
- return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "page".equals(pLocalName)) {
- __state = 4;
- org.apache.ws.jaxme.JMManager _14 =
getHandler()
- .getJMUnmarshaller()
- .getJAXBContextImpl()
- .getManagerS(
-
org.perfsonar.webadmin.base2.waschema.v20090201.PageType.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";,
- "page",
_1.getLevel());
- _16.setAttributes(pAttr);
- _1.addElementParser(_16);
- return true;
- }
- break;
- case 2:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "advancedlink".equals(pLocalName))
{
- __state = 2;
- org.apache.ws.jaxme.JMManager _17 =
getHandler()
- .getJMUnmarshaller()
- .getJAXBContextImpl()
- .getManagerS(
-
org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.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";,
-
"advancedlink", _1.getLevel());
- _19.setAttributes(pAttr);
- _1.addElementParser(_19);
- return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "map".equals(pLocalName)) {
- __state = 3;
- org.apache.ws.jaxme.JMManager _20 =
getHandler()
- .getJMUnmarshaller()
- .getJAXBContextImpl()
- .getManagerS(
-
org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.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";,
- "map",
_1.getLevel());
- _22.setAttributes(pAttr);
- _1.addElementParser(_22);
- return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "page".equals(pLocalName)) {
- __state = 4;
- org.apache.ws.jaxme.JMManager _23 =
getHandler()
- .getJMUnmarshaller()
- .getJAXBContextImpl()
- .getManagerS(
-
org.perfsonar.webadmin.base2.waschema.v20090201.PageType.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";,
- "page",
_1.getLevel());
- _25.setAttributes(pAttr);
- _1.addElementParser(_25);
- return true;
- }
- break;
- case 3:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "map".equals(pLocalName)) {
- __state = 3;
- 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";,
- "map",
_1.getLevel());
- _28.setAttributes(pAttr);
- _1.addElementParser(_28);
- return true;
- } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "page".equals(pLocalName)) {
- __state = 4;
- 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";,
- "page",
_1.getLevel());
- _31.setAttributes(pAttr);
- _1.addElementParser(_31);
- return true;
- }
- break;
- case 4:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "page".equals(pLocalName)) {
- __state = 4;
- org.apache.ws.jaxme.JMManager _32 =
getHandler()
- .getJMUnmarshaller()
- .getJAXBContextImpl()
- .getManagerS(
-
org.perfsonar.webadmin.base2.waschema.v20090201.PageType.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.setAttributes(pAttr);
- _1.addElementParser(_34);
- return true;
- }
- break;
- default:
- throw new java.lang.IllegalStateException("Invalid
state: "
- + __state);
- }
- 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.WebAdminInterface _1 =
(org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface) result;
- switch (__state) {
- case 1:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "basiclink".equals(pLocalName)) {
- _1.getBasiclink().add(pResult);
- return;
- }
- break;
- case 2:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "advancedlink".equals(pLocalName))
{
- _1.getAdvancedlink().add(pResult);
- return;
- }
- break;
- case 3:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "map".equals(pLocalName)) {
- _1.getMap().add(pResult);
- return;
- }
- break;
- case 4:
- if
("http://webadmin.perfsonar.org/base2/waschema/v20090201";
- .equals(pNamespaceURI)
- && "page".equals(pLocalName)) {
- _1.getPage().add(pResult);
- return;
- }
- break;
- default:
- throw new java.lang.IllegalStateException("Illegal
state: "
- + __state);
- }
- }
+ 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();
+ switch (__state) {
+ case 0:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "credential".equals(pLocalName)) {
+ __state = 1;
+ org.apache.ws.jaxme.JMManager _2 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.Credential.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.setAttributes(pAttr);
+ _1.addElementParser(_4);
+ return true;
+ }
+ break;
+ case 1:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
+ __state = 2;
+ org.apache.ws.jaxme.JMManager _5 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.LinkType.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.setAttributes(pAttr);
+ _1.addElementParser(_7);
+ return true;
+ }
+ break;
+ case 2:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
+ __state = 2;
+ 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();
+ _10.init(_1, _9,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "basiclink",
_1.getLevel());
+ _10.setAttributes(pAttr);
+ _1.addElementParser(_10);
+ return true;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".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.setAttributes(pAttr);
+ _1.addElementParser(_13);
+ return true;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
+ __state = 4;
+ org.apache.ws.jaxme.JMManager _14 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.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.setAttributes(pAttr);
+ _1.addElementParser(_16);
+ return true;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 5;
+ org.apache.ws.jaxme.JMManager _17 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.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.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);
+ 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.setAttributes(pAttr);
+ _1.addElementParser(_22);
+ return true;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
+ __state = 4;
+ org.apache.ws.jaxme.JMManager _23 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.NsMap.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.setAttributes(pAttr);
+ _1.addElementParser(_25);
+ return true;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 5;
+ org.apache.ws.jaxme.JMManager _26 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.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.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);
+ 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.setAttributes(pAttr);
+ _1.addElementParser(_31);
+ return true;
+ } else if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ __state = 5;
+ org.apache.ws.jaxme.JMManager _32 =
getHandler().getJMUnmarshaller().getJAXBContextImpl().getManagerS(org.perfsonar.webadmin.base2.waschema.v20090201.PageType.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.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;
+ 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();
+ _37.init(_1, _36,
"http://webadmin.perfsonar.org/base2/waschema/v20090201";, "page",
_1.getLevel());
+ _37.setAttributes(pAttr);
+ _1.addElementParser(_37);
+ return true;
+ }
+ break;
+ default:
+ throw new java.lang.IllegalStateException("Invalid state: " +
__state);
+ }
+ return false;
+ }

- public boolean isFinished() {
- switch (__state) {
- case 4:
- return true;
- default:
- 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.WebAdminInterface _1 =
(org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface) result;
+ switch (__state) {
+ case 1:
+ 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:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "basiclink".equals(pLocalName)) {
+ _1.getBasiclink().add(pResult);
+ return;
+ }
+ break;
+ case 3:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "advancedlink".equals(pLocalName)) {
+ _1.getAdvancedlink().add(pResult);
+ return;
+ }
+ break;
+ case 4:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "map".equals(pLocalName)) {
+ _1.getMap().add(pResult);
+ return;
+ }
+ break;
+ case 5:
+ if
("http://webadmin.perfsonar.org/base2/waschema/v20090201".equals(pNamespaceURI)
&& "page".equals(pLocalName)) {
+ _1.getPage().add(pResult);
+ return;
+ }
+ break;
+ default:
+ throw new java.lang.IllegalStateException("Illegal state: " +
__state);
+ }
+ }

+ public boolean isFinished() {
+ switch (__state) {
+ case 5:
+ 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 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/waschema/v20090201/impl/WebAdminInterfaceImpl.java
2009-12-29 12:16:31 UTC (rev 5433)
@@ -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.Credential
_credential;
+
private java.util.List _basiclink = new java.util.ArrayList();

private java.util.List _advancedlink = new java.util.ArrayList();
@@ -10,6 +12,14 @@
private java.util.List _page = new java.util.ArrayList();


+ public org.perfsonar.webadmin.base2.waschema.v20090201.Credential
getCredential() {
+ return _credential;
+ }
+
+ public void
setCredential(org.perfsonar.webadmin.base2.waschema.v20090201.Credential
pCredential) {
+ _credential = pCredential;
+ }
+
public java.util.List getBasiclink() {
return _basiclink;
}

Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/configls.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/configls.xml
2009-12-29 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/configls.xml
2009-12-29 12:16:31 UTC (rev 5433)
@@ -4,8 +4,9 @@


<service name="SimpleService">
+
+ <a>aaa</a>

-
<!--
....................................................................................
-->

<!-- Lookup Info of the LS instance -->

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 09:45:57 UTC (rev 5432)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/perfsonar/conf/wa.xml
2009-12-29 12:16:31 UTC (rev 5433)
@@ -4,14 +4,19 @@
<wa:interface
xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>

+ <wa:credential>
+ <wa:username>aaaa</wa:username>
+ <wa:password>aaaa</wa:password>
+ </wa:credential>
+
<wa:basiclink>
<wa:url>basic</wa:url> <!-- page identifier -->
- <wa:title>Service Settings</wa:title>
+ <wa:title>Service settings</wa:title>
</wa:basiclink>

<wa:basiclink>
- <wa:url>url</wa:url> <!-- page identifier -->
- <wa:title>xxxxx</wa:title>
+ <wa:url>changePassword</wa:url> <!-- page identifier -->
+ <wa:title>Change WA password</wa:title>
</wa:basiclink>

<wa:advancedlink>
@@ -24,17 +29,22 @@
<wa:ns>ns1</wa:ns>
</wa:map>

+ <wa:map>
+
<wa:url>http://webadmin.perfsonar.org/base2/waschema/v20090201</wa:url>
+ <wa:ns>webAdmin</wa:ns>
+ </wa:map>
+
<wa:page>
- <wa:url><wa:text>url</wa:text></wa:url>
- <wa:title><wa:text>Title of this page</wa:text></wa:title>
+ <wa:url><wa:text>changePassword</wa:text></wa:url>
+ <wa:title><wa:text>Change Password</wa:text></wa:title>
<wa:plain>
<wa:textbox>
<wa:default>
<wa:xpath>
-
doc("classes/perfsonar/conf/configls.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+
doc("classes/perfsonar/conf/configls.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:a
</wa:xpath>
</wa:default>
- <wa:title><wa:text>Default
title</wa:text></wa:title>
+
<wa:title><wa:text>password</wa:text></wa:title>
</wa:textbox>
</wa:plain>
</wa:page>


  • perfsonar: r5433 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant schema/xsd src/main/java/org/perfsonar/webadmin/base2 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, svnlog, 12/29/2009

Archive powered by MHonArc 2.6.16.

Top of Page