perfsonar development work

Author: psnc.pikusa
Date: 2010-05-05 14:54:14 +0100 (Wed, 05 May 2010)
New Revision: 5612

Modified:
   trunk/perfsonar-java-rrd-sql-ma/pom.xml
   
trunk/perfsonar-java-rrd-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
Log:
changes


Modified: trunk/perfsonar-java-rrd-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-sql-ma/pom.xml     2010-05-05 13:21:59 UTC (rev 
5611)
+++ trunk/perfsonar-java-rrd-sql-ma/pom.xml     2010-05-05 13:54:14 UTC (rev 
5612)
@@ -15,7 +15,7 @@
 
 <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";>>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
   <properties>
     <configurationFile>configuration-ma.xml</configurationFile>
@@ -203,7 +203,7 @@
       <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>ps-mdm-base2</artifactId>
-      <version>0.0.5</version>
+      <version>0.0.6</version>
     </dependency>
     <dependency>
       <groupId>rrdjtool</groupId>
@@ -287,6 +287,14 @@
       <artifactId>sunxacml</artifactId>
       <version>1.2</version>
     </dependency>
+    
+    <!-- SQL dependencies -->
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>5.0.3</version>
+    </dependency>
+    
 
   </dependencies>
 

Modified: 
trunk/perfsonar-java-rrd-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
===================================================================
--- 
trunk/perfsonar-java-rrd-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
       2010-05-05 13:21:59 UTC (rev 5611)
+++ 
trunk/perfsonar-java-rrd-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
       2010-05-05 13:54:14 UTC (rev 5612)
@@ -1,6 +1,7 @@
 package org.perfsonar.service.measurementArchive.rrdType.storage.exist;
 
 import 
org.perfsonar.service.measurementArchive.rrdType.storage.MetadataStorageDAO;
+import org.perfsonar.service.temp.FetchData;
 
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.configuration.Configuration;
@@ -115,10 +116,13 @@
     public String rawFetch(Element request)  throws PerfSONARException {
 
         String query = queryGeneratorManager.getQuery(request);
-        String results =
+        /*String results =
             ((ExtendedExistHTTPDataStorage) 
dataStorage).getXQueryStringResult(
                 query, this.dataCollection, this.dataCredential, request);
-
+         */
+        FetchData fd = new FetchData();
+               fd.fetchMetadataMessage();
+        String results = fd.MetadataContent;
         return results;
 
     }