perfsonar development work

Author: roman
Date: 2006-08-21 10:08:08 -0400 (Mon, 21 Aug 2006)
New Revision: 1556

Added:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventType.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGenerator.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/Consolidation.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/responseGenerator/
Modified:
   trunk/perfsonar/conf/components.properties.ma
   trunk/perfsonar/conf/eventType-map.xml
   trunk/perfsonar/conf/eventType-rules.xml
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
   
trunk/perfsonar/src/org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.java
   
trunk/perfsonar/src/org/perfsonar/service/testHarness/RRDStorageManagerTester.java
Log:
better package organization with measurementArchive classes

Modified: trunk/perfsonar/conf/components.properties.ma
===================================================================
--- trunk/perfsonar/conf/components.properties.ma       2006-08-21 13:23:31 
UTC (rev 1555)
+++ trunk/perfsonar/conf/components.properties.ma       2006-08-21 14:08:08 
UTC (rev 1556)
@@ -22,7 +22,7 @@
 
#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
 
 
-eventType_config=org.perfsonar.service.measurementArchive.storageManager.eventTypeConfig.EventTypeConfigurationComponent
+eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
 
 
 #Service specific components

Modified: trunk/perfsonar/conf/eventType-map.xml
===================================================================
--- trunk/perfsonar/conf/eventType-map.xml      2006-08-21 13:23:31 UTC (rev 
1555)
+++ trunk/perfsonar/conf/eventType-map.xml      2006-08-21 14:08:08 UTC (rev 
1556)
@@ -9,14 +9,14 @@
 
     <eventType>
         <name>utilization</name>
-        
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.storageManager.queryGenerator.UtilizationQueryGenerator</metadataQueryGenerator>
-        
<responseGenerator>org.perfsonar.service.measurementArchive.storageManager.responseGenerator.UtilizationResponseGenerator</responseGenerator>
+        
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.UtilizationQueryGenerator</metadataQueryGenerator>
+        
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.responseGenerator.UtilizationResponseGenerator</responseGenerator>
     </eventType>
 
     <eventType>
         <name>Path.Status</name>
-        
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.storageManager.queryGenerator.L2PathStatusQueryGenerator</metadataQueryGenerator>
-        
<responseGenerator>org.perfsonar.service.measurementArchive.storageManager.responseGenerator.L2PathStatusResponseGenerator</responseGenerator>
+        
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGenerator</metadataQueryGenerator>
+        
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.responseGenerator.L2PathStatusResponseGenerator</responseGenerator>
     </eventType>
 
 </eventType-config>
\ No newline at end of file

Modified: trunk/perfsonar/conf/eventType-rules.xml
===================================================================
--- trunk/perfsonar/conf/eventType-rules.xml    2006-08-21 13:23:31 UTC (rev 
1555)
+++ trunk/perfsonar/conf/eventType-rules.xml    2006-08-21 14:08:08 UTC (rev 
1556)
@@ -9,11 +9,11 @@
 
     <object-create-rule
         pattern="eventType-config"
-        
classname="org.perfsonar.service.measurementArchive.storageManager.eventTypeConfig.EventTypeConfiguration"
 />
+        
classname="org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfiguration"
 />
 
     <pattern value="eventType-config/eventType">
         <object-create-rule
-            
classname="org.perfsonar.service.measurementArchive.storageManager.eventTypeConfig.EventType"
 />
+            
classname="org.perfsonar.service.measurementArchive.eventTypeConfig.EventType"
 />
         <call-method-rule pattern="name" methodname="setName"
             paramcount="0" />
         <call-method-rule pattern="metadataQueryGenerator" 
methodname="setMetadataQueryGenerator" 

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventType.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventType.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGenerator.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGenerator.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/Consolidation.java
 (from rev 1553, 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/Consolidation.java)


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/Consolidation.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
 (from rev 1553, 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/RRDStorageManager.java)


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-08-21 13:23:31 UTC (rev 1555)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-08-21 14:08:08 UTC (rev 1556)
@@ -21,9 +21,8 @@
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 
 import org.perfsonar.service.commons.storage.NMWGStorageManager;
-import 
org.perfsonar.service.measurementArchive.storageManager.RRDStorageManager;
-import 
org.perfsonar.service.measurementArchive.storageManager.MetadataConfigurationStorageManager;
-import 
org.perfsonar.service.measurementArchive.storageManager.SimpleMetadataConfigurationStorageManager;
+import 
org.perfsonar.service.measurementArchive.metadataConfig.MetadataConfigurationStorageManager;
+import 
org.perfsonar.service.measurementArchive.metadataConfig.SimpleMetadataConfigurationStorageManager;
 
 import org.perfsonar.commons.auxiliary.AuxiliaryComponent;
 import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;

Copied: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
 (from rev 1553, 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/SQLStorageManager.java)


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
    2006-08-21 13:23:31 UTC (rev 1555)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
    2006-08-21 14:08:08 UTC (rev 1556)
@@ -23,8 +23,7 @@
 import org.perfsonar.service.commons.exceptions.SystemException;
 
 import 
org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine;
-import 
org.perfsonar.service.measurementArchive.storageManager.SQLStorageManager;
-import 
org.perfsonar.service.measurementArchive.storageManager.MetadataConfigurationStorageManager;
+import 
org.perfsonar.service.measurementArchive.metadataConfig.MetadataConfigurationStorageManager;
 
 /**
  *  Class implementing the Measurement Archive Service Engine which deals 
with

Modified: 
trunk/perfsonar/src/org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.java
        2006-08-21 13:23:31 UTC (rev 1555)
+++ 
trunk/perfsonar/src/org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.java
        2006-08-21 14:08:08 UTC (rev 1556)
@@ -23,7 +23,7 @@
 import org.ggf.ns.nmwg.topology.v2_0.IfName;
 import org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject;
 
-import 
org.perfsonar.service.measurementArchive.storageManager.MetadataConfigurationStorageManager;
+import 
org.perfsonar.service.measurementArchive.metadataConfig.MetadataConfigurationStorageManager;
 
 /**
  *

Modified: 
trunk/perfsonar/src/org/perfsonar/service/testHarness/RRDStorageManagerTester.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/testHarness/RRDStorageManagerTester.java
  2006-08-21 13:23:31 UTC (rev 1555)
+++ 
trunk/perfsonar/src/org/perfsonar/service/testHarness/RRDStorageManagerTester.java
  2006-08-21 14:08:08 UTC (rev 1556)
@@ -7,7 +7,7 @@
 
 import org.perfsonar.service.commons.exceptions.RequestException;
 import org.perfsonar.service.commons.storage.NMWGStorageManager;
-import 
org.perfsonar.service.measurementArchive.storageManager.RRDStorageManager;
+import org.perfsonar.service.measurementArchive.rrdType.RRDStorageManager;
 
 import org.ggf.ns.nmwg.base.v2_0.Message;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;