perfsonar development work

Author: nordunet.behrmann
Date: 2012-08-29 12:35:29 +0100 (Wed, 29 Aug 2012)
New Revision: 5981

Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml
Log:
perfsonar-java-rrd-ma-SQL_backend: Adjust default configuration to match 
recent modifications

- Assume Tomcat runs on port 8080; This is the case on both Debian 6 and 
Centos 6
- Use perfsonar_rrdma as both schema name and user name; the rrdma_db.sql 
script
  uses those names

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml   
2012-08-29 11:35:29 UTC (rev 5980)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml   
2012-08-29 11:35:29 UTC (rev 5981)
@@ -10,7 +10,7 @@
 
     <lookupInformation>
 
-      <option name="accessPoint" 
value="http://localhost:8180/perfsonar-java-rrd-ma/services/MeasurementArchiveService"/>
+      <option name="accessPoint" 
value="http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService"/>
       <option name="serviceName" value="perfsonar-java-rrd-ma"/>
       <option name="serviceType" value="MA"/>
 
@@ -47,7 +47,7 @@
 
       <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:8180/exist/rest/db/rrdmaconfig"/>
+        <option name="uri" 
value="http://localhost:8080/exist/rest/db/rrdmaconfig"/>
         <option name="username" value="rrdmaservice"/>
         <option name="password" value="rrdmaservice"/>
       </component>
@@ -87,8 +87,8 @@
       
       <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_ma"/>
-        <option name="username" value="perfsonar_ma"/>
+        <option name="schema" value ="perfsonar_rrdma"/>
+        <option name="username" value="perfsonar_rrdma"/>
         <option name="password" value="testpass"/>
       </component>
 
@@ -107,7 +107,7 @@
                <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:8180/perfsonar-java-xml-ls/services/LookupService"/>
+                <option name="lsAddress-1" 
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
                 <!--
                 <option name ="lsAddress-2"></option>
                 <option name ="lsAddress-3"></option>