perfsonar development work

Author: mac
Date: 2008-02-26 04:25:53 -0500 (Tue, 26 Feb 2008)
New Revision: 3406

Modified:
   trunk/geant2_java-xml-ls/conf/conf-rpm/servlet.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/wizard.properties
Log:
replace old files by new from conf/ directory



Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/servlet.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/servlet.properties   2008-02-25 
17:24:22 UTC (rev 3405)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/servlet.properties   2008-02-26 
09:25:53 UTC (rev 3406)
@@ -2,7 +2,7 @@
 servlet.service_type=rrdma
 
 #The ConfigurationHandler interface implementation used by the Wizard Servlet
-servlet.wizard.external_handler=perfSONARWebAdmin.admin.wizard.services.RRDMAHandler
 
+servlet.wizard.external_handler=org.perfsonar.service.lookupService.xmlType.webadmin.LSWizardHandler
 
 #The username used for authentication reasons when accessing properties 
configuration and Wizard servlets
 servlet.username=perfsonaruser

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/wizard.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/wizard.properties    2008-02-25 
17:24:22 UTC (rev 3405)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/wizard.properties    2008-02-26 
09:25:53 UTC (rev 3406)
@@ -1,22 +1,50 @@
 <properties>
+
   <property>
-    <entry key="service.r.service_version">2.3.1</entry>
-    <Comment>Enter the version of the service</Comment>
-    <ProposedValue>version</ProposedValue>
-    <Group order="3">LS</Group>
-  </property>
-<property>
-    <entry key="component.ma.xmldb.db_password" required="true" 
password="true" >perfsonar</entry>
-    <Comment>Enter the password for the exist user</Comment>
-    <ProposedValue>testpass</ProposedValue>
-    <Group order="5">eXist</Group>
-  </property>
-<property>
-    <entry key="component.ma.xmldb.db_status" required="true" >off</entry>
-    <Comment>Would you like to use eXist db?</Comment>
+    <entry key="service.ls.db_status" required="true">off</entry>
+    <Comment>Would you like to use eXist DB XML?</Comment>
     <ProposedValue>on</ProposedValue>
     <Group order="1" check="true">eXist</Group>
     <AcceptedValue>on</AcceptedValue>
     <AcceptedValue>off</AcceptedValue>
   </property>
-</properties>
+
+  <property>
+    <entry 
key="service.ls.db_uri">http://localhost:8080/exist/rest/db/ls</entry>
+    <Comment>Enter the location of the eXist database</Comment>
+    <ProposedValue>http://localhost:8080/exist/rest/db/ls</ProposedValue>
+    <Group order="2" check="true">eXist</Group>
+  </property>
+
+  <property>
+    <entry key="service.ls.db_username">lookupservice</entry>
+    <Comment>Specify the service username for the exist user</Comment>
+    <ProposedValue>lookupservice</ProposedValue>
+    <Group order="3" check="true">eXist</Group>
+  </property>
+
+  <property>
+    <entry key="service.ls.db_password">sonar</entry>
+    <Comment>Specify the administration password for exist</Comment>
+    <ProposedValue>sonar</ProposedValue>
+    <Group order="4" check="true">eXist</Group>
+  </property>
+    
+  <property>
+    <entry key="service.ls.db_adminpassword"></entry>
+    <Comment>Specify the administration password for exist</Comment>
+    <ProposedValue></ProposedValue>
+    <Group order="5" check="true">eXist</Group>
+  </property>
+
+  <property>
+    <entry key="initialize.db" required="true">on</entry>
+    <Comment>Would you like to initialize database structure?</Comment>
+    <ProposedValue>yes</ProposedValue>
+    <Group order="6" check="true">eXist</Group>
+    <AcceptedValue>yes</AcceptedValue>
+    <AcceptedValue>no</AcceptedValue>
+  </property>
+
+
+</properties>
\ No newline at end of file