perfsonar development work

Author: roman
Date: 2008-07-01 07:51:45 -0400 (Tue, 01 Jul 2008)
New Revision: 4067

Added:
   trunk/geant2-java-sql-ma/samples/requests/CompleteMetadataStoreRequest.xml
Modified:
   trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
   trunk/geant2-java-sql-ma/ant/const.properties.template
   trunk/geant2-java-sql-ma/ant/libs-download-targets.xml
   trunk/geant2-java-sql-ma/ant/test-targets.xml
   trunk/geant2-java-sql-ma/conf/eventType-map.xml
   trunk/geant2-java-sql-ma/conf/eventType-rules.xml
   
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
   
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
   
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
   
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcess.java
   
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
Log:
new CompleteMetadataStoreRequest message type (replaces metadata 
configuration content) added 




Modified: trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-07-01 
11:13:22 UTC (rev 4066)
+++ trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-07-01 
11:51:45 UTC (rev 4067)
@@ -45,10 +45,10 @@
   <target name="copy-dep-service-jars"
           depends="copy-dep-base-service-jars">
 
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.jar"
      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
              todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
                    todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
             todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -288,10 +288,10 @@
 
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"           
                                         todir="${tmpdir}/WEB-INF/lib"/>
 
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.jar"
            todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
              todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                              todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
                    todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                              todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                              todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
             todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2-java-sql-ma/ant/const.properties.template
===================================================================
--- trunk/geant2-java-sql-ma/ant/const.properties.template      2008-07-01 
11:13:22 UTC (rev 4066)
+++ trunk/geant2-java-sql-ma/ant/const.properties.template      2008-07-01 
11:51:45 UTC (rev 4067)
@@ -11,7 +11,7 @@
 service.name=geant2-java-sql-ma
 
 jarfilename=perfsonar-sql-ma
-version=2.0rc10
+version=2.1
 
 exist.war.file=exist-1.1.1-newcore.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.1.1

Modified: trunk/geant2-java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/libs-download-targets.xml      2008-07-01 
11:13:22 UTC (rev 4066)
+++ trunk/geant2-java-sql-ma/ant/libs-download-targets.xml      2008-07-01 
11:51:45 UTC (rev 4067)
@@ -54,10 +54,10 @@
 
     <artifact:dependencies>
 
-      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080422"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080630"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8.4b"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="3.0rc2"/>
-      <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="3.1"/>
+      <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20080630"/>
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
       <dependency groupId="com.ibatis" artifactId="ibatis-sqlmap"        
version="2.1.7.597"/>

Modified: trunk/geant2-java-sql-ma/ant/test-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/test-targets.xml       2008-07-01 11:13:22 
UTC (rev 4066)
+++ trunk/geant2-java-sql-ma/ant/test-targets.xml       2008-07-01 11:51:45 
UTC (rev 4067)
@@ -373,8 +373,23 @@
       <arg value="${basedir}/samples/requests/response-23-5.xml"/>
     </java>
   </target>
-  
 
+
+
+  <!-- replacing metadata configuration  -->
+
+  <target name="metadata-config-replace-test"
+          depends="init-test">
+    <java classname="org.perfsonar.client.testHarness.SOAPClient"
+          classpathref="classpath"
+          fork="true">
+      <arg value="${ma.local}"/>
+      <arg 
value="${basedir}/samples/requests/CompleteMetadataStoreRequest.xml"/>
+      <arg value="${basedir}/samples/requests/response-24.xml"/>
+    </java>
+  </target>
+
+
   <!-- 
===================================================================================
 -->
   <!-- main target -->
 

Modified: trunk/geant2-java-sql-ma/conf/eventType-map.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/eventType-map.xml     2008-07-01 11:13:22 
UTC (rev 4066)
+++ trunk/geant2-java-sql-ma/conf/eventType-map.xml     2008-07-01 11:51:45 
UTC (rev 4067)
@@ -31,6 +31,7 @@
     <eventType>
         <name>http://ggf.org/ns/nmwg/topology/l2/3.0/link/status</name>
         
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGenerator</metadataQueryGenerator>
+        
<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>
         
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
         
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
     </eventType>
@@ -38,6 +39,7 @@
     <eventType>
         <name>Path.Status</name>
         
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGeneratorTMP</metadataQueryGenerator>
+        
<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>
         
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
         
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
     </eventType>
@@ -55,7 +57,7 @@
         
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.BwctlResponseGenerator</responseGenerator>
         
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.BwctlStoreRequestProcess</storeRequestProcess>
     </eventType>
-    
+
     <eventType>
         <name>http://ggf.org/ns/nmwg/tools/ping/2.0</name>
         
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.PingQueryGenerator</metadataQueryGenerator>

Modified: trunk/geant2-java-sql-ma/conf/eventType-rules.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/eventType-rules.xml   2008-07-01 11:13:22 
UTC (rev 4066)
+++ trunk/geant2-java-sql-ma/conf/eventType-rules.xml   2008-07-01 11:51:45 
UTC (rev 4067)
@@ -18,6 +18,8 @@
             paramcount="0" />
         <call-method-rule pattern="metadataQueryGenerator" 
methodname="setMetadataQueryGenerator" 
             paramcount="0" />
+        <call-method-rule pattern="metadataKeyGenerator" 
methodname="setMetadataKeyGenerator" 
+            paramcount="0" />
         <call-method-rule pattern="responseGenerator" 
methodname="setResponseGenerator" 
             paramcount="0" />
         <call-method-rule pattern="storeRequestProcess" 
methodname="setStoreRequestProcess" 

Added: 
trunk/geant2-java-sql-ma/samples/requests/CompleteMetadataStoreRequest.xml


Property changes on: 
trunk/geant2-java-sql-ma/samples/requests/CompleteMetadataStoreRequest.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
===================================================================
--- 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
      2008-07-01 11:13:22 UTC (rev 4066)
+++ 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
      2008-07-01 11:51:45 UTC (rev 4067)
@@ -50,19 +50,15 @@
 public class SQLStorageManager implements NMWGStorageManager {
 
 
-
     // ---------------------------------- class fields
 
 
-
     private LoggerComponent logger = null;
 
 
-
     // ---------------------------------- constructors
 
 
-
     public SQLStorageManager() throws PerfSONARException {
 
         try {
@@ -84,11 +80,9 @@
     }
 
 
+    // ---------------------------------- methods
 
-    // ---------------------------------- public methods
 
-
-
     public void initStorage(Key dataRepository)
         throws PerfSONARException {
 
@@ -116,58 +110,58 @@
 
             Key key = md.getKey();
 
-               Map ibatisParams = new HashMap();
+            Map ibatisParams = new HashMap();
 
             Map parametersMap = key.getParametersMap();
             for (Object o : parametersMap.values()) {
 
-               Parameters params = (Parameters) o;
-               Parameter[] paramsArray = params.getParameterArray();
-               
-               for (int i = 0; i < paramsArray.length; i++) {
+                Parameters params = (Parameters) o;
+                Parameter[] paramsArray = params.getParameterArray();
 
-                       Parameter p = paramsArray[i];
-                       String pname = p.getParameterName();
-                       //String pvalue = p.getParameterValue();
-                       String pvalue = "";
+                for (int i = 0; i < paramsArray.length; i++) {
 
-                       //logger.debug("SQLStorageManager.fetch: param [name, 
value]: ["
-                       //      + pname + ", " + pvalue + "]");
+                    Parameter p = paramsArray[i];
+                    String pname = p.getParameterName();
+                    //String pvalue = p.getParameterValue();
+                    String pvalue = "";
 
-                       if (pname.equals("startTime")) {
-                               long startTime = 0;
-                               pvalue = TimeDateUtil.getUnixTime(p);
-                               try {
-                                       startTime = Long.parseLong(pvalue);
-                               } catch (NumberFormatException nfex) {
-                                       throw new PerfSONARException(
-                                                       "error.ma.query",
-                                                       
"SQLStorageManager.fetch: "
-                                                       + "startTime 
parameter in the request "
-                                                       + "has wrong format");
-                               }
-                               ibatisParams.put(pname, startTime);
+                    //logger.debug("SQLStorageManager.fetch: param [name, 
value]: ["
+                    //      + pname + ", " + pvalue + "]");
 
-                       } else if (pname.equals("endTime")) {
-                               long endTime = 0;
-                               pvalue = TimeDateUtil.getUnixTime(p);
-                               try {
-                                       endTime = Long.parseLong(pvalue);
-                               } catch (NumberFormatException nfex) {
-                                       throw new PerfSONARException(
-                                                       "error.ma.query",
-                                                       
"SQLStorageManager.fetch: "
-                                                       + "endTime parameter 
in the request "
-                                                       + "has wrong format");
-                               }
-                               ibatisParams.put(pname, endTime);
+                    if (pname.equals("startTime")) {
+                        long startTime = 0;
+                        pvalue = TimeDateUtil.getUnixTime(p);
+                        try {
+                            startTime = Long.parseLong(pvalue);
+                        } catch (NumberFormatException nfex) {
+                            throw new PerfSONARException(
+                                    "error.ma.query",
+                                    "SQLStorageManager.fetch: "
+                                    + "startTime parameter in the request "
+                                    + "has wrong format");
+                        }
+                        ibatisParams.put(pname, startTime);
 
-                       } else {
-                               pvalue = p.getParameterValue();
-                               ibatisParams.put(pname, pvalue);
-                       }
+                    } else if (pname.equals("endTime")) {
+                        long endTime = 0;
+                        pvalue = TimeDateUtil.getUnixTime(p);
+                        try {
+                            endTime = Long.parseLong(pvalue);
+                        } catch (NumberFormatException nfex) {
+                            throw new PerfSONARException(
+                                    "error.ma.query",
+                                    "SQLStorageManager.fetch: "
+                                    + "endTime parameter in the request "
+                                    + "has wrong format");
+                        }
+                        ibatisParams.put(pname, endTime);
 
-               }
+                    } else {
+                        pvalue = p.getParameterValue();
+                        ibatisParams.put(pname, pvalue);
+                    }
+
+                }
             }
 
             Data data = null;
@@ -294,7 +288,7 @@
                 //logger.debug("SQLStorageManager.store: EventType: " + 
eventType);
 
                 StoreRequestProcess storeRequestProcess =
-                       
StoreRequestProcessFactory.getStoreRequestProcess(eventType);
+                    
StoreRequestProcessFactory.getStoreRequestProcess(eventType);
                 storeRequestProcess.process(sqlMap, data, ibatisParams);
 
             } catch (Exception ioex) {
@@ -310,13 +304,27 @@
         }
 
         PerfSONARException pex = new PerfSONARException(
-                       "success.ma.write",
-                       "Data have been stored");
+                "success.ma.write",
+                "Data have been stored");
         response = ResultCodesUtil.createResultCodeMetadata(response, pex);
         return response;
 
     }
 
 
+    public Message remove(Message dataSet) throws PerfSONARException {
+        return null;
+    }
 
+
+    public void removeAll() throws PerfSONARException {
+    }
+
+
+    public Message update(Message dataSet) throws PerfSONARException {
+        return null;
+    }
+
+
+
 } //SQLStorageManager
\ No newline at end of file

Modified: 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
--- 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
 2008-07-01 11:13:22 UTC (rev 4066)
+++ 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
 2008-07-01 11:51:45 UTC (rev 4067)
@@ -38,55 +38,42 @@
 public class SQLTypeMAServiceEngine extends RRDTypeMAServiceEngine {
 
 
-
     // ---------------------------------- constructors
 
 
-
     public SQLTypeMAServiceEngine() throws PerfSONARException {
 
         super();
         serviceEngineType = "service.MeasurementArchive.SQLType";
 
-        metadataConfig = new MetadataConfigurationStorageManager();
-        metadataConfig.initStorage(null);
+        //use of MetadataConfigurationStorageManager is a must in SQL MA 
service engine
+        if (!(metadataConfig instanceof 
MetadataConfigurationStorageManager)) {
+            metadataConfig = new MetadataConfigurationStorageManager();
+            metadataConfig.initStorage(null);
+        }
 
     }
 
 
+    // ---------------------------------- methods
 
-    // ---------------------------------- public methods
 
-
-
     public Message takeAction(String actionType, Message request)
         throws PerfSONARException {
 
-        Message response = super.takeAction(actionType, request);
-
-        return response;
-
+        return super.takeAction(actionType, request);
     }
 
 
-
-    // ---------------------------------- protected methods
-
-
-
     protected Message getKey(Message request)
         throws PerfSONARException {
 
-        Message keyMessage = super.getKey(request);
-        return keyMessage;
-
+        return super.getKey(request);
     }
 
 
-    protected Message getData(Message request)
-        throws PerfSONARException {
+    protected Message getData(Message request) throws PerfSONARException {
 
-
         Message response = new Message();
 
         SQLStorageManager sqlStorageManager = new SQLStorageManager();
@@ -136,33 +123,23 @@
         }
 
         return response;
-
     }
 
 
     protected Message storeData(Message request, boolean status)
         throws PerfSONARException {
 
-
-        //logger.debug("SQLTypeMAServiceEngine.storeData: start method");
-
         Message response = new Message();
 
-
-        if (status == false) {
-
+        if (status == false)
             throw new PerfSONARException(
                     "error.ma.writing",
                     "SQLTypeMAServiceEngine.storeData: "
                     + "Writing data is switched off in the MA "
                     + "(check the configuration)");
 
-        }
-
-
         SQLStorageManager sqlStorageManager = new SQLStorageManager();
 
-
         Map metadataMap = request.getMetadataMap();
         Collection<Data> collection = request.getDataMap().values();
 
@@ -187,35 +164,23 @@
 
         }
 
-
         return response;
-
     }
 
+
     public Message storeKey(Message request) 
-       throws PerfSONARException {
+        throws PerfSONARException {
 
-//     logger.debug("SQLTypeMAServiceEngine.storeKey: Request: 
"+request.toString());
+        metadataConfig.store(request);
+        return generateResultCodeResponse("success.ma.write", "Key has been 
stored");
+    }
 
-       metadataConfig.store(request);
 
-       Message response = new Message();
-       
-       PerfSONARException pex = new PerfSONARException("success.ma.write",
-               "Key has been stored");
-       
-       response = ResultCodesUtil.createResultCodeMetadata(response, pex);
-       
-       return response;
-    }
-    
     protected Key getStoreKey(Metadata metadata)
         throws PerfSONARException {
 
-
         Key key = metadata.getKey();
 
-
         if (key != null) {
 
             // check parameters in the key
@@ -361,7 +326,22 @@
         }
 
         return key;
+    }
 
+
+    protected Message replaceMetadataConfiguration(Message request)
+        throws PerfSONARException {
+
+        if (!isFirstRunDone()) metadataConfig.removeAll();
+
+        
((MetadataConfigurationStorageManager)metadataConfig).storeMetadataElements(request);
+        
((MetadataConfigurationStorageManager)metadataConfig).storeDataElements(request);
+
+        storeData(request, true);
+
+        String desc = "Metadata configuration has been replaced";
+        return generateResultCodeResponse("success.metadata_config_replace", 
desc);
+
     }
 
 

Modified: 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
===================================================================
--- 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
     2008-07-01 11:13:22 UTC (rev 4066)
+++ 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
     2008-07-01 11:51:45 UTC (rev 4067)
@@ -30,7 +30,7 @@
 
     public UtilizationResponseGenerator() throws PerfSONARException {
 
-       super();
+        super();
 
     }
 

Modified: 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcess.java
===================================================================
--- 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcess.java
      2008-07-01 11:13:22 UTC (rev 4066)
+++ 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcess.java
      2008-07-01 11:51:45 UTC (rev 4067)
@@ -40,7 +40,7 @@
 
 
 
-       public StoreRequestProcess() throws PerfSONARException {
+    public StoreRequestProcess() throws PerfSONARException {
 
         try {
 
@@ -58,33 +58,33 @@
 
         }
 
-       }
+    }
 
 
 
-       // -------------------------------------- public methods
+    // -------------------------------------- public methods
 
 
 
-       public void process(SqlMapClient sqlMap, Data data, Map ibatisParams) 
-               throws Exception {
+    public void process(SqlMapClient sqlMap, Data data, Map ibatisParams) 
+        throws Exception {
 
-               Vector datumVector = data.getDatum();
+        Vector datumVector = data.getDatum();
 
         for (int i = 0; i < datumVector.size(); i++) {
 
-               Element datum = (Element) datumVector.get(i);
-               prepareStoreParameters(datum, ibatisParams);
+            Element datum = (Element) datumVector.get(i);
+            prepareStoreParameters(datum, ibatisParams);
 
-               sqlMap.insert("setResults", ibatisParams);
+            sqlMap.insert("setResults", ibatisParams);
 
         }
 
-       }
+    }
 
 
 
-       // -------------------------------------- public abstract methods
+    // -------------------------------------- public abstract methods
 
 
 

Modified: 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
===================================================================
--- 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
   2008-07-01 11:13:22 UTC (rev 4066)
+++ 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
   2008-07-01 11:51:45 UTC (rev 4067)
@@ -27,7 +27,7 @@
 
     public UtilizationStoreRequestProcess() throws PerfSONARException {
 
-       super();
+        super();
 
     }