perfsonar development work

Author: psnc.procyk
Date: 2010-03-15 14:08:26 +0000 (Mon, 15 Mar 2010)
New Revision: 5545

Modified:
   branches/new-structure-with-base2/ps-mdm-web-admin/ant/tomcat.properties
   branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml
Log:
Example webAdminConfig improvement


Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/ant/tomcat.properties
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/tomcat.properties  
  2010-03-12 13:50:09 UTC (rev 5544)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/tomcat.properties  
  2010-03-15 14:08:26 UTC (rev 5545)
@@ -1,7 +1,7 @@
 # Properties for Tomcat Server
 
 
-tomcat.dir=/usr/local/tomcat/
+tomcat.dir=/usr/local/apache-tomcat-5.5.27/
 tomcat.server=127.0.0.1
 tomcat.manager.url=http://127.0.0.1:8080/manager
 tomcat.username=tomcat

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml  
2010-03-12 13:50:09 UTC (rev 5544)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml  
2010-03-15 14:08:26 UTC (rev 5545)
@@ -4,7 +4,7 @@
 <wa:interface
        xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>
        
-       <!-- service information cosists of name nad version (only for 
displaying purpose) and accessPoint - selfTest -->
+       <!-- service information consists of name and version (only for 
displaying purpose) and accessPoint - selfTest -->
        <wa:serviceInformation>
                
<wa:accessPoint>http://localhost:8180/geant2-java-xml-ls/services/LookupService</wa:accessPoint>
                <wa:serviceName>Service Name</wa:serviceName>
@@ -138,7 +138,7 @@
                        <wa:textbox>
                                <wa:default>
                                        <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
                                        </wa:xpath>
                                </wa:default>
                                <wa:title><wa:text>Default 
title</wa:text></wa:title>
@@ -155,11 +155,13 @@
                                <wa:title><wa:text>Another 
title</wa:text></wa:title>
                        </wa:textbox>
                </wa:plain>
-               
+
                <wa:plain>
                        <wa:dropdown>
                                <wa:default>
-                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:lookupInformation/ns1:option[@name="name"]/@value</wa:xpath>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+                                       </wa:xpath>
                                </wa:default>
                                <wa:title><wa:text>Default dropdown 
title</wa:text></wa:title>
                                <wa:values><wa:text>SimpleService - 
Echo,val2,val3</wa:text></wa:values>
@@ -169,13 +171,14 @@
                <wa:plain>
                        <wa:radio>
                                <wa:default>
-                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="SimpleService"]/ns1:lookupInformation/ns1:option[@name="authorization"]/@value</wa:xpath>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
                                </wa:default>
                                <wa:title><wa:text>Require authorization 
?</wa:text></wa:title>
                                
<wa:values><wa:text>yes,no</wa:text></wa:values>
                        </wa:radio>
                </wa:plain>
-
+ 
        </wa:page>