perfsonar development work

Author: dante.delvaux
Date: 2013-02-19 10:27:00 +0000 (Tue, 19 Feb 2013)
New Revision: 6168

Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml
   trunk/perfsonar-java-sql-ma/pom.xml
   
trunk/perfsonar-java-sql-ma/src/main/resources/db/migration/mysql/V1__Initial_structure.sql
   
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
Log:
SQL-MA: correcting SQL comments inside table creation code that prevented 
Flyway to work properly
SQL-MA: changing the service type registered to the LS to SQL_MA, 
#PSSERVICES-644
RRD-MA: changing the service type registered to the LS to RRD_MA, 
#PSSERVICES-643


Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml   
2013-02-19 09:42:01 UTC (rev 6167)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/configuration-ma.xml   
2013-02-19 10:27:00 UTC (rev 6168)
@@ -11,8 +11,10 @@
     <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="MA"/>
+      <option name="serviceType" value="RRD_MA"/>
 
     </lookupInformation>
 

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2013-02-19 09:42:01 UTC (rev 6167)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2013-02-19 10:27:00 UTC (rev 6168)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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";>
     <parent>
         <groupId>net.geant.perfsonar</groupId>
         <artifactId>parent</artifactId>

Modified: 
trunk/perfsonar-java-sql-ma/src/main/resources/db/migration/mysql/V1__Initial_structure.sql
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/resources/db/migration/mysql/V1__Initial_structure.sql
 2013-02-19 09:42:01 UTC (rev 6167)
+++ 
trunk/perfsonar-java-sql-ma/src/main/resources/db/migration/mysql/V1__Initial_structure.sql
 2013-02-19 10:27:00 UTC (rev 6168)
@@ -1,10 +1,10 @@
 CREATE TABLE
     perfsonar_utilization
-        (metadataId VARCHAR(30) NOT NULL,           -- id of metadata which 
is stored in xml database
-         value FLOAT (16,4) NOT NULL,               -- measurement value
-         valueUnits VARCHAR(30) NULL,               -- unit of value
-         timeValue INT NOT NULL,                    -- seconds since 
`00:00:00 1970-01-01 UTC'
-         ts TIMESTAMP DEFAULT NOW());               -- time of inserting
+        (metadataId VARCHAR(30) NOT NULL COMMENT 'id of metadata which is 
stored in xml database',
+         value FLOAT (16,4) NOT NULL COMMENT 'measurement value',
+         valueUnits VARCHAR(30) NULL COMMENT 'measurement value unit',
+         timeValue INT NOT NULL COMMENT 'seconds since 00:00:00 1970-01-01 
UTC',
+         ts TIMESTAMP DEFAULT NOW() COMMENT 'time of insertion');
 
 
 CREATE TABLE

Modified: 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
    2013-02-19 09:42:01 UTC (rev 6167)
+++ 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
    2013-02-19 10:27:00 UTC (rev 6168)
@@ -84,11 +84,13 @@
 
 # Group=LS
 # Description=The service type.
-service.r.service_type=ma
+service.r.service_type=SQL_MA
 
 # Group=LS
 # Description=The URL address of the LS service (more LS addresses can be 
separated by commas).
-service.r.ls_url=http://somewhere
+service.r.ls_url=http://somewhere.to.register/your/access/point
+# If you have a production service in the GEANT domain, you might want to 
use the following address for registration
+#service.r.ls_url=http://ls.geant.net:8080/perfsonar-java-xml-ls/services/LookupService
 
 # Group=LS
 # Description=The URL address of the service configured by this 
configuration file.
@@ -100,7 +102,7 @@
 
 # Group=LS
 # Description=The name of the service (can contain multiple words).
-service.r.service_name=pS java sql ma
+service.r.service_name=pS java SQL MA
 
 # Group=LS
 # Description=The version number of the service.