perfsonar development work

Author: roman
Date: 2006-08-22 05:08:45 -0400 (Tue, 22 Aug 2006)
New Revision: 1560

Added:
   
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/metadataConfig/
   
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManagerTest.java
   
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManagerTest.java
   trunk/perfsonar/test/org/perfsonar/service/measurementArchive/rrdType/
   
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManagerTest.java
Removed:
   
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/storageManager/
Modified:
   trunk/perfsonar/ant/java-compile-targets.xml
   trunk/perfsonar/ant/rrdma/rrdma-junit-test-targets.xml
Log:
update related with package changes from yestarday

Modified: trunk/perfsonar/ant/java-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/java-compile-targets.xml        2006-08-22 08:17:00 
UTC (rev 1559)
+++ trunk/perfsonar/ant/java-compile-targets.xml        2006-08-22 09:08:45 
UTC (rev 1560)
@@ -25,7 +25,8 @@
                 description="Removes build directories.">
         <delete dir="${build}/org"/>
         <delete>
-              <fileset dir="${build}" includes="**/*.jar"/>
+            <fileset dir="${build}" includes="**/*.jar"/>
+            <fileset dir="${build}" includes="**/*.xml"/>
         </delete>
     </target>
 

Modified: trunk/perfsonar/ant/rrdma/rrdma-junit-test-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-junit-test-targets.xml      2006-08-22 
08:17:00 UTC (rev 1559)
+++ trunk/perfsonar/ant/rrdma/rrdma-junit-test-targets.xml      2006-08-22 
09:08:45 UTC (rev 1560)
@@ -17,14 +17,14 @@
 
 
     <target name="set-path-of-rrdtestfile">
-        <replace 
file="test/org/perfsonar/service/measurementArchive/storageManager/MetadataStorageManagerTest.java"
+        <replace 
file="test/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManagerTest.java"
                  token="__BASEPATH__"
                  value="${basedir}"/>
     </target>
 
 
     <target name="set-path-of-rrdconfigfile">
-        <replace 
file="test/org/perfsonar/service/measurementArchive/storageManager/SimpleMetadataConfigurationStorageManagerTest.java"
+        <replace 
file="test/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManagerTest.java"
                  token="__BASEPATH__"
                  value="${basedir}"/>
     </target>
@@ -40,6 +40,14 @@
     </target>
 
 
+    <target name="copy-eventTypeConfig-files">
+
+        <copy file="./conf/eventType-map.xml"    todir="${basedir}/build"/>
+        <copy file="./conf/eventType-rules.xml"  todir="${basedir}/build"/>
+
+    </target>
+
+
     <target name="prepare-junit-test-for-rrdma">
 
         <antcall target="clean-all"/>
@@ -47,6 +55,8 @@
         <antcall target="compile-rrdma"/>
         <antcall target="compile-junit-test-rrdma"/>
 
+        <antcall target="copy-eventTypeConfig-files"/>
+        
     </target>
 
 
@@ -57,7 +67,7 @@
         <echo>----JUnit tests----</echo>
         <junit printsummary="yes" fork="yes" haltonfailure="yes" 
showoutput="yes">
             <formatter type="plain"/>
-            <test 
name="org.perfsonar.service.measurementArchive.storageManager.MetadataStorageManagerTest"/>
+            <test 
name="org.perfsonar.service.measurementArchive.rrdType.RRDStorageManagerTest"/>
             <classpath refid="classpath"/>
             <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
             <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
@@ -73,7 +83,7 @@
         <echo>----JUnit tests----</echo>
         <junit printsummary="yes" fork="yes" haltonfailure="yes" 
showoutput="yes">
             <formatter type="plain"/>
-            <test 
name="org.perfsonar.service.measurementArchive.storageManager.SimpleMetadataConfigurationStorageManagerTest"/>
+            <test 
name="org.perfsonar.service.measurementArchive.metadataConfig.SimpleMetadataConfigurationStorageManagerTest"/>
             <classpath refid="classpath"/>
             <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
             <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
@@ -89,7 +99,7 @@
         <echo>----JUnit tests----</echo>
         <junit printsummary="yes" fork="yes" haltonfailure="yes" 
showoutput="yes">
             <formatter type="plain"/>
-            <test 
name="org.perfsonar.service.measurementArchive.storageManager.MetadataConfigurationStorageManagerTest"/>
+            <test 
name="org.perfsonar.service.measurementArchive.metadataConfig.MetadataConfigurationStorageManagerTest"/>
             <classpath refid="classpath"/>
             <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
             <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>

Copied: 
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManagerTest.java
 (from rev 1558, 
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManagerTest.java)


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

Copied: 
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManagerTest.java
 (from rev 1558, 
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/storageManager/SimpleMetadataConfigurationStorageManagerTest.java)


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

Copied: 
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManagerTest.java
 (from rev 1558, 
trunk/perfsonar/test/org/perfsonar/service/measurementArchive/storageManager/RRDStorageManagerTest.java)


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