perfsonar development work

Author: dante.delvaux
Date: 2013-03-20 19:57:06 +0000 (Wed, 20 Mar 2013)
New Revision: 6226

Added:
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration.xml
   trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/doc/
   
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/doc/README.txt
Removed:
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml
Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/webAdminConfig.xml
   trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
   
trunk/perfsonar-java-rrd-ma-SQL_backend/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
   
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/webAdminConfig.xml
Log:
RRD MA with SQL backend: integrating webadmin
WebAdmin: adding integration instructions

Deleted: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml   
2013-03-19 21:29:00 UTC (rev 6225)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml   
2013-03-20 19:57:06 UTC (rev 6226)
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- $Id: configuration-ma.xml 4915M 
2010-03-18 12:05:18Z (local) $ --><configuration 
xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
-
-
-  <service name="PerfsonarService">
-
-
-    <!-- 
....................................................................................
 -->
-
-    <!-- Lookup Info of the LS instance -->
-
-    <lookupInformation>
-
-      <option name="accessPoint" 
value="http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService"/>
-        <!-- If you have a production service in the GEANT domain, you might 
want to use the following address for registration -->
-        <!-- 
http://ls.geant.net:8080/perfsonar-java-xml-ls/services/LookupService -->
-      <option name="serviceName" value="perfsonar-java-rrd-ma"/>
-      <option name="serviceType" value="RRD_MA"/>
-
-    </lookupInformation>
-
-    <!-- 
....................................................................................
 -->
-
-    <!-- Message Handlers - message types and service engines -->
-
-    <messageHandler>
-
-      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="EchoRequest">
-        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine"/>
-        <option name="authN" value="no"/>
-      </message>
-
-      <message 
handler="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyMessageHandler"
 type="MetadataKeyRequest">
-        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyServiceEngine"/>
-        <option name="authN" value="no"/>
-      </message>
-
-      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="SetupDataRequest">
-        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.SetupDataServiceEngine"/>
-        <option name="authN" value="no"/>
-      </message>
-
-    </messageHandler>
-
-    <!-- 
....................................................................................
 -->
-
-    <!-- Additional auxiliary components -->
-
-    <auxiliaryComponents>
-
-      <component 
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent" 
name="exist">
-        <option name="dataStorageClassName" 
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
-        <option name="uri" 
value="http://localhost:8080/exist/rest/db/rrdmaconfig"/>
-        <option name="username" value="rrdmaservice"/>
-        <option name="password" value="rrdmaservice"/>
-      </component>
-
-      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager"
 name="queryGeneratorManager">
-
-        <option name="http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.UtilizationQueryGenerator"/>
-
-        <option name="http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.ErrorsQueryGenerator"/>
-
-        <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
-
-        <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
-
-        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
-
-        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
-
-        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
-
-      </component>
-
-      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.ExistMetadataStorageDAOImpl"
 name="metadataStorageDAO">
-        <option name="exist-config" value="exist"/> <!-- reference to eXist 
DB XML component config-->
-        <option name="queryGeneratorManager-config" 
value="queryGeneratorManager"/> <!-- reference to queryGeneratorManager 
component config-->
-      </component>
-
-      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
 name="dataStorageDAO">
-        <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
-       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
-       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
-      </component>
-
-      <component name="migrator" 
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
-       <option name ="config-directory" 
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>
      
-      </component>
-      
-      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
 name="metadataStorageDAO2">
-        <option name="uri" value="jdbc:mysql://localhost:3306/"/>
-        <option name="schema" value ="perfsonar_rrdma"/>
-        <option name="username" value="perfsonar_rrdma"/>
-        <option name="password" value="testpass"/>
-      </component>
-
-      <!-- Scheduler -->
-      <component 
className="org.perfsonar.base2.service.scheduler.SchedulingComponent" 
name="scheduling">
-
-        <option name="schedulerClassName" 
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
-        <option name="interval" value="1800"/> <!-- sec -->
-
-        <actions>
-
-            <action 
className="org.perfsonar.base2.service.registration.LSRegistrationAction" 
name="registration">
-
-                <option name="status" value="on"/>
-                <option name="interval" value="3500"/> <!-- sec -->
-               <option name="registerDataSource" 
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>
                
-               <option name="registerEventType" 
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
-                <option name="registrator" 
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
-                <option name="lsAddress-1" 
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
-                <!--
-                <option name ="lsAddress-2"></option>
-                <option name ="lsAddress-3"></option>
-                <option name ="lsAddress-4"></option>
-                <option name ="lsAddress-5"></option>
-                -->
-               
-            </action>
-
-        </actions>
-      </component> 
-
-
-      <!-- auth configuration -->
-      <component 
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
 name="auth">
-               <option name="as_endpoint" 
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
-               <option name="comp_id" value="urn:compId"/>
-      </component>
-
-    </auxiliaryComponents>
-
-
-
-    <extension name="registerExtension-registerDataSource">
-        <option name="exist-config" value="exist"/>
-    </extension>
-
-
-
-    <!-- 
....................................................................................
 -->
-
-
-    <!-- Protocol mappings, XML elements and their bingings -->
-
-    <protocolMappings>
-
-      <!-- default mapping -->
-      <element mapping="org.perfsonar.base2.xml.Element" name="*"/>
-
-      <!-- general mappings -->
-      <element mapping="org.perfsonar.base2.xml.nmwg.Message" 
name="{http://ggf.org/ns/nmwg/base/2.0/}message"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Metadata" 
name="{http://ggf.org/ns/nmwg/base/2.0/}metadata"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.EventType" 
name="{http://ggf.org/ns/nmwg/base/2.0/}eventType"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Data" 
name="{http://ggf.org/ns/nmwg/base/2.0/}data"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameters"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Parameter" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameter"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Key" 
name="{http://ggf.org/ns/nmwg/base/2.0/}key"/>
-
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/base/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"/>
-      <element mapping="org.perfsonar.base2.xml.Element" 
name="{http://ggf.org/ns/nmwg/time/2.0/}time"/>
-
-    </protocolMappings>
-
-    <!-- 
....................................................................................
 -->
-
-
-  </service>
-
-
-</configuration>

Copied: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration.xml (from 
rev 6210, trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml)
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration.xml            
                  (rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration.xml      
2013-03-20 19:57:06 UTC (rev 6226)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- $Id: configuration-ma.xml 4915M 
2010-03-18 12:05:18Z (local) $ --><configuration 
xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
+
+
+  <service name="PerfsonarService">
+
+
+    <!-- 
....................................................................................
 -->
+
+    <!-- Lookup Info of the LS instance -->
+
+    <lookupInformation>
+
+      <option name="accessPoint" 
value="http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService"/>
+        <!-- If you have a production service in the GEANT domain, you might 
want to use the following address for registration -->
+        <!-- 
http://ls.geant.net:8080/perfsonar-java-xml-ls/services/LookupService -->
+      <option name="serviceName" value="perfsonar-java-rrd-ma"/>
+      <option name="serviceType" value="RRD_MA"/>
+
+    </lookupInformation>
+
+    <!-- 
....................................................................................
 -->
+
+    <!-- Message Handlers - message types and service engines -->
+
+    <messageHandler>
+
+      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="EchoRequest">
+        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine"/>
+        <option name="authN" value="no"/>
+      </message>
+
+      <message 
handler="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyMessageHandler"
 type="MetadataKeyRequest">
+        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyServiceEngine"/>
+        <option name="authN" value="no"/>
+      </message>
+
+      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="SetupDataRequest">
+        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.SetupDataServiceEngine"/>
+        <option name="authN" value="no"/>
+      </message>
+
+    </messageHandler>
+
+    <!-- 
....................................................................................
 -->
+
+    <!-- Additional auxiliary components -->
+
+    <auxiliaryComponents>
+
+      <component 
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent" 
name="exist">
+        <option name="dataStorageClassName" 
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
+        <option name="uri" 
value="http://localhost:8080/exist/rest/db/rrdmaconfig"/>
+        <option name="username" value="rrdmaservice"/>
+        <option name="password" value="rrdmaservice"/>
+      </component>
+
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager"
 name="queryGeneratorManager">
+
+        <option name="http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.UtilizationQueryGenerator"/>
+
+        <option name="http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.ErrorsQueryGenerator"/>
+
+        <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
+
+        <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
+
+      </component>
+
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.ExistMetadataStorageDAOImpl"
 name="metadataStorageDAO">
+        <option name="exist-config" value="exist"/> <!-- reference to eXist 
DB XML component config-->
+        <option name="queryGeneratorManager-config" 
value="queryGeneratorManager"/> <!-- reference to queryGeneratorManager 
component config-->
+      </component>
+
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
 name="dataStorageDAO">
+        <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
+       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+      </component>
+
+      <component name="migrator" 
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
+       <option name ="config-directory" 
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>
      
+      </component>
+      
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
 name="metadataStorageDAO2">
+        <option name="uri" value="jdbc:mysql://localhost:3306/"/>
+        <option name="schema" value ="perfsonar_rrdma"/>
+        <option name="username" value="perfsonar_rrdma"/>
+        <option name="password" value="testpass"/>
+      </component>
+
+      <!-- Scheduler -->
+      <component 
className="org.perfsonar.base2.service.scheduler.SchedulingComponent" 
name="scheduling">
+
+        <option name="schedulerClassName" 
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
+        <option name="interval" value="1800"/> <!-- sec -->
+
+        <actions>
+
+            <action 
className="org.perfsonar.base2.service.registration.LSRegistrationAction" 
name="registration">
+
+                <option name="status" value="on"/>
+                <option name="interval" value="3500"/> <!-- sec -->
+               <option name="registerDataSource" 
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>
                
+               <option name="registerEventType" 
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+                <option name="registrator" 
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+                <option name="lsAddress-1" 
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
+                <!--
+                <option name ="lsAddress-2"></option>
+                <option name ="lsAddress-3"></option>
+                <option name ="lsAddress-4"></option>
+                <option name ="lsAddress-5"></option>
+                -->
+               
+            </action>
+
+        </actions>
+      </component> 
+
+
+      <!-- auth configuration -->
+      <component 
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
 name="auth">
+               <option name="as_endpoint" 
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+               <option name="comp_id" value="urn:compId"/>
+      </component>
+
+    </auxiliaryComponents>
+
+
+
+    <extension name="registerExtension-registerDataSource">
+        <option name="exist-config" value="exist"/>
+    </extension>
+
+
+
+    <!-- 
....................................................................................
 -->
+
+
+    <!-- Protocol mappings, XML elements and their bingings -->
+
+    <protocolMappings>
+
+      <!-- default mapping -->
+      <element mapping="org.perfsonar.base2.xml.Element" name="*"/>
+
+      <!-- general mappings -->
+      <element mapping="org.perfsonar.base2.xml.nmwg.Message" 
name="{http://ggf.org/ns/nmwg/base/2.0/}message"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Metadata" 
name="{http://ggf.org/ns/nmwg/base/2.0/}metadata"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.EventType" 
name="{http://ggf.org/ns/nmwg/base/2.0/}eventType"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Data" 
name="{http://ggf.org/ns/nmwg/base/2.0/}data"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameters"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Parameter" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameter"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Key" 
name="{http://ggf.org/ns/nmwg/base/2.0/}key"/>
+
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/base/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"/>
+      <element mapping="org.perfsonar.base2.xml.Element" 
name="{http://ggf.org/ns/nmwg/time/2.0/}time"/>
+
+    </protocolMappings>
+
+    <!-- 
....................................................................................
 -->
+
+
+  </service>
+
+
+</configuration>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/webAdminConfig.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/webAdminConfig.xml     
2013-03-19 21:29:00 UTC (rev 6225)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/webAdminConfig.xml     
2013-03-20 19:57:06 UTC (rev 6226)
@@ -1,30 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<wa:interface
-       xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>
+<wa:WebAdminInterface 
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>
        
-       <!-- service information cosists of name nad version (only for 
displaying purpose) and accessPoint - selfTest -->
+       <!-- service information consists of name, version (only for 
displaying purpose) and accessPoint -->
        <wa:serviceInformation>
                
<wa:accessPoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
                <wa:serviceName>perfSONAR RRD MA</wa:serviceName>
-               <wa:version>3.4-1</wa:version>
+               <wa:version>to be filled in auto?</wa:version>
        </wa:serviceInformation>
        
        <!-- credential for WA -->
        <wa:credential>
-               <wa:username></wa:username>
-               <wa:password></wa:password>
+               <wa:username>perfsonaruser</wa:username>
+               <wa:password>perfsonarpass</wa:password>
        </wa:credential>
        
        <wa:basiclink>
                <wa:pageId>basic</wa:pageId> <!-- page identifier -->
-               <wa:title>Service settings</wa:title>
+               <wa:title>Service Settings</wa:title>
        </wa:basiclink>
        
        <wa:basiclink>
                <wa:pageId>changePassword</wa:pageId> <!-- page identifier -->
-               <wa:title>Change WA password</wa:title>
+               <wa:title>WebAdmin Settings</wa:title>
        </wa:basiclink>
 
        <wa:advancedlink>
@@ -32,309 +29,143 @@
                <wa:title>Advanced Service Settings</wa:title>
        </wa:advancedlink>
        
-<!--   <wa:advancedlink>
-               <wa:redirectTo>http://localhost:8180/exist</wa:redirectTo>
-               <wa:title>Exist configuration</wa:title>
-       </wa:advancedlink>-->
-
        <wa:map>
                
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
                <wa:ns>ns1</wa:ns>
        </wa:map>
        
        <wa:map>
-               
<wa:url>http://webadmin.perfsonar.org/base2/waschema/v20090201</wa:url>
+               
<wa:url>http://webadmin.perfsonar.org/waschema/v20130205</wa:url>
                <wa:ns>webAdmin</wa:ns>
        </wa:map>
        
        <wa:page>
                <wa:pageId><wa:text>changePassword</wa:text></wa:pageId>
                <wa:title><wa:text>Change Password</wa:text></wa:title>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:interface/webAdmin:credential/webAdmin:username
-                                       </wa:xpath>
-                               </wa:default>
-                               
<wa:title><wa:text>username</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:password>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:interface/webAdmin:credential/webAdmin:password
-                                       </wa:xpath>
-                               </wa:default>
-                               
<wa:title><wa:text>password</wa:text></wa:title>
-                       </wa:password>
-               </wa:plain>
+        <wa:plain><wa:textbox>
+            <wa:title><wa:text>Username</wa:text></wa:title>
+            <wa:default><wa:xpath>
+                
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:username
+            </wa:xpath></wa:default>
+        </wa:textbox></wa:plain>
+        <wa:plain><wa:password>
+            <wa:title><wa:text>Password</wa:text></wa:title>
+            <wa:default><wa:xpath>
+                
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:password
+            </wa:xpath></wa:default>
+        </wa:password></wa:plain>       
        </wa:page>
 
        <wa:page>
                <wa:pageId><wa:text>basic</wa:text></wa:pageId>
                <wa:title><wa:text>Basic configuration</wa:text></wa:title>
 
-<!--Basic service config -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Access 
point</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Service 
name</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Service 
type</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
+        <!-- General service configuration -->
+        <wa:plain><wa:textbox>
+            <wa:title><wa:text>Access point</wa:text></wa:title>
+            <wa:default><wa:xpath>
+                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+            </wa:xpath></wa:default>
+        </wa:textbox></wa:plain>
+        <wa:plain><wa:textbox>
+            <wa:title><wa:text>Service name</wa:text></wa:title>
+            <wa:default><wa:xpath>
+                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+            </wa:xpath></wa:default>
+        </wa:textbox></wa:plain>
+        <wa:plain><wa:textbox>
+            <wa:title><wa:text>Service type</wa:text></wa:title>
+            <wa:default><wa:xpath>
+                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
+            </wa:xpath></wa:default>
+        </wa:textbox></wa:plain>
 
-<!--eXist config -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="uri"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>MySQL 
address</wa:text></wa:title>
+        <!-- MySQL configuration -->
+               <wa:plain><wa:textbox>
+            <wa:title><wa:text>MySQL server address</wa:text></wa:title>
+                       <wa:default><wa:xpath>
+                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="uri"]/@value
+                       </wa:xpath></wa:default>
                        </wa:textbox>
                </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="username"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>MySQL 
username</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="password"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>MySQL 
password</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
+        <wa:plain><wa:textbox>
+            <wa:title><wa:text>MySQL username</wa:text></wa:title>
+            <wa:default><wa:xpath>
+                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="username"]/@value
+            </wa:xpath></wa:default>
+            </wa:textbox>
+        </wa:plain>
+        <wa:plain><wa:textbox>
+            <wa:title><wa:text>MySQL password</wa:text></wa:title>
+            <wa:default><wa:xpath>
+                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="password"]/@value
+            </wa:xpath></wa:default>
+            </wa:textbox>
+        </wa:plain>
+        <wa:plain><wa:textbox>
+            <wa:title><wa:text>MySQL schema name</wa:text></wa:title>
+            <wa:default><wa:xpath>
+                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="schema"]/@value
+            </wa:xpath></wa:default>
+            </wa:textbox>
+        </wa:plain>
 
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="schema"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>MySQL schema 
name</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-
-
-<!--LS config  -->
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service 
registration: </wa:text></wa:title>
-                               
<wa:values><wa:text>on,off</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service ulr 
adress</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-       <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service 
registration interval in seconds</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
+        <!--LS configuration  -->
+               <wa:plain><wa:radio>
+            <wa:title><wa:text>Lookup Service registration: 
</wa:text></wa:title>
+                       <wa:default>
+                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
+                       </wa:default>
+                       <wa:values><wa:text>on,off</wa:text></wa:values>
+               </wa:radio></wa:plain>
+               <wa:plain><wa:textbox>
+            <wa:title><wa:text>Lookup Service URL</wa:text></wa:title>
+                       <wa:default><wa:xpath>
+                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
+                       </wa:xpath></wa:default>
+               </wa:textbox></wa:plain>
+        <wa:plain><wa:textbox>
+            <wa:title><wa:text>Lookup Service registration interval 
(seconds)</wa:text></wa:title>
+            <wa:default><wa:xpath>
+                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
+            </wa:xpath></wa:default>
+        </wa:textbox></wa:plain>
        </wa:page>      
+
        <wa:page>
                <wa:pageId><wa:text>advanced</wa:text></wa:pageId>
                <wa:title><wa:text>Advanced configuration</wa:text></wa:title>
-<!--Basic service config -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Access 
point</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Service 
name</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Service 
type</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
 
-<!--mysql config -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="uri"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>MySQL 
address</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="username"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>MySQL 
username</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="password"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>MySQL 
password</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="schema"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>MySQL schema 
name</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>     
-<!--LS config  -->
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service 
registration: </wa:text></wa:title>
-                               
<wa:values><wa:text>on,off</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service ulr 
adress</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service 
registration interval in seconds</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-
  <!-- auth configuration -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="auth"]/ns1:option[@name="as_endpoint"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Authorization endpoint 
url: </wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
+               <wa:plain><wa:textbox>
+            <wa:title><wa:text>Authorization endpoint 
URL</wa:text></wa:title>
+                       <wa:default><wa:xpath>
+                           
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="auth"]/ns1:option[@name="as_endpoint"]/@value
+                       </wa:xpath></wa:default>
+               </wa:textbox></wa:plain>
 <!-- authorization of requests -->
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Echo Request 
authorization</wa:text></wa:title>
-                               
<wa:values><wa:text>no,yes</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
+               <wa:plain><wa:radio>
+            <wa:title><wa:text>Echo Request 
authorization</wa:text></wa:title>
+                       <wa:default><wa:xpath>
+                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value
+                       </wa:xpath></wa:default>
+                       <wa:values><wa:text>no,yes</wa:text></wa:values>
+               </wa:radio></wa:plain>
 
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="MetadataKeyRequest"]/ns1:option[@name="authN"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Metadata Key Request 
authorization</wa:text></wa:title>
-                               
<wa:values><wa:text>no,yes</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
+               <wa:plain><wa:radio>
+            <wa:title><wa:text>Metadata Key Request 
authorization</wa:text></wa:title>
+                       <wa:default><wa:xpath>
+                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="MetadataKeyRequest"]/ns1:option[@name="authN"]/@value
+                       </wa:xpath></wa:default>
+                       <wa:values><wa:text>no,yes</wa:text></wa:values>
+               </wa:radio></wa:plain>
 
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="SetupDataRequest"]/ns1:option[@name="authN"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Setup Data Request 
authorization</wa:text></wa:title>
-                               
<wa:values><wa:text>no,yes</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
+               <wa:plain><wa:radio>
+            <wa:title><wa:text>Setup Data Request 
authorization</wa:text></wa:title>
+                       <wa:default><wa:xpath>
+                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="SetupDataRequest"]/ns1:option[@name="authN"]/@value
+                       </wa:xpath></wa:default>
+                       <wa:values><wa:text>no,yes</wa:text></wa:values>
+               </wa:radio></wa:plain>
        </wa:page>
-</wa:interface>
+</wa:WebAdminInterface>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-03-19 21:29:00 
UTC (rev 6225)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-03-20 19:57:06 
UTC (rev 6226)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>net.geant.perfsonar</groupId>
         <artifactId>parent</artifactId>
@@ -10,31 +9,25 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>perfsonar-java-rrd-ma</artifactId>
-    <packaging>war</packaging>
     <version>3.4.2-SNAPSHOT</version>
-
     <name>perfSONAR RRD MA</name>
     <description>perfSONAR Round Robin Database Measurement Archive with SQL 
backend</description>
-    <inceptionYear>2009</inceptionYear>
+    <packaging>war</packaging>
 
     <properties>
-        <configurationFile>configuration-ma.xml</configurationFile>
+        <configurationFile>configuration.xml</configurationFile>
         <axis2Id>axis2-1.4.1</axis2Id>
         <aar.name>${project.artifactId}</aar.name>
         <version.nmwg-sql-converter>1.0.1</version.nmwg-sql-converter>
-        <slf4j.version>1.6.6</slf4j.version>
-        <installName>perfsonar-java-rrd-ma</installName>
+        <installName>${project.artifactId}</installName>
         <installPath>/usr/lib/perfsonar/services/${installName}</installPath>
     </properties>
 
-    <scm>
-        
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-java-rrd-ma-SQL_backend/</connection>
-        
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk/perfsonar-java-ma-SQL_backend</developerConnection>
-    </scm>
-
     <build>
+    
+        <finalName>${project.artifactId}</finalName>
+        
         <plugins>
              <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -96,6 +89,12 @@
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
+                    <overlays>
+                        <overlay>
+                            <groupId>net.geant.perfsonar</groupId>
+                            <artifactId>web-admin-component</artifactId>
+                        </overlay>
+                    </overlays>
                     <webResources>
                         <resource>
                             
<directory>${project.build.directory}/conf</directory>
@@ -191,12 +190,6 @@
 
         <dependencies>
             <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.opensaml</groupId>
                 <artifactId>xmltooling</artifactId>
                 <version>1.1.0</version>
@@ -205,7 +198,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
-                <version>${slf4j.version}</version>
+                <version>1.6.6</version>
             </dependency>
 
         </dependencies>
@@ -214,17 +207,22 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
+            <groupId>net.geant.perfsonar</groupId>
+            <artifactId>web-admin-component</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <classifier>classes</classifier>
         </dependency>
-
         <dependency>
             <groupId>net.geant.perfsonar</groupId>
+            <artifactId>web-admin-component</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>net.geant.perfsonar</groupId>
             <artifactId>perfsonar-java-base2</artifactId>
             <version>1.1.0</version>
         </dependency>
-
         <dependency>
             <groupId>net.geant.perfsonar</groupId>
             <artifactId>nmwg-sql-converter</artifactId>
@@ -233,6 +231,19 @@
         </dependency>
 
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
             <version>3.4.0</version>
@@ -296,7 +307,7 @@
                                 <configuration>
                                     
<deb>[[buildDir]]/[[installName]]_[[version]]_all.[[extension]]</deb>
                                     <timestamped>true</timestamped>
-                                    <verbose>true</verbose>
+                                    <verbose>false</verbose>
                                     <dataSet>
                                         <data>
                                             
<src>${project.build.directory}/${project.build.finalName}</src>

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
        2013-03-19 21:29:00 UTC (rev 6225)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
        2013-03-20 19:57:06 UTC (rev 6226)
@@ -13,22 +13,11 @@
     <servlet>
         <servlet-name>AxisServlet</servlet-name>
         
<servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class>
-        <!--<init-param>-->
-        <!--<param-name>axis2.xml.path</param-name>-->
-        <!--<param-value>/WEB-INF/conf/axis2.xml</param-value>-->
-        <!--<param-name>axis2.xml.url</param-name>-->
-        <!--<param-value>http://localhot/myrepo/axis2.xml</param-value>-->
-        <!--<param-name>axis2.repository.path</param-name>-->
-        <!--<param-value>/WEB-INF</param-value>-->
-        <!--<param-name>axis2.repository.url</param-name>-->
-        <!--<param-value>http://localhot/myrepo</param-value>-->
-        <!--</init-param>-->
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
         <servlet-name>AxisAdminServlet</servlet-name>
-        <servlet-class>
-            org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
+        
<servlet-class>org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>AxisServlet</servlet-name>
@@ -55,58 +44,58 @@
         <mime-type>text/plain</mime-type>
     </mime-mapping>
 
-   <!-- <welcome-file-list>
-      <welcome-file>index.jsp</welcome-file>
-      <welcome-file>index.html</welcome-file>
-      <welcome-file>/axis2-web/index.jsp</welcome-file>
-    </welcome-file-list>
+    <!-- Authentication checks are done through a filter -->
+    <filter>
+        <filter-name>authFilter</filter-name>
+        
<filter-class>org.perfsonar.webadmin.filters.AuthFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>authFilter</filter-name>
+        <url-pattern>/config</url-pattern>
+        <url-pattern>/initDb</url-pattern>
+    </filter-mapping>
 
-    <error-page>
-      <error-code>404</error-code>
-      <location>/axis2-web/Error/error404.jsp</location>
-    </error-page>
+    <!-- Login Servlet -->
+    <servlet>
+        <servlet-name>Authentification</servlet-name>
+        
<servlet-class>org.perfsonar.webadmin.servlet.LoginServlet</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Authentification</servlet-name>
+        <url-pattern>/login</url-pattern>
+    </servlet-mapping>
 
-    <error-page>
-        <error-code>500</error-code>
-        <location>/axis2-web/Error/error500.jsp</location>
-    </error-page>
--->
+    <!-- pS Config Servlet Admin -->
+    <servlet>
+        <servlet-name>BasicConfiguration</servlet-name>
+        <servlet-class>
+            org.perfsonar.webadmin.servlet.ConfigurationServlet
+        </servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>BasicConfiguration</servlet-name>
+        <url-pattern>
+            /config
+        </url-pattern>
+    </servlet-mapping>
 
-       
+    <!-- SelfTest servlet -->
+    <servlet>
+        <servlet-name>SelfTestServlet</servlet-name>
+        <servlet-class>
+            org.perfsonar.webadmin.servlet.SelfTestServlet
+        </servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>SelfTestServlet</servlet-name>
+        <url-pattern>
+            /selfTest
+        </url-pattern>
+    </servlet-mapping>
 
-       <!--  pS Config Servlet Admin  -->
-       <servlet>
-               <servlet-name>BasicConfiguration</servlet-name>
-               <servlet-class>
-                       
org.perfsonar.webadmin.base2.servlet.BasicConfigurationServlet
-       </servlet-class>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>BasicConfiguration</servlet-name>
-               <url-pattern>
-                       /config
-       </url-pattern>
-       </servlet-mapping>
-
-       <!-- SelfTest servlet -->
-       <servlet>
-               <servlet-name>SelfTestServlet</servlet-name>
-               <servlet-class>
-                       org.perfsonar.webadmin.base2.servlet.SelfTestServlet
-       </servlet-class>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>SelfTestServlet</servlet-name>
-               <url-pattern>
-                       /selfTest
-       </url-pattern>
-       </servlet-mapping>
-
+    <!-- Welcome page -->
        <welcome-file-list>
                <welcome-file>index.jsp</welcome-file>
        </welcome-file-list>
 
-
 </web-app>

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/webAdminConfig.xml
      2013-03-19 21:29:00 UTC (rev 6225)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/webAdminConfig.xml
      2013-03-20 19:57:06 UTC (rev 6226)
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <wa:WebAdminInterface 
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>
 
        <!-- service information consists of name and version (only for 
displaying purpose) and accessPoint - selfTest -->
        <wa:serviceInformation>
-               
<wa:accessPoint>http://localhost:%PORT%/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
-               <wa:serviceName>RRD MA Service</wa:serviceName>
-               <wa:version>to be filled</wa:version>
+               
<wa:accessPoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
+               <wa:serviceName>perfSONAR RRD MA</wa:serviceName>
+               <wa:version>to be filled in auto?</wa:version>
        </wa:serviceInformation>
        
        <!-- credential for WA -->
@@ -32,7 +31,7 @@
 
        <wa:advancedlink>
                <wa:pageId>advanced</wa:pageId> <!-- page identifier -->
-               <wa:title>Detailed Settings</wa:title>
+               <wa:title>Advanced Service Settings</wa:title>
        </wa:advancedlink>
        
        <wa:map>

Added: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/doc/README.txt
===================================================================
--- 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/doc/README.txt
                               (rev 0)
+++ 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/doc/README.txt
       2013-03-20 19:57:06 UTC (rev 6226)
@@ -0,0 +1,56 @@
+Integration with perfSONAR service
+==================================
+
+Integrating the perfSONAR web administration interface with a existing 
perfSONAR
+webservice is very simple.  All you have to do is:
+
+1. Add 2 dependencies to your pom.xml (adapt the version numbers):
+
+        <dependency>
+            <groupId>net.geant.perfsonar</groupId>
+            <artifactId>web-admin-component</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <classifier>classes</classifier>
+        </dependency>
+        <dependency>
+            <groupId>net.geant.perfsonar</groupId>
+            <artifactId>web-admin-component</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
+
+2. Configure the maven-war-plugin to use an overlay
+
+        <plugin>
+            <artifactId>maven-war-plugin</artifactId>
+            <configuration>
+                <overlays>
+                    <overlay>
+                        <groupId>net.geant.perfsonar</groupId>
+                        <artifactId>web-admin-component</artifactId>
+                    </overlay>
+                </overlays>
+            </configuration>
+        </plugin>
+
+3. Add the webAdminConfig.xml file to your project
+
+Copy the example webAdminConfig.xml file and adapt it to match your service
+configuration file.  The XPath expressions must match your configuration file
+and the path to the configuration file might also need to be adapted.
+
+You can also change and adapt the headers to the different configuration 
sections,
+as well as adding new configuration sections if needed.
+
+4. Configure web.xml
+
+Copy and adapt the web.xml file that comes with the example service.
+
+5. Build and deploy
+
+This is all that is required to build and deploy your project with a 
webadmin.
+
+6. Optional: new pages and servlets
+
+It is also possible to add new JSP pages (see example.jsp) and new servlets 
to the
+webadmin.  To add a new servlet, you can simply derive the BasicServlet 
class.


Property changes on: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/doc/README.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain