perfsonar development work

Author: rodriguez
Date: 2008-04-10 05:39:47 -0400 (Thu, 10 Apr 2008)
New Revision: 3644

Modified:
   trunk/geant2_java-as/conf/wizard.properties.template
   
trunk/geant2_java-as/src/main/java/org/perfsonar/service/webadmin/ASHandler.java
Log:
- A bug with the LS registration in the ASHandler class
- Bad paths in the wizard.properties.template

Modified: trunk/geant2_java-as/conf/wizard.properties.template
===================================================================
--- trunk/geant2_java-as/conf/wizard.properties.template        2008-04-10 
08:20:27 UTC (rev 3643)
+++ trunk/geant2_java-as/conf/wizard.properties.template        2008-04-10 
09:39:47 UTC (rev 3644)
@@ -84,7 +84,7 @@
   </property>
 
   <property>
-    <entry key="service.as.truststore_file" 
required="true">/home/perfsonar/webapps/perfSONAR-AS/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
+    <entry key="service.as.truststore_file" 
required="true">/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
     <Comment>Enter the full path to the TrustStore file containing the CA 
certs:</Comment>
     
<ProposedValue>/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
     <Group order="1">Authentication</Group>
@@ -98,7 +98,7 @@
   </property>
   
   <property>
-    <entry key="service.as.valid_components" 
required="true">/home/perfsonar/webapps/perfSONAR-AS/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
+    <entry key="service.as.valid_components" 
required="true">/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
     <Comment>Enter the full path to a file containing valid Component IDs in 
eduGAIN:</Comment>
     
<ProposedValue>/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
     <Group order="3">Authentication</Group>

Modified: 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/webadmin/ASHandler.java
===================================================================
--- 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/webadmin/ASHandler.java
    2008-04-10 08:20:27 UTC (rev 3643)
+++ 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/webadmin/ASHandler.java
    2008-04-10 09:39:47 UTC (rev 3644)
@@ -426,7 +426,7 @@
                BufferedReader br = new BufferedReader(fr);
                String line = "";
                while (line != null) {
-                       if (line.startsWith("#scheduler")) {
+                       if (line.startsWith("#as_scheduler")) {
                                line = line.substring(1);
                        }
                        if (line.startsWith("#registrator")) {
@@ -458,7 +458,7 @@
                BufferedReader br = new BufferedReader(fr);
                String line = "";
                while (line != null) {
-                       if (line.startsWith("scheduler")) {
+                       if (line.startsWith("as_scheduler")) {
                                line = "#" + line;
                        }
                        if (line.startsWith("registrator")) {