perfsonar development work

Author: roman
Date: 2009-02-27 06:21:45 -0500 (Fri, 27 Feb 2009)
New Revision: 5000

Added:
   
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.3.pdf
Removed:
   
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.2.pdf
Modified:
   branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_fedora_10.txt
   
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
Log:
merged with the trunk (-r 4961:4997)



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_fedora_10.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_fedora_10.txt   
2009-02-27 11:19:25 UTC (rev 4999)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_fedora_10.txt   
2009-02-27 11:21:45 UTC (rev 5000)
@@ -8,7 +8,14 @@
 2) Install JDK 1.6.0_06
 - download it (jdk-6u6-linux-i586-rpm.bin) from Java web page 
(http://java.sun.com/products/archive/)
 - set the execute right (chmod u+x jdk-6u6-linux-i586-rpm.bin) and run it
+- set Sun Java 1.6.0_06 as default in the system
 
+        /usr/sbin/alternatives --install /usr/bin/java java 
/usr/java/jdk1.6.0_06/bin/java 2
+        /usr/sbin/alternatives --config java
+
+        /usr/sbin/alternatives --install /usr/bin/javac javac 
/usr/java/jdk1.6.0_06/bin/javac 2
+        /usr/sbin/alternatives --config javac
+
 3) Install Tomcat5
 - execute the following command:
 

Deleted: 
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.2.pdf

Copied: 
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.3.pdf 
(from rev 4997, 
trunk/geant2-java-sql-ma/doc/perfSONAR-MDM-3.1_Admin_Guide_1.3.pdf)

Modified: 
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
--- 
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
       2009-02-27 11:19:25 UTC (rev 4999)
+++ 
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
       2009-02-27 11:21:45 UTC (rev 5000)
@@ -9,6 +9,7 @@
 import java.util.Date;
 import java.util.Map;
 import java.util.Random;
+import java.util.Iterator;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.base.v2_0.EventType;
@@ -218,7 +219,7 @@
             query.addChild(metadata);
             Message resp = null;
 
-            try{
+            try {
                 resp = metadataConfig.fetch(query);
             } catch (PerfSONARException sex) {
                 if 
(sex.getResultCode().equals("warning.ma.metadata_configuration"))
@@ -230,7 +231,6 @@
             }
 
             if (resp.getDataMap().size() > 0) {
-
                 // metadata already exists in xmldb
 
                 Data d = (resp.getDataArray())[0];
@@ -256,7 +256,6 @@
                 if (!ibatis_config_str.trim().equals("")) {
                     ibatisConfig = new Parameter();
                     ibatisConfig.setParameterName("ibatisConfig");
-
                     ibatisConfig.setParameterValue(ibatis_config_str);
                 }
 
@@ -266,12 +265,14 @@
                 String metadataId = "meta" + Long.toString(rand.nextLong());
 
                 Parameters params = metadata.getParameters();
-                if (params == null) {
+                Parameters originalParams = null;
+                if (params != null) originalParams = copyParameters(params);
+                if (params == null || !params.getPrefix().equals("nmwg")) {
+
                     params = new Parameters();
                     params.addParameter("eventType", eventType);
                 }
 
-
                 if (ibatisConfig != null) {
 
                     params.getParameterMap().remove("ibatisConfig");
@@ -281,7 +282,6 @@
 
                     ibatisConfig = 
getIbatisConfig(params.getParameterByName("eventType"));
                     if (ibatisConfig != null) params.addChild(ibatisConfig);
-
                 }
 
                 if (params.getParameterByName("ibatisConfig") == null) {
@@ -310,6 +310,8 @@
                 _metadata.addChild(metadata.getSubject());
                 _metadata.setEventType(eventTypeObj);
 
+                // adding original parameters
+                if (originalParams != null) 
_metadata.setParameters(originalParams);
 
                 Message configMessage = new Message();
                 _metadata.setId(metadataId);
@@ -333,6 +335,22 @@
     }
 
 
+    private Parameters copyParameters(Parameters parameters) {
+
+        Parameters newParameters = new Parameters();
+        newParameters.setUri(parameters.getUri());
+        newParameters.setPrefix(parameters.getPrefix());
+        newParameters.setLocalName(parameters.getLocalName());
+        newParameters.setQName(parameters.getQName());
+        Iterator it = parameters.getParameterIterator();
+        while (it.hasNext()) {
+            Parameter parameter = (Parameter) it.next();
+            newParameters.addParameter(parameter.getParameterName(), 
parameter.getParameterValue());
+        }
+        return newParameters;
+    }
+
+
     protected Parameter getIbatisConfig(Parameter eventTypeParameter)
         throws PerfSONARException {
 
@@ -354,7 +372,6 @@
                     "SQLTypeMAServiceEngine.getIbatisConfig: "
                     + "eventType " + eventTypeStr + " is not supported");
 
-
         String ibatisConfigStr = eventType.getIbatisConfig();
 
         logger.debug(