perfsonar development work

Author: psnc.pikusa
Date: 2010-09-13 16:13:12 +0100 (Mon, 13 Sep 2010)
New Revision: 5749

Added:
   tags/perfsonar-java-rrd-ma-3.3-0rc4/
   tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/base2/
   tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration-ma.xml
   tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration.xml.template
   tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/log4j.properties
   tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/webAdminConfig.xml
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/changelog
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/conffiles
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/control
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/dirs
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/install
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/postinst
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/preinst
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.conf
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.sh
   tags/perfsonar-java-rrd-ma-3.3-0rc4/pom.xml
Removed:
   tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/base2/
   tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration-ma.xml
   tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/log4j.properties
   tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/webAdminConfig.xml
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/changelog
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/conffiles
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/control
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/dirs
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/install
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/postinst
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/preinst
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.conf
   tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.sh
   tags/perfsonar-java-rrd-ma-3.3-0rc4/pom.xml
Log:
3.3-0rc4 stabilization branch


Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4 (from rev 5620, 
trunk/perfsonar-java-rrd-ma)

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/base2 (from rev 5748, 
trunk/perfsonar-java-rrd-ma/conf/base2)

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration-ma.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma/conf/configuration-ma.xml       2010-05-11 
10:33:53 UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration-ma.xml       
2010-09-13 15:13:12 UTC (rev 5749)
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- $Id: configuration-ma.xml 4915M 
2010-03-18 12:05:18Z (local) $ --><configuration 
xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
-
-
-  <service name="PerfsonarService">
-
-
-    <!-- 
....................................................................................
 -->
-
-    <!-- Lookup Info of the LS instance -->
-
-    <lookupInformation>
-
-      <option name="accessPoint" 
value="http://localhost:8180/perfsonar-java-rrd-ma/services/MeasurementArchiveService"/>
-      <option name="serviceName" value="perfsonar-java-rrd-ma"/>
-      <option name="serviceType" value="MA"/>
-
-    </lookupInformation>
-
-    <!-- 
....................................................................................
 -->
-
-    <!-- Message Handlers - message types and service engines -->
-
-    <messageHandler>
-
-      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="EchoRequest">
-        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine"/>
-        <option name="authN" value="no"/>
-      </message>
-
-      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="MetadataKeyRequest">
-        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyServiceEngine"/>
-        <option name="authN" value="no"/>
-      </message>
-
-      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="SetupDataRequest">
-        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.SetupDataServiceEngine"/>
-        <option name="authN" value="no"/>
-      </message>
-
-    </messageHandler>
-
-    <!-- 
....................................................................................
 -->
-
-    <!-- Additional auxiliary components -->
-
-    <auxiliaryComponents>
-
-      <component 
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent" 
name="exist">
-        <option name="dataStorageClassName" 
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
-        <option name="uri" 
value="http://localhost:8180/exist/rest/db/rrdmaconfig"/>
-        <option name="username" value="rrdmaservice"/>
-        <option name="password" value="rrdmaservice"/>
-      </component>
-
-      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager"
 name="queryGeneratorManager">
-
-        <option name="http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.UtilizationQueryGenerator"/>
-
-        <option name="http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.ErrorsQueryGenerator"/>
-
-        <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
-
-        <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
-
-        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
-
-        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
-
-        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
-
-      </component>
-
-      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.ExistMetadataStorageDAOImpl"
 name="metadataStorageDAO">
-        <option name="exist-config" value="exist"/> <!-- reference to eXist 
DB XML component config-->
-        <option name="queryGeneratorManager-config" 
value="queryGeneratorManager"/> <!-- reference to queryGeneratorManager 
component config-->
-      </component>
-
-      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
 name="dataStorageDAO">
-        <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
-       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
-       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
-      </component>
-
-
-      <!-- Scheduler -->
-      <component 
className="org.perfsonar.base2.service.scheduler.SchedulingComponent" 
name="scheduling">
-
-        <option name="schedulerClassName" 
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
-        <option name="interval" value="1800"/> <!-- sec -->
-
-        <actions>
-
-            <action 
className="org.perfsonar.base2.service.registration.LSRegistrationAction" 
name="registration">
-
-                <option name="status" value="on"/>
-                <option name="interval" value="3500"/> <!-- sec -->
-               <option name="registerDataSource" 
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>
                
-               <option name="registerEventType" 
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
-                <option name="registrator" 
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
-                <option name="lsAddress-1" 
value="http://localhost:8180/perfsonar-java-xml-ls/services/LookupService"/>
-                <!--
-                <option name ="lsAddress-2"></option>
-                <option name ="lsAddress-3"></option>
-                <option name ="lsAddress-4"></option>
-                <option name ="lsAddress-5"></option>
-                -->
-               
-            </action>
-
-        </actions>
-      </component> 
-
-
-      <!-- auth configuration -->
-      <component 
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
 name="auth">
-               <option name="as_endpoint" 
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
-               <option name="comp_id" value="urn:compId"/>
-      </component>
-
-    </auxiliaryComponents>
-
-
-
-    <extension name="registerExtension-registerDataSource">
-        <option name="exist-config" value="exist"/>
-    </extension>
-
-
-
-    <!-- 
....................................................................................
 -->
-
-
-    <!-- Protocol mappings, XML elements and their bingings -->
-
-    <protocolMappings>
-
-      <!-- default mapping -->
-      <element mapping="org.perfsonar.base2.xml.Element" name="*"/>
-
-      <!-- general mappings -->
-      <element mapping="org.perfsonar.base2.xml.nmwg.Message" 
name="{http://ggf.org/ns/nmwg/base/2.0/}message"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Metadata" 
name="{http://ggf.org/ns/nmwg/base/2.0/}metadata"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.EventType" 
name="{http://ggf.org/ns/nmwg/base/2.0/}eventType"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Data" 
name="{http://ggf.org/ns/nmwg/base/2.0/}data"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameters"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Parameter" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameter"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Key" 
name="{http://ggf.org/ns/nmwg/base/2.0/}key"/>
-
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/base/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject"/>
-      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"/>
-      <element mapping="org.perfsonar.base2.xml.Element" 
name="{http://ggf.org/ns/nmwg/time/2.0/}time"/>
-
-    </protocolMappings>
-
-    <!-- 
....................................................................................
 -->
-
-
-  </service>
-
-
-</configuration>

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration-ma.xml (from 
rev 5624, trunk/perfsonar-java-rrd-ma/conf/configuration-ma.xml)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration-ma.xml             
                  (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration-ma.xml       
2010-09-13 15:13:12 UTC (rev 5749)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- $Id: configuration-ma.xml 4915M 
2010-03-18 12:05:18Z (local) $ --><configuration 
xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
+
+
+  <service name="PerfsonarService">
+
+
+    <!-- 
....................................................................................
 -->
+
+    <!-- Lookup Info of the LS instance -->
+
+    <lookupInformation>
+
+      <option name="accessPoint" 
value="http://localhost:8180/perfsonar-java-rrd-ma/services/MeasurementArchiveService"/>
+      <option name="serviceName" value="perfsonar-java-rrd-ma"/>
+      <option name="serviceType" value="MA"/>
+
+    </lookupInformation>
+
+    <!-- 
....................................................................................
 -->
+
+    <!-- Message Handlers - message types and service engines -->
+
+    <messageHandler>
+
+      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="EchoRequest">
+        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine"/>
+        <option name="authN" value="no"/>
+      </message>
+
+      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="MetadataKeyRequest">
+        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyServiceEngine"/>
+        <option name="authN" value="no"/>
+      </message>
+
+      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="SetupDataRequest">
+        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.SetupDataServiceEngine"/>
+        <option name="authN" value="no"/>
+      </message>
+
+    </messageHandler>
+
+    <!-- 
....................................................................................
 -->
+
+    <!-- Additional auxiliary components -->
+
+    <auxiliaryComponents>
+
+      <component 
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent" 
name="exist">
+        <option name="dataStorageClassName" 
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
+        <option name="uri" 
value="http://localhost:8180/exist/rest/db/rrdmaconfig"/>
+        <option name="username" value="rrdmaservice"/>
+        <option name="password" value="rrdmaservice"/>
+      </component>
+
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager"
 name="queryGeneratorManager">
+
+        <option name="http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.UtilizationQueryGenerator"/>
+
+        <option name="http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.ErrorsQueryGenerator"/>
+
+        <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
+
+        <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
+
+      </component>
+
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.ExistMetadataStorageDAOImpl"
 name="metadataStorageDAO">
+        <option name="exist-config" value="exist"/> <!-- reference to eXist 
DB XML component config-->
+        <option name="queryGeneratorManager-config" 
value="queryGeneratorManager"/> <!-- reference to queryGeneratorManager 
component config-->
+      </component>
+
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
 name="dataStorageDAO">
+        <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
+       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+      </component>
+
+      <component name="migrator" 
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
+       <option name ="config-directory" 
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>
      
+      </component>
+
+      <!-- Scheduler -->
+      <component 
className="org.perfsonar.base2.service.scheduler.SchedulingComponent" 
name="scheduling">
+
+        <option name="schedulerClassName" 
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
+        <option name="interval" value="1800"/> <!-- sec -->
+
+        <actions>
+
+            <action 
className="org.perfsonar.base2.service.registration.LSRegistrationAction" 
name="registration">
+
+                <option name="status" value="on"/>
+                <option name="interval" value="3500"/> <!-- sec -->
+               <option name="registerDataSource" 
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>
                
+               <option name="registerEventType" 
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+                <option name="registrator" 
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+                <option name="lsAddress-1" 
value="http://localhost:8180/perfsonar-java-xml-ls/services/LookupService"/>
+                <!--
+                <option name ="lsAddress-2"></option>
+                <option name ="lsAddress-3"></option>
+                <option name ="lsAddress-4"></option>
+                <option name ="lsAddress-5"></option>
+                -->
+               
+            </action>
+
+        </actions>
+      </component> 
+
+
+      <!-- auth configuration -->
+      <component 
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
 name="auth">
+               <option name="as_endpoint" 
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+               <option name="comp_id" value="urn:compId"/>
+      </component>
+
+    </auxiliaryComponents>
+
+
+
+    <extension name="registerExtension-registerDataSource">
+        <option name="exist-config" value="exist"/>
+    </extension>
+
+
+
+    <!-- 
....................................................................................
 -->
+
+
+    <!-- Protocol mappings, XML elements and their bingings -->
+
+    <protocolMappings>
+
+      <!-- default mapping -->
+      <element mapping="org.perfsonar.base2.xml.Element" name="*"/>
+
+      <!-- general mappings -->
+      <element mapping="org.perfsonar.base2.xml.nmwg.Message" 
name="{http://ggf.org/ns/nmwg/base/2.0/}message"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Metadata" 
name="{http://ggf.org/ns/nmwg/base/2.0/}metadata"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.EventType" 
name="{http://ggf.org/ns/nmwg/base/2.0/}eventType"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Data" 
name="{http://ggf.org/ns/nmwg/base/2.0/}data"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameters"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Parameter" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameter"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Key" 
name="{http://ggf.org/ns/nmwg/base/2.0/}key"/>
+
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/base/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"/>
+      <element mapping="org.perfsonar.base2.xml.Element" 
name="{http://ggf.org/ns/nmwg/time/2.0/}time"/>
+
+    </protocolMappings>
+
+    <!-- 
....................................................................................
 -->
+
+
+  </service>
+
+
+</configuration>

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration.xml.template 
(from rev 5632, trunk/perfsonar-java-rrd-ma/conf/configuration.xml.template)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration.xml.template       
                  (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/configuration.xml.template 
2010-09-13 15:13:12 UTC (rev 5749)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- $Id: configuration-ma.xml 4915M 
2010-03-18 12:05:18Z (local) $ --><configuration 
xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
+
+
+  <service name="PerfsonarService">
+
+
+    <!-- 
....................................................................................
 -->
+
+    <!-- Lookup Info of the LS instance -->
+
+    <lookupInformation>
+
+      <option name="accessPoint" value="${service.r.access_point}"/>
+      <option name="serviceName" value="perfsonar-java-rrd-ma"/>
+      <option name="serviceType" value="${service.r.service_name}"/>
+
+    </lookupInformation>
+
+    <!-- 
....................................................................................
 -->
+
+    <!-- Message Handlers - message types and service engines -->
+
+    <messageHandler>
+
+      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="EchoRequest">
+        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine"/>
+        <option name="authN" value="no"/>
+      </message>
+
+      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="MetadataKeyRequest">
+        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyServiceEngine"/>
+        <option name="authN" value="no"/>
+      </message>
+
+      <message 
handler="org.perfsonar.base2.service.messages.GenericMessageHandler" 
type="SetupDataRequest">
+        <option name="ServiceEngine" 
value="org.perfsonar.service.measurementArchive.rrdType.SetupDataServiceEngine"/>
+        <option name="authN" value="no"/>
+      </message>
+
+    </messageHandler>
+
+    <!-- 
....................................................................................
 -->
+
+    <!-- Additional auxiliary components -->
+
+    <auxiliaryComponents>
+
+      <component 
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent" 
name="exist">
+        <option name="dataStorageClassName" 
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
+        <option name="uri" value="#replace(string 
"${component.ma.xmldb.db_uri}" regexp 
"xmldb:exist://(.+)/exist/xmlrpc/db/(.*)" with 
"http://$1/exist/rest/db/$2";)"/>
+        <option name="username" value="${component.ma.xmldb.db_username}"/>
+        <option name="password" value="${component.ma.xmldb.db_password}"/>
+      </component>
+
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager"
 name="queryGeneratorManager">
+
+        <option name="http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.UtilizationQueryGenerator"/>
+
+        <option name="http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.ErrorsQueryGenerator"/>
+
+        <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
+
+        <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";
 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
+
+      </component>
+
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.ExistMetadataStorageDAOImpl"
 name="metadataStorageDAO">
+        <option name="exist-config" value="exist"/> <!-- reference to eXist 
DB XML component config-->
+        <option name="queryGeneratorManager-config" 
value="queryGeneratorManager"/> <!-- reference to queryGeneratorManager 
component config-->
+      </component>
+
+      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
 name="dataStorageDAO">
+        <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
+       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+       <option 
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0"; 
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+      </component>
+
+
+      <!-- Scheduler -->
+      <component 
className="org.perfsonar.base2.service.scheduler.SchedulingComponent" 
name="scheduling">
+
+        <option name="schedulerClassName" 
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
+        <option name="interval" value="1800"/> <!-- sec -->
+
+        <actions>
+
+            <action 
className="org.perfsonar.base2.service.registration.LSRegistrationAction" 
name="registration">
+
+                <option name="status" value="on"/>
+                <option name="interval" value="3500"/> <!-- sec -->
+               <option name="registerDataSource" 
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>
                
+               <option name="registerEventType" 
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+                <option name="registrator" 
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+                <option name="lsAddress-1" value="${service.r.ls_url}"/>
+                <!--
+                <option name ="lsAddress-2"></option>
+                <option name ="lsAddress-3"></option>
+                <option name ="lsAddress-4"></option>
+                <option name ="lsAddress-5"></option>
+                -->
+               
+            </action>
+
+        </actions>
+      </component> 
+
+
+      <!-- auth configuration -->
+      <component 
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
 name="auth">
+               <option name="as_endpoint" 
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+               <option name="comp_id" value="urn:compId"/>
+      </component>
+
+    </auxiliaryComponents>
+
+
+
+    <extension name="registerExtension-registerDataSource">
+        <option name="exist-config" value="exist"/>
+    </extension>
+
+
+
+    <!-- 
....................................................................................
 -->
+
+
+    <!-- Protocol mappings, XML elements and their bingings -->
+
+    <protocolMappings>
+
+      <!-- default mapping -->
+      <element mapping="org.perfsonar.base2.xml.Element" name="*"/>
+
+      <!-- general mappings -->
+      <element mapping="org.perfsonar.base2.xml.nmwg.Message" 
name="{http://ggf.org/ns/nmwg/base/2.0/}message"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Metadata" 
name="{http://ggf.org/ns/nmwg/base/2.0/}metadata"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.EventType" 
name="{http://ggf.org/ns/nmwg/base/2.0/}eventType"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Data" 
name="{http://ggf.org/ns/nmwg/base/2.0/}data"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameters"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Parameter" 
name="{http://ggf.org/ns/nmwg/base/2.0/}parameter"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Key" 
name="{http://ggf.org/ns/nmwg/base/2.0/}key"/>
+
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/base/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Subject" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject"/>
+      <element mapping="org.perfsonar.base2.xml.nmwg.Parameters" 
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"/>
+      <element mapping="org.perfsonar.base2.xml.Element" 
name="{http://ggf.org/ns/nmwg/time/2.0/}time"/>
+
+    </protocolMappings>
+
+    <!-- 
....................................................................................
 -->
+
+
+  </service>
+
+
+</configuration>

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/log4j.properties
===================================================================
--- trunk/perfsonar-java-rrd-ma/conf/log4j.properties   2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/log4j.properties   2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,14 +0,0 @@
-
-## $Id$
-## project : perfSONAR
-## author: romradz
-
-
-log4j.rootLogger=INFO, CONSOLE, psRootAppender
-
-log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.psRootAppender.MaxBackupIndex=11
-log4j.appender.psRootAppender.File=/var/log/perfsonar-java-rrd-ma/perfsonar.log
-log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.appender.psRootAppender.MaxFileSize=500KB

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/log4j.properties (from rev 
5636, trunk/perfsonar-java-rrd-ma/conf/log4j.properties)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/log4j.properties                 
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/log4j.properties   2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,14 @@
+
+## $Id$
+## project : perfSONAR
+## author: romradz
+
+
+log4j.rootLogger=INFO, CONSOLE, psRootAppender
+
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.psRootAppender.MaxBackupIndex=11
+log4j.appender.psRootAppender.File=/var/log/perfsonar-java-rrd-ma/perfsonar.log
+log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.psRootAppender.MaxFileSize=2000KB

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/webAdminConfig.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma/conf/webAdminConfig.xml 2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/webAdminConfig.xml 2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<wa:interface
-       xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>
-       
-       <!-- service information cosists of name nad version (only for 
displaying purpose) and accessPoint - selfTest -->
-       <wa:serviceInformation>
-               
<wa:accessPoint>http://localhost:8180/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
-               <wa:serviceName>perfSONAR RRD MA</wa:serviceName>
-               <wa:version>3.3rc1</wa:version>
-       </wa:serviceInformation>
-       
-       <!-- credential for WA -->
-       <wa:credential>
-               <wa:username>perfsonaruser</wa:username>
-               <wa:password>perfsonarpass</wa:password>
-       </wa:credential>
-       
-       <wa:basiclink>
-               <wa:pageId>basic</wa:pageId> <!-- page identifier -->
-               <wa:title>Service settings</wa:title>
-       </wa:basiclink>
-       
-       <wa:basiclink>
-               <wa:pageId>changePassword</wa:pageId> <!-- page identifier -->
-               <wa:title>Change WA password</wa:title>
-       </wa:basiclink>
-
-       <wa:advancedlink>
-               <wa:pageId>advanced</wa:pageId> <!-- page identifier -->
-               <wa:title>Advanced Service Settings</wa:title>
-       </wa:advancedlink>
-       
-       <wa:advancedlink>
-               <wa:redirectTo>http://localhost:8180/exist</wa:redirectTo>
-               <wa:title>Exist configuration</wa:title>
-       </wa:advancedlink>
-
-       <wa:map>
-               
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
-               <wa:ns>ns1</wa:ns>
-       </wa:map>
-       
-       <wa:map>
-               
<wa:url>http://webadmin.perfsonar.org/base2/waschema/v20090201</wa:url>
-               <wa:ns>webAdmin</wa:ns>
-       </wa:map>
-       
-       <wa:page>
-               <wa:pageId><wa:text>changePassword</wa:text></wa:pageId>
-               <wa:title><wa:text>Change Password</wa:text></wa:title>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:interface/webAdmin:credential/webAdmin:username
-                                       </wa:xpath>
-                               </wa:default>
-                               
<wa:title><wa:text>username</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:password>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:interface/webAdmin:credential/webAdmin:password
-                                       </wa:xpath>
-                               </wa:default>
-                               
<wa:title><wa:text>password</wa:text></wa:title>
-                       </wa:password>
-               </wa:plain>
-       </wa:page>
-
-       <wa:page>
-               <wa:pageId><wa:text>basic</wa:text></wa:pageId>
-               <wa:title><wa:text>Basic configuration</wa:text></wa:title>
-
-<!--Basic service config -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Access 
point</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Service 
name</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Service 
type</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-
-<!--eXist config -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="uri"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Exist DB 
address</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="username"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Exist DB 
username</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="password"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Exist DB 
password</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-
-<!--LS config  -->
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service 
registration: </wa:text></wa:title>
-                               
<wa:values><wa:text>on,off</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service ulr 
adress</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-       <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service 
registration interval in seconds</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-       </wa:page>      
-       <wa:page>
-               <wa:pageId><wa:text>advanced</wa:text></wa:pageId>
-               <wa:title><wa:text>Advanced configuration</wa:text></wa:title>
-<!--Basic service config -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Access 
point</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Service 
name</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Service 
type</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-
-<!--eXist config -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="uri"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Exist DB 
address</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="username"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Exist DB 
username</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="password"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Exist DB 
password</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-
-<!--LS config  -->
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service 
registration: </wa:text></wa:title>
-                               
<wa:values><wa:text>on,off</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service ulr 
adress</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Lookup Service 
registration interval in seconds</wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
- <!-- auth configuration -->
-               <wa:plain>
-                       <wa:textbox>
-                               <wa:default>
-                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="auth"]/ns1:option[@name="as_endpoint"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Authorization endpoint 
url: </wa:text></wa:title>
-                       </wa:textbox>
-               </wa:plain>
-<!-- authorization of requests -->
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Echo Request 
authorization</wa:text></wa:title>
-                               
<wa:values><wa:text>no,yes</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
-
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="MetadataKeyRequest"]/ns1:option[@name="authN"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Metadata Key Request 
authorization</wa:text></wa:title>
-                               
<wa:values><wa:text>no,yes</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
-
-               <wa:plain>
-                       <wa:radio>
-                               <wa:default>
-                                       <wa:xpath>
-                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="SetupDataRequest"]/ns1:option[@name="authN"]/@value
-                                       </wa:xpath>
-                               </wa:default>
-                               <wa:title><wa:text>Setup Data Request 
authorization</wa:text></wa:title>
-                               
<wa:values><wa:text>no,yes</wa:text></wa:values>
-                       </wa:radio>
-               </wa:plain>
-       </wa:page>
-</wa:interface>

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/webAdminConfig.xml (from rev 
5705, trunk/perfsonar-java-rrd-ma/conf/webAdminConfig.xml)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/webAdminConfig.xml               
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/conf/webAdminConfig.xml 2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<wa:interface
+       xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>
+       
+       <!-- service information cosists of name nad version (only for 
displaying purpose) and accessPoint - selfTest -->
+       <wa:serviceInformation>
+               
<wa:accessPoint>http://localhost:8180/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
+               <wa:serviceName>perfSONAR RRD MA</wa:serviceName>
+               <wa:version>3.3rc3</wa:version>
+       </wa:serviceInformation>
+       
+       <!-- credential for WA -->
+       <wa:credential>
+               <wa:username>perfsonaruser</wa:username>
+               <wa:password>perfsonarpass</wa:password>
+       </wa:credential>
+       
+       <wa:basiclink>
+               <wa:pageId>basic</wa:pageId> <!-- page identifier -->
+               <wa:title>Service settings</wa:title>
+       </wa:basiclink>
+       
+       <wa:basiclink>
+               <wa:pageId>changePassword</wa:pageId> <!-- page identifier -->
+               <wa:title>Change WA password</wa:title>
+       </wa:basiclink>
+
+       <wa:advancedlink>
+               <wa:pageId>advanced</wa:pageId> <!-- page identifier -->
+               <wa:title>Advanced Service Settings</wa:title>
+       </wa:advancedlink>
+       
+       <wa:advancedlink>
+               <wa:redirectTo>http://localhost:8180/exist</wa:redirectTo>
+               <wa:title>Exist configuration</wa:title>
+       </wa:advancedlink>
+
+       <wa:map>
+               
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
+               <wa:ns>ns1</wa:ns>
+       </wa:map>
+       
+       <wa:map>
+               
<wa:url>http://webadmin.perfsonar.org/base2/waschema/v20090201</wa:url>
+               <wa:ns>webAdmin</wa:ns>
+       </wa:map>
+       
+       <wa:page>
+               <wa:pageId><wa:text>changePassword</wa:text></wa:pageId>
+               <wa:title><wa:text>Change Password</wa:text></wa:title>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:interface/webAdmin:credential/webAdmin:username
+                                       </wa:xpath>
+                               </wa:default>
+                               
<wa:title><wa:text>username</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:password>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:interface/webAdmin:credential/webAdmin:password
+                                       </wa:xpath>
+                               </wa:default>
+                               
<wa:title><wa:text>password</wa:text></wa:title>
+                       </wa:password>
+               </wa:plain>
+       </wa:page>
+
+       <wa:page>
+               <wa:pageId><wa:text>basic</wa:text></wa:pageId>
+               <wa:title><wa:text>Basic configuration</wa:text></wa:title>
+
+<!--Basic service config -->
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Access 
point</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Service 
name</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Service 
type</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+
+<!--eXist config -->
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="uri"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Exist DB 
address</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="username"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Exist DB 
username</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="password"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Exist DB 
password</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+
+<!--LS config  -->
+               <wa:plain>
+                       <wa:radio>
+                               <wa:default>
+                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Lookup Service 
registration: </wa:text></wa:title>
+                               
<wa:values><wa:text>on,off</wa:text></wa:values>
+                       </wa:radio>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Lookup Service ulr 
adress</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+       <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Lookup Service 
registration interval in seconds</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+       </wa:page>      
+       <wa:page>
+               <wa:pageId><wa:text>advanced</wa:text></wa:pageId>
+               <wa:title><wa:text>Advanced configuration</wa:text></wa:title>
+<!--Basic service config -->
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Access 
point</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Service 
name</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Service 
type</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+
+<!--eXist config -->
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="uri"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Exist DB 
address</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="username"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Exist DB 
username</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="exist"]/ns1:option[@name="password"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Exist DB 
password</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+
+<!--LS config  -->
+               <wa:plain>
+                       <wa:radio>
+                               <wa:default>
+                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Lookup Service 
registration: </wa:text></wa:title>
+                               
<wa:values><wa:text>on,off</wa:text></wa:values>
+                       </wa:radio>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Lookup Service ulr 
adress</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Lookup Service 
registration interval in seconds</wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+ <!-- auth configuration -->
+               <wa:plain>
+                       <wa:textbox>
+                               <wa:default>
+                                       
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="auth"]/ns1:option[@name="as_endpoint"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Authorization endpoint 
url: </wa:text></wa:title>
+                       </wa:textbox>
+               </wa:plain>
+<!-- authorization of requests -->
+               <wa:plain>
+                       <wa:radio>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Echo Request 
authorization</wa:text></wa:title>
+                               
<wa:values><wa:text>no,yes</wa:text></wa:values>
+                       </wa:radio>
+               </wa:plain>
+
+               <wa:plain>
+                       <wa:radio>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="MetadataKeyRequest"]/ns1:option[@name="authN"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Metadata Key Request 
authorization</wa:text></wa:title>
+                               
<wa:values><wa:text>no,yes</wa:text></wa:values>
+                       </wa:radio>
+               </wa:plain>
+
+               <wa:plain>
+                       <wa:radio>
+                               <wa:default>
+                                       <wa:xpath>
+                                               
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="SetupDataRequest"]/ns1:option[@name="authN"]/@value
+                                       </wa:xpath>
+                               </wa:default>
+                               <wa:title><wa:text>Setup Data Request 
authorization</wa:text></wa:title>
+                               
<wa:values><wa:text>no,yes</wa:text></wa:values>
+                       </wa:radio>
+               </wa:plain>
+       </wa:page>
+</wa:interface>

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/changelog
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/deb/changelog 2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/changelog 2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,144 +0,0 @@
-perfsonar-java-rrd-ma (3.3-1) stable; urgency=low
-
-  * New Web admin implemented
-  * Old configuration.xml file replaced with new. The old file renamed to 
'configuration.xml.old'. This is temporary solution until new idea about conf 
files replecament system is invent.
- -- Piotr Pikusa 
<>
  Wed, 22 Mar 2010 16:00:00 +0200
-
-perfsonar-java-rrd-ma (3.3-0) stable; urgency=low
-
-  * New: Use of new base library (base2)
-  * Change: Removed WebAdmin. New WebAdmin will be available in the next rc
-  * Change: Renamed service. Now the name of the service is: 
perfsonar-java-rrd-ma
-  * Change: Directory structure changed - now the main service directory is: 
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
-  * Change: Url changed. Now the service url is: 
http://localhost:8180/perfsonar-java-rrd-ma/services/MeasurementArchiveService
-  * Change: Configuration files changed. Now the main conf file is: 
configuration.xml
-  * Change: SVN migration. Now the SVN adress is: 
http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-java-rrd-ma
-
- -- Piotr Pikusa 
<>
  Wed, 25 Feb 2010 16:00:00 +0200
-
-perfsonar-java-rrd-ma (3.2) stable; urgency=low
-
-  * Change: Removed Admin Guide from doc directory. Up-to-date Admin Guide 
is now available only on svn
-  * Change: Rename package from geant2-java-sql-ma to perfsonar-java-sql-ma
-  
- -- Piotr Pikusa 
<>
  Wed, 08 Jul 2009 13:00:00 +0200
-
-geant2-java-rrd-ma (3.1.2-1) stable; urgency=low
-
-  * Dummy package to rename service from geant2-java-rrd-ma to 
perfsonar-java-rrd-ma
-  
- -- Piotr Pikusa 
<>
  Wed, 08 Jul 2009 13:00:00 +0200
-
-geant2-java-rrd-ma (3.1.1-1) stable; urgency=low
-
-  * Fixed Bug #724: wrong paths of log files
-
- -- Roman Lapacz 
<>
  Wed, 04 Mar 2009 12:00:00 +0200
-
-geant2-java-rrd-ma (3.1-1) stable; urgency=low
-
-  * New: EchoRequest message allows now checking: if eXist database is 
running and the count the content of metadata configuration file; access data 
from random RRD file. It is also possible to request a self-test including 
all above.
-  * New: parameter keyword introduced in metadata block to indicate 
project/organisation name
-  * New: new request MeasurementArchiveStoreRequest switched off by default
-  * New: performance improvements for MetadataKeyRequest message which 
fetches all metadata elements
-  * Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
-  * Change: format of log messages changed
-  * Change: use of pSbase v1.0.20080902
-  * Change: use of web admin library v0.9.3c
-  * Change: eXist default port is 8180
-  * Change: obsolete authRealm removed from metadata configuration file
-  * Fixed Bug #497: default value of service.r.access_point property
-  * Fixed Bug #405: request for ability to define which domain is the 
interface (solved via keyword)
-
- -- Roman Lapacz 
<>
  Wed, 01 Oct 2008 12:00:00 +0200
-
-geant2-java-rrd-ma (3.0-1) stable; urgency=low
-
-  * New: support of ErrorResponse message type (use of perfsonar-base 
library version 1.0.20080310)
-  * New: netutil namespace of datum element in the response containing 
utilization value is used.
-  * New: WebAdmin administration (set of servlets) added
-  * New: RPM is used as the installation package
-  * New: support of AuthN functionality
-  * Change: supportedEventTypes parameter in metadata element (in metadata 
cofiguration file) replaced with eventType element (the parameter is still 
supported)
-  * Change: LS register component can now take metadata elements from xml 
database directly (not only from XML metadata config file)
-  * Change: LS register interval time updated (now it's 12 hours)
-  * Change: service name has changed (now it is geant2-java-rrd-ma)
-
- -- Roman Lapacz 
<>
  Mon, 10 Mar 2008 12:00:00 +0200
-
-geant2-java-rrd-ma (2.3.2-1) stable; urgency=low
-
-  * New: the dump of rrd test file added
-  * Fixed Bug #264: bulding the rrdjtool library for 64 bit arch fixed
-
- -- Roman Lapacz 
<>
  Fri, 23 Nov 2007 12:00:00 +0200
-
-geant2-java-rrd-ma (2.3.1-1) stable; urgency=low
-
-  * Fixed Bug #243: problem with static default context name of eXist in URL 
address fixed
-
- -- Roman Lapacz 
<>
  Fri, 26 Oct 2007 12:00:00 +0200
-
-geant2-java-rrd-ma (2.3-1) stable; urgency=low
-
-  * New: support for two additional characteristics: ifErrors and ifDiscards
-  * New: new RRD test file to reflect new characteristics
-  * New: eventType paremeter added to the key
-  * Change: nmwg namespace for utilization datum element
-  * Change: defaultly all log messages are collected in one log file
-  * Change: defaultly debug log level is switched off
-  * Change: base chanining switched on, propert in service.properties exist 
to switch it off 
-  * Change: eventType URL-based only
-  * Change: service moved to new SVN structure
-  * Change: ant scripts improved
-  * Change: namespace of datum elements in SetupDataResponse message tied to 
eventType value 
-  * Change: supportedEventType parameter replaced by eventType element in 
metadata config file (excluding utilization). But service supports both
-  * Change: use of new versions of base and NMWG libraries
-  * Change: if 'jar' target is called and const.properties file does not 
exist then const.properties.template is renamed into const.properties before 
compilation
-  * Change: new parameters set in data element in SetupDataResponse message 
containing general parameters used to create rrd file
-  * Change: updated support for LookupInfoRequest to include all service 
properties
-  * Change: service can generate keys with parameters elements of different 
namespaces
-  * Fixed Bug #102: missing data in response
-  * Fixed Bug #103: missing data in response
-  * Fixed Bug #150: time interval shifted
-  * Fixed Bug #157: namespace declaration
-  * Fixed Bug #195: directories structure
-  * Fixed Bug #198: exist database installation and initialisation 
limitations
-  * Fixed Bug #221: supportedEventType vs eventType compatibility issue
-
- -- Roman Lapacz 
<>
  Wed, 24 Oct 2007 12:00:00 +0200
-
-geant2-java-rrd-ma (2.2-1) stable; urgency=low
-
-  * Change: default log4j parameters updated; can generate 11 archive log 
files for each log level (500KB each)
-  * Change: bug of wrong Context of exist war file fixed
-  * Change: bug of wrong data source name when writing data into new RRD 
file fixed. Using new eventType was causing a problem while storing new data 
in RRD MA
-
- -- Roman Lapacz 
<>
  Tue, 22 May 2007 12:00:00 +0200
-
-geant2-java-rrd-ma (2.1-1) stable; urgency=low
-
-  * New: Support for LookupInfoRequest for getting general information about 
the service
-  * New: Key contains optional parameters describing RRD file: step, data 
type, heartbeat, min and max value
-  * New: Configure script asks for service description, contact email and 
organization name
-  * New: Iso time type support
-  * Change: using only one exception class
-
- -- Roman Lapacz 
<>
  Tue, 15 May 2007 12:00:00 +0200
-
-geant2-java-rrd-ma (2.0-1) stable; urgency=low
-
-  * New: Lookup Service registration
-  * New: pre-install, configure, deploy, test steps in installation process
-  * New: echoRequest functionality
-  * New: 64-bit Linux support for building the rrdjtool library
-  * New: result codes
-  * New: support for mulitple service in one Tomcat instance
-  * New: removing whitespaces such as newline, tabs, etc that are present in 
the request messages
-  * Change: support for new utilization evenType value naming scheme
-  * Change: log4J configuration in log4j.properties
-  * Fixed Bug #108: installation process
-  * Fixed Bug #109: installation process
-
- -- Roman Lapacz 
<>
  Wed, 21 Mar 2007 12:00:00 +0200
-

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/changelog (from rev 
5740, trunk/perfsonar-java-rrd-ma/packaging/deb/changelog)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/changelog               
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/changelog 2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,164 @@
+perfsonar-java-rrd-ma (3.3rc4) unstable; urgency=low
+
+  * Fixed: Reopened PSSERVICES-484
+  * Fixed: PSSERVICES-517 - psbase2 version 1.0.4 included
+ -- Piotr Pikusa 
<>
  Tue, 24 Aug 2010 14:00:00 +0200
+
+perfsonar-java-rrd-ma (3.3rc3) unstable; urgency=low
+
+  * Fixed: PSSERVICES-494
+  * Fixed: PSSERVICES-501
+  * Fixed: PSSERVICES-469
+  * New: PSSERVICES-484 - Created a migration component to rewrite the 
psbase-1 configuration files (service.properties) to psbase-2 
(configuration.xml) - 
+  * New: PSSERVICES-490 - Redirector copomponent - redirect request for old 
url (genat2-java-rrd-ma) to the new one (perfsonar-java-rrd-ma)
+  * Change: Updated dependency of exist package. Change from 
"tomcat5.5-exist" to "exist" which contanis exist v1.2.6
+ -- Piotr Pikusa 
<>
  Thr, 10 Jul 2010 16:00:00 +0200
+
+perfsonar-java-rrd-ma (3.3-3) unstable; urgency=low
+
+ -- Piotr Pikusa 
<>
  Wed, 12 May 2010 16:00:00 +0200
+
+perfsonar-java-rrd-ma (3.3-2) unstable; urgency=low
+
+  * New: New Web admin implemented
+  * Old configuration.xml file replaced with new. The old file renamed to 
'configuration.xml.old'. This is temporary solution until new idea about conf 
files replecament system is invented.
+ -- Piotr Pikusa 
<>
  Wed, 22 Mar 2010 16:00:00 +0200
+
+perfsonar-java-rrd-ma (3.3-1) unstable; urgency=low
+
+  * New: Use of new base library (base2)
+  * Change: Removed WebAdmin. New WebAdmin will be available in the next rc
+  * Change: Renamed service. Now the name of the service is: 
perfsonar-java-rrd-ma
+  * Change: Directory structure changed - now the main service directory is: 
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
+  * Change: Url changed. Now the service url is: 
http://localhost:8180/perfsonar-java-rrd-ma/services/MeasurementArchiveService
+  * Change: Configuration files changed. Now the main conf file is: 
configuration.xml
+  * Change: SVN migration. Now the SVN adress is: 
http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-java-rrd-ma
+
+ -- Piotr Pikusa 
<>
  Wed, 25 Feb 2010 16:00:00 +0200
+
+perfsonar-java-rrd-ma (3.2) stable; urgency=low
+
+  * Change: Removed Admin Guide from doc directory. Up-to-date Admin Guide 
is now available only on svn
+  * Change: Rename package from geant2-java-sql-ma to perfsonar-java-sql-ma
+  
+ -- Piotr Pikusa 
<>
  Wed, 08 Jul 2009 13:00:00 +0200
+
+geant2-java-rrd-ma (3.1.2-1) stable; urgency=low
+
+  * Dummy package to rename service from geant2-java-rrd-ma to 
perfsonar-java-rrd-ma
+  
+ -- Piotr Pikusa 
<>
  Wed, 08 Jul 2009 13:00:00 +0200
+
+geant2-java-rrd-ma (3.1.1-1) stable; urgency=low
+
+  * Fixed Bug #724: wrong paths of log files
+
+ -- Roman Lapacz 
<>
  Wed, 04 Mar 2009 12:00:00 +0200
+
+geant2-java-rrd-ma (3.1-1) stable; urgency=low
+
+  * New: EchoRequest message allows now checking: if eXist database is 
running and the count the content of metadata configuration file; access data 
from random RRD file. It is also possible to request a self-test including 
all above.
+  * New: parameter keyword introduced in metadata block to indicate 
project/organisation name
+  * New: new request MeasurementArchiveStoreRequest switched off by default
+  * New: performance improvements for MetadataKeyRequest message which 
fetches all metadata elements
+  * Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
+  * Change: format of log messages changed
+  * Change: use of pSbase v1.0.20080902
+  * Change: use of web admin library v0.9.3c
+  * Change: eXist default port is 8180
+  * Change: obsolete authRealm removed from metadata configuration file
+  * Fixed Bug #497: default value of service.r.access_point property
+  * Fixed Bug #405: request for ability to define which domain is the 
interface (solved via keyword)
+
+ -- Roman Lapacz 
<>
  Wed, 01 Oct 2008 12:00:00 +0200
+
+geant2-java-rrd-ma (3.0-1) stable; urgency=low
+
+  * New: support of ErrorResponse message type (use of perfsonar-base 
library version 1.0.20080310)
+  * New: netutil namespace of datum element in the response containing 
utilization value is used.
+  * New: WebAdmin administration (set of servlets) added
+  * New: RPM is used as the installation package
+  * New: support of AuthN functionality
+  * Change: supportedEventTypes parameter in metadata element (in metadata 
cofiguration file) replaced with eventType element (the parameter is still 
supported)
+  * Change: LS register component can now take metadata elements from xml 
database directly (not only from XML metadata config file)
+  * Change: LS register interval time updated (now it's 12 hours)
+  * Change: service name has changed (now it is geant2-java-rrd-ma)
+
+ -- Roman Lapacz 
<>
  Mon, 10 Mar 2008 12:00:00 +0200
+
+geant2-java-rrd-ma (2.3.2-1) stable; urgency=low
+
+  * New: the dump of rrd test file added
+  * Fixed Bug #264: bulding the rrdjtool library for 64 bit arch fixed
+
+ -- Roman Lapacz 
<>
  Fri, 23 Nov 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.3.1-1) stable; urgency=low
+
+  * Fixed Bug #243: problem with static default context name of eXist in URL 
address fixed
+
+ -- Roman Lapacz 
<>
  Fri, 26 Oct 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.3-1) stable; urgency=low
+
+  * New: support for two additional characteristics: ifErrors and ifDiscards
+  * New: new RRD test file to reflect new characteristics
+  * New: eventType paremeter added to the key
+  * Change: nmwg namespace for utilization datum element
+  * Change: defaultly all log messages are collected in one log file
+  * Change: defaultly debug log level is switched off
+  * Change: base chanining switched on, propert in service.properties exist 
to switch it off 
+  * Change: eventType URL-based only
+  * Change: service moved to new SVN structure
+  * Change: ant scripts improved
+  * Change: namespace of datum elements in SetupDataResponse message tied to 
eventType value 
+  * Change: supportedEventType parameter replaced by eventType element in 
metadata config file (excluding utilization). But service supports both
+  * Change: use of new versions of base and NMWG libraries
+  * Change: if 'jar' target is called and const.properties file does not 
exist then const.properties.template is renamed into const.properties before 
compilation
+  * Change: new parameters set in data element in SetupDataResponse message 
containing general parameters used to create rrd file
+  * Change: updated support for LookupInfoRequest to include all service 
properties
+  * Change: service can generate keys with parameters elements of different 
namespaces
+  * Fixed Bug #102: missing data in response
+  * Fixed Bug #103: missing data in response
+  * Fixed Bug #150: time interval shifted
+  * Fixed Bug #157: namespace declaration
+  * Fixed Bug #195: directories structure
+  * Fixed Bug #198: exist database installation and initialisation 
limitations
+  * Fixed Bug #221: supportedEventType vs eventType compatibility issue
+
+ -- Roman Lapacz 
<>
  Wed, 24 Oct 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.2-1) stable; urgency=low
+
+  * Change: default log4j parameters updated; can generate 11 archive log 
files for each log level (500KB each)
+  * Change: bug of wrong Context of exist war file fixed
+  * Change: bug of wrong data source name when writing data into new RRD 
file fixed. Using new eventType was causing a problem while storing new data 
in RRD MA
+
+ -- Roman Lapacz 
<>
  Tue, 22 May 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.1-1) stable; urgency=low
+
+  * New: Support for LookupInfoRequest for getting general information about 
the service
+  * New: Key contains optional parameters describing RRD file: step, data 
type, heartbeat, min and max value
+  * New: Configure script asks for service description, contact email and 
organization name
+  * New: Iso time type support
+  * Change: using only one exception class
+
+ -- Roman Lapacz 
<>
  Tue, 15 May 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.0-1) stable; urgency=low
+
+  * New: Lookup Service registration
+  * New: pre-install, configure, deploy, test steps in installation process
+  * New: echoRequest functionality
+  * New: 64-bit Linux support for building the rrdjtool library
+  * New: result codes
+  * New: support for mulitple service in one Tomcat instance
+  * New: removing whitespaces such as newline, tabs, etc that are present in 
the request messages
+  * Change: support for new utilization evenType value naming scheme
+  * Change: log4J configuration in log4j.properties
+  * Fixed Bug #108: installation process
+  * Fixed Bug #109: installation process
+
+ -- Roman Lapacz 
<>
  Wed, 21 Mar 2007 12:00:00 +0200
+

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/conffiles
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/deb/conffiles 2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/conffiles 2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,6 +0,0 @@
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/configuration.xml
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/configuration-rules.xml
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/log4j.properties
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/conf/axis2.xml
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/web.xml
-

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/conffiles (from rev 
5626, trunk/perfsonar-java-rrd-ma/packaging/deb/conffiles)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/conffiles               
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/conffiles 2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,5 @@
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/configuration.xml
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/log4j.properties
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/conf/axis2.xml
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/web.xml
+

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/control
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/deb/control   2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/control   2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,12 +0,0 @@
-Source: perfsonar-java-rrd-ma
-Section: web
-Priority: extra
-Maintainer: Piotr Pikusa 
<>
-Build-Depends: debhelper (>= 5), maven2
-Standards-Version: 3.7.2
-
-Package: perfsonar-java-rrd-ma
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5-exist, rrdjtool, 
rrdtool, java6-runtime
-Description: perfSONAR Round Robin Database
-

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/control (from rev 
5706, trunk/perfsonar-java-rrd-ma/packaging/deb/control)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/control                 
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/control   2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,12 @@
+Source: perfsonar-java-rrd-ma
+Section: web
+Priority: extra
+Maintainer: Piotr Pikusa 
<>
+Build-Depends: debhelper (>= 5), maven2
+Standards-Version: 3.7.2
+
+Package: perfsonar-java-rrd-ma
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, exist, rrdtool, java6-runtime, 
rrdjtool-debian5|rrdjtool
+Description: perfSONAR Round Robin Database
+

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/dirs
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/deb/dirs      2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/dirs      2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,2 +0,0 @@
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
-/var/run/perfsonar-java-rrd-ma

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/dirs (from rev 
5695, trunk/perfsonar-java-rrd-ma/packaging/deb/dirs)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/dirs                    
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/dirs      2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,3 @@
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
+/usr/lib/perfsonar/services/geant2-java-rrd-ma
+/var/run/perfsonar-java-rrd-ma

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/install
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/deb/install   2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/install   2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,7 +0,0 @@
-build/perfsonar-java-rrd-ma/* 
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
-doc /usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF
-samples /usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF
-
-
-
-

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/install (from rev 
5696, trunk/perfsonar-java-rrd-ma/packaging/deb/install)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/install                 
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/install   2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,8 @@
+build/perfsonar-java-rrd-ma/* 
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
+build/geant2-java-rrd-ma/* /usr/lib/perfsonar/services/geant2-java-rrd-ma
+doc /usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF
+samples /usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF
+
+
+
+

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/postinst
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/deb/postinst  2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/postinst  2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,105 +0,0 @@
-#!/bin/sh
-# postinst script for ps-mdm-rrd-ma
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-SERVICENAME="perfsonar-java-rrd-ma"
-SERVICEPATH="/usr/lib/perfsonar/services"
-
-
-
-case "$1" in
-    configure)
-
-
-    #Bug fix for a previous package version,
-    #where symbolic links where not removed on package removal
-    OLD_SERVICE_NAME=geant2-java-rrd-ma
-    if [ -e /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME ]; then
-      rm -rf /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME
-    fi
-
-    if [ -e /etc/$OLD_SERVICE_NAME ]; then
-      rm -rf /etc/$OLD_SERVICE_NAME/*
-    fi    
-
-    if [ -e /var/log/$OLD_SERVICE_NAME ]; then
-      rm -rf /var/log/$OLD_SERVICE_NAME
-    fi
-
-    if [ -e /usr/share/doc/$OLD_SERVICE_NAME ]; then
-      rm -rf /usr/share/doc/$OLD_SERVICE_NAME
-    fi
-
-    
-
-    #Installing new service
-    if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
-    then
-        rm /var/lib/tomcat5.5/webapps/$SERVICENAME
-    fi
-    ln -sf $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME 
|| true
-
-
-    if [ -h /etc/$SERVICENAME ]
-    then
-        rm /etc/$SERVICENAME
-    fi
-    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf 
/etc/$SERVICENAME || true
-
-
-    if [ -h /var/log/$SERVICENAME ]
-    then
-        rm /var/log/$SERVICENAME
-    fi
-
-    mkdir -p $SERVICEPATH/$SERVICENAME/WEB-INF/log
-    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/log /var/log/$SERVICENAME || 
true
-
-
-    if [ -h /usr/share/doc/$SERVICENAME/spec ]
-    then
-        rm /usr/share/doc/$SERVICENAME/spec
-    fi
-    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc 
/usr/share/doc/$SERVICENAME/spec || true
-
-
-    chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
-    chown tomcat55 /var/run/$SERVICENAME
-    chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
-
-    /etc/init.d/tomcat5.5 restart
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/postinst (from rev 
5702, trunk/perfsonar-java-rrd-ma/packaging/deb/postinst)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/postinst                
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/postinst  2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,103 @@
+#!/bin/sh
+# postinst script for ps-mdm-rrd-ma
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+SERVICENAME="perfsonar-java-rrd-ma"
+SERVICEPATH="/usr/lib/perfsonar/services"
+
+
+
+case "$1" in
+    configure)
+
+
+    #Bug fix for a previous package version,
+    #where symbolic links where not removed on package removal
+    
+    OLD_SERVICE_NAME=geant2-java-rrd-ma
+    if [ -e /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME ]; then
+      rm -rf /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME
+    fi
+
+    if [ -e /var/log/$OLD_SERVICE_NAME ]; then
+      rm -rf /var/log/$OLD_SERVICE_NAME
+    fi
+
+    if [ -e /usr/share/doc/$OLD_SERVICE_NAME ]; then
+      rm -rf /usr/share/doc/$OLD_SERVICE_NAME
+    fi
+
+    
+
+    #Installing new service
+    if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
+    then
+        rm /var/lib/tomcat5.5/webapps/$SERVICENAME
+    fi
+    ln -sf $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME 
|| true
+    ln -sf $SERVICEPATH/$SERVICENAME 
/var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME || true
+
+
+    if [ -h /etc/$SERVICENAME ]
+    then
+        rm /etc/$SERVICENAME
+    fi
+    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf 
/etc/$SERVICENAME || true
+
+
+#    if [ -h /var/log/$SERVICENAME ]
+#    then
+#        rm /var/log/$SERVICENAME
+#    fi
+
+    mkdir -p $SERVICEPATH/$SERVICENAME/WEB-INF/log
+    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/log /var/log/$SERVICENAME || 
true
+
+
+    if [ -h /usr/share/doc/$SERVICENAME/spec ]
+    then
+        rm /usr/share/doc/$SERVICENAME/spec
+    fi
+    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc 
/usr/share/doc/$SERVICENAME/spec || true
+
+
+    chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
+    chown tomcat55 /var/run/$SERVICENAME
+    chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
+
+    /etc/init.d/tomcat5.5 restart
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/preinst
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/deb/preinst   2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/preinst   2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,45 +0,0 @@
-#!/bin/sh
-# preinst script for ps-mdm-rrd-ma
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-SERVICEPATH="/usr/lib/perfsonar/services"
-SERVICENAME="perfsonar-java-rrd-ma"
-case "$1" in
-    install|upgrade)
-    #Temporary solution to make conffiles updatetable - renaming 
configuration.xml to confguration.xml.old 
-    if [ -e 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml ]; 
then
-       cp 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml.old
-    fi    
-
-       
-
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/preinst (from rev 
5698, trunk/perfsonar-java-rrd-ma/packaging/deb/preinst)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/preinst                 
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/deb/preinst   2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,45 @@
+#!/bin/sh
+# preinst script for ps-mdm-rrd-ma
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+SERVICEPATH="/usr/lib/perfsonar/services"
+SERVICENAME="perfsonar-java-rrd-ma"
+case "$1" in
+    install|upgrade)
+    #Temporary solution to make conffiles updatetable - renaming 
configuration.xml to confguration.xml.old 
+    #if [ -e 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml ]; 
then
+    #  cp 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml.old
+    #fi    
+
+       
+
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.conf
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/package.conf  2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.conf  2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,14 +0,0 @@
-#
-# Config for package.sh script
-#
-
-#
-# important for correct build of RPM package ! (must be the same as in .spec 
file)
-
-
-CURR_DIR=$(pwd)
-RPM_VERSION="3.3"
-RPM_SPEC_NAME="ps-mdm-rrd-ma.specs"
-
-SERVICE_NAME="perfsonar-java-rrd-ma"
-

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.conf (from rev 
5699, trunk/perfsonar-java-rrd-ma/packaging/package.conf)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.conf                
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.conf  2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,15 @@
+#
+# Config for package.sh script
+#
+
+#
+# important for correct build of RPM package ! (must be the same as in .spec 
file)
+
+
+CURR_DIR=$(pwd)
+RPM_VERSION="3.3"
+RPM_SPEC_NAME="ps-mdm-rrd-ma.specs"
+
+SERVICE_NAME="perfsonar-java-rrd-ma"
+OLD_NAME="geant2-java-rrd-ma"
+

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.sh
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/package.sh    2010-05-11 10:33:53 
UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.sh    2010-09-13 
15:13:12 UTC (rev 5749)
@@ -1,194 +0,0 @@
-
-#!/bin/sh
-#author: Slawomir Trzaszczka 
<>
-#update: Piotr Pikusa 
<>
-. package.conf
-
-
-do_clean_up() {
-
-       echo " CLEAN UP"
-       cd $CURR_DIR
-       sudo rm -rf temp
-       sudo rm -rf target 
-       echo
-
-}
-
-#
-# build project using maven
-# 1) build project using maven
-# 2) unzip .war into webapps directory
-#
-do_structure() {
-       
-       echo " CREATE STRUCT"
-
-       cd $CURR_DIR
-       rm -rfv temp
-       mkdir temp
-       mkdir temp/webapps
-       pwd
-       echo "done !"
-       echo
-       echo  
-
-}
-
-#
-# create debian structure
-# 1)create directories deb{debian,build}
-# 2)copy required configuration files for deb-packaging 
-#
-do_deb_struct() {
-       
-       cd $CURR_DIR
-       echo " CREATE DEB STRUCT"
-       echo "[ ] Removing old deb"
-       rm -rfv temp/deb
-       mkdir -v temp/deb
-       mkdir -v temp/deb/debian
-       mkdir -v temp/deb/build
-       mkdir -v temp/deb/doc
-       mkdir -v temp/deb/samples
-       mkdir -v temp/deb/build/$SERVICE_NAME
-       echo " Copying build/perfsonar-java-rrd-ma to temp/deb/build"   
-       cp -av ../build/$SERVICE_NAME/* temp/deb/build/$SERVICE_NAME/
-       echo " Copying doc file"
-       cp -v ../doc/* temp/deb/doc/
-       echo " Copying samples file"
-       cp -v ../samples/* temp/deb/samples/
-       echo "[ ] Copying package files"    
-       cp -v deb/* temp/deb/debian
-       echo
-       echo 
-
-}
-
-
-#
-# build debian package 
-#
-build_deb_package() {
-       
-       cd $CURR_DIR
-       echo " CREATE DEB"
-
-       cd temp/deb
-       sudo dpkg-buildpackage -d
-       echo
-       echo 
-}
-
-#
-#  remove unnecessary files, copy *.deb package do target folder
-#
-cleanup_after_deb_packaging(){
-       
-       cd $CURR_DIR
-       file=$(find temp -regex ".+\.deb$")
-       mkdir target
-       cp $file target
-       sudo rm -rf temp 
-       echo
-       echo 
-}
-
-#
-# create rpm structure
-# 1)create directories rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}
-# 2)tar.gz project 
-# 3)copy tar.gz to SOURCES directory
-# 4)copy required configuration file for deb-packaging 
-#
-do_rpm_struct() {
-    
-       cd $CURR_DIR;
-       echo " CREATE RPM STRUCT"    
-       rm -rfv temp/rpm
-       mkdir temp/rpm
-       mkdir -pv temp/rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}    
-       echo "[ ] Create temp structure for tgz source file"
-       mkdir temp/$SERVICE_NAME-$RPM_VERSION
-       mkdir temp/$SERVICE_NAME-$RPM_VERSION/build
-       mkdir temp/$SERVICE_NAME-$RPM_VERSION/doc
-       mkdir temp/$SERVICE_NAME-$RPM_VERSION/samples
-       cp -vr ../build/* temp/$SERVICE_NAME-$RPM_VERSION/build
-       cp -vr ../doc/* temp/$SERVICE_NAME-$RPM_VERSION/doc
-       cp -vr ../samples/* temp/$SERVICE_NAME-$RPM_VERSION/samples
-       
-       echo "[ ] TAR"
-       cd temp
-       tar -czhf $SERVICE_NAME-$RPM_VERSION.tar.gz $SERVICE_NAME-$RPM_VERSION
-       cd ..   
-       echo "[ ] Copy tarball into SOURCES"
-       pwd
-       mv -v temp/$SERVICE_NAME-$RPM_VERSION.tar.gz temp/rpm/rpmbuild/SOURCES
-       rm -rf temp/$SERVICE_NAME-$RPM_VERSION
-       rm -rf temp/$SERVICE_NAME-$RPM_VERSION.tar.gz
-
-       echo "[ ] Copy RPM .specs file"
-       cp -v rpm/$RPM_SPEC_NAME temp/rpm/rpmbuild/
-       echo
-       echo 
-}
-
-#
-# build rpm package 
-#
-build_rpm_package() {
-
-       echo " CREATE RPM PACKAGE"
-       cd $CURR_DIR
-       cd temp/rpm/rpmbuild
-       rpmbuild -bb $RPM_SPEC_NAME
-       echo
-       echo 
-
-}
-
-#
-#  remove unnecessary files, copy *.deb package do target folder
-#
-cleanup_after_rpm_packaging(){
-
-       cd $CURR_DIR
-       file=$(find temp/rpm/rpmbuild/RPMS/noarch -regex ".+\.rpm$")
-       mkdir target
-       cp $file target
-       rm -rf temp 
-       echo
-       echo 
-
-}
-
-
-
-case "$1" in
-    clean)
-        do_clean_up
-        ;;
-    structure)
-        do_structure
-        ;;
-    deb)
-       do_clean_up
-       do_structure
-        do_deb_struct
-        build_deb_package
-        cleanup_after_deb_packaging
-        ;;
-    rpm)
-       do_clean_up
-       do_structure
-        do_rpm_struct
-        build_rpm_package
-        cleanup_after_rpm_packaging
-        ;;
-    *)
-        echo "Usage: $0 clean|deb|rpm" >&2
-        exit 3
-        ;;
-esac
-
-: exit 0

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.sh (from rev 
5740, trunk/perfsonar-java-rrd-ma/packaging/package.sh)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.sh                  
          (rev 0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/packaging/package.sh    2010-09-13 
15:13:12 UTC (rev 5749)
@@ -0,0 +1,195 @@
+
+#!/bin/sh
+#author: Slawomir Trzaszczka 
<>
+#update: Piotr Pikusa 
<>
+. package.conf
+
+
+do_clean_up() {
+
+       echo " CLEAN UP"
+       cd $CURR_DIR
+       sudo rm -rf temp
+       sudo rm -rf target 
+       echo
+
+}
+
+#
+# build project using maven
+# 1) build project using maven
+# 2) unzip .war into webapps directory
+#
+do_structure() {
+       
+       echo " CREATE STRUCT"
+
+       cd $CURR_DIR
+       rm -rfv temp
+       mkdir temp
+       mkdir temp/webapps
+       pwd
+       echo "done !"
+       echo
+       echo  
+
+}
+
+#
+# create debian structure
+# 1)create directories deb{debian,build}
+# 2)copy required configuration files for deb-packaging 
+#
+do_deb_struct() {
+       
+       cd $CURR_DIR
+       echo " CREATE DEB STRUCT"
+       echo "[ ] Removing old deb"
+       rm -rfv temp/deb
+       mkdir -v temp/deb
+       mkdir -v temp/deb/debian
+       mkdir -v temp/deb/build
+       mkdir -v temp/deb/build/$SERVICE_NAME
+       mkdir -v temp/deb/build/$OLD_NAME
+       echo " Copying build/perfsonar-java-rrd-ma to temp/deb/build"   
+       cp -av ../build/$SERVICE_NAME/* temp/deb/build/$SERVICE_NAME/
+       echo " Copying build/geant2-java-rrd-ma to temp/deb/build"      
+       cp -av ../build/$OLD_NAME/* temp/deb/build/$OLD_NAME/
+       echo " Copying doc file"
+       cp -av ../doc temp/deb/
+       echo " Copying samples file"
+       cp -av ../samples temp/deb/
+       echo "[ ] Copying package files"    
+       cp -v deb/* temp/deb/debian
+       echo
+       echo 
+
+}
+
+
+#
+# build debian package 
+#
+build_deb_package() {
+       
+       cd $CURR_DIR
+       echo " CREATE DEB"
+
+       cd temp/deb
+       sudo dpkg-buildpackage -d
+       echo
+       echo 
+}
+
+#
+#  remove unnecessary files, copy *.deb package do target folder
+#
+cleanup_after_deb_packaging(){
+       
+       cd $CURR_DIR
+       file=$(find temp -regex ".+\.deb$")
+       mkdir target
+       cp $file target
+       sudo rm -rf temp 
+       echo
+       echo 
+}
+
+#
+# create rpm structure
+# 1)create directories rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}
+# 2)tar.gz project 
+# 3)copy tar.gz to SOURCES directory
+# 4)copy required configuration file for deb-packaging 
+#
+do_rpm_struct() {
+    
+       cd $CURR_DIR;
+       echo " CREATE RPM STRUCT"    
+       rm -rfv temp/rpm
+       mkdir temp/rpm
+       mkdir -pv temp/rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}    
+       echo "[ ] Create temp structure for tgz source file"
+       mkdir temp/$SERVICE_NAME-$RPM_VERSION
+       mkdir temp/$SERVICE_NAME-$RPM_VERSION/build
+       mkdir temp/$SERVICE_NAME-$RPM_VERSION/doc
+       mkdir temp/$SERVICE_NAME-$RPM_VERSION/samples
+       cp -vr ../build/* temp/$SERVICE_NAME-$RPM_VERSION/build
+       cp -vr ../doc/* temp/$SERVICE_NAME-$RPM_VERSION/doc
+       cp -vr ../samples/* temp/$SERVICE_NAME-$RPM_VERSION/samples
+       
+       echo "[ ] TAR"
+       cd temp
+       tar -czhf $SERVICE_NAME-$RPM_VERSION.tar.gz $SERVICE_NAME-$RPM_VERSION
+       cd ..   
+       echo "[ ] Copy tarball into SOURCES"
+       pwd
+       mv -v temp/$SERVICE_NAME-$RPM_VERSION.tar.gz temp/rpm/rpmbuild/SOURCES
+       rm -rf temp/$SERVICE_NAME-$RPM_VERSION
+       rm -rf temp/$SERVICE_NAME-$RPM_VERSION.tar.gz
+
+       echo "[ ] Copy RPM .specs file"
+       cp -v rpm/$RPM_SPEC_NAME temp/rpm/rpmbuild/
+       echo
+       echo 
+}
+
+#
+# build rpm package 
+#
+build_rpm_package() {
+
+       echo " CREATE RPM PACKAGE"
+       cd $CURR_DIR
+       cd temp/rpm/rpmbuild
+       rpmbuild -bb $RPM_SPEC_NAME
+       echo
+       echo 
+
+}
+
+#
+#  remove unnecessary files, copy *.deb package do target folder
+#
+cleanup_after_rpm_packaging(){
+
+       cd $CURR_DIR
+       file=$(find temp/rpm/rpmbuild/RPMS/noarch -regex ".+\.rpm$")
+       mkdir target
+       cp $file target
+       rm -rf temp 
+       echo
+       echo 
+
+}
+
+
+
+case "$1" in
+    clean)
+        do_clean_up
+        ;;
+    structure)
+        do_structure
+        ;;
+    deb)
+       do_clean_up
+       do_structure
+        do_deb_struct
+        build_deb_package
+        cleanup_after_deb_packaging
+        ;;
+    rpm)
+       do_clean_up
+       do_structure
+        do_rpm_struct
+        build_rpm_package
+        cleanup_after_rpm_packaging
+        ;;
+    *)
+        echo "Usage: $0 clean|deb|rpm" >&2
+        exit 3
+        ;;
+esac
+
+: exit 0

Deleted: tags/perfsonar-java-rrd-ma-3.3-0rc4/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma/pom.xml 2010-05-11 10:33:53 UTC (rev 5620)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/pom.xml 2010-09-13 15:13:12 UTC (rev 
5749)
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-  <description>
-
-    $Id$
-    project: perfSONAR
-    date: 2009/02/18
-    author: romradz, pikusa
-
-  </description>
-
--->
-
-<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";>>
-
-  <properties>
-    <configurationFile>configuration-ma.xml</configurationFile>
-    <axis2Id>axis2-1.4.1</axis2Id>
-  </properties>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>perfsonar</groupId>
-  <artifactId>perfsonar-java-rrd-ma</artifactId>
-  <packaging>war</packaging>
-  <name>RRD Measurement Archive</name>
-  <version>3.3</version>
-  <description>Round Robin Database Measurement Archive for
-               perfSONAR. For more information see the 
wiki-page.</description>
-  
<url>http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_Java_RRD_MA_release_candidate</url>
-
-  <issueManagement>
-    <system>bugzilla</system>
-    <url>http://bugzilla.perfsonar.net</url>
-  </issueManagement>
-
-  <inceptionYear>2009</inceptionYear>
-
-  <scm>
-    <connection>scm:svn:anonsvn.internet2.edu/svn/</connection>
-    
<developerConnection>scm:svn:svn.internet2.edu/svn/perfsonar/</developerConnection>
-  </scm>
-
-  <organization>
-    <name>perfSONAR</name>
-    <url>http://www.perfsonar.net</url>
-  </organization>
-
-  <build>
-
-    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-    <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
-    <outputDirectory>${basedir}/bin</outputDirectory>
-    <directory>${basedir}/build</directory>
-    <finalName>${project.artifactId}</finalName>
-
-    <plugins>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>create-configuration</id>
-            <phase>process-resources</phase>
-            <configuration>
-              <tasks>
-                <delete dir="${basedir}/conf/tmp" failonerror="false"/>
-                <copy file="${basedir}/conf/base2/configuration-rules.xml"  
todir="${basedir}/conf/tmp"/>
-                <copy file="${basedir}/conf/${configurationFile}"           
todir="${basedir}/conf/tmp"/>
-                <copy file="${basedir}/conf/webAdminConfig.xml"           
todir="${basedir}/conf/tmp"/>
-                <move file="${basedir}/conf/tmp/${configurationFile}"       
tofile="${basedir}/conf/tmp/configuration.xml"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>create-aar</id>
-            <phase>compile</phase>
-            <configuration>
-              <tasks>
-                <property name="aar.name" value="${project.artifactId}"/>
-                <copy toDir="${basedir}/bin" failonerror="false">
-                  <fileset dir="${basedir}/conf/axis2">
-                    <include name="**/*.xml"/>
-                  </fileset>
-                </copy>
-                <mkdir dir="${project.build.directory}"/>
-                <jar destfile="${basedir}/build/${aar.name}.aar">
-                  <fileset includes="**/Axis2PerfsonarServiceConnPoint.class 
**/*.xml" dir="${basedir}/bin"/>
-                </jar>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <webResources>
-            <resource>
-              <directory>${basedir}/conf/tmp</directory>
-              <includes>
-                <include>**/*</include>
-              </includes>
-              <targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
-            </resource>
-            <resource>
-              <directory>${basedir}/build</directory>
-              <includes>
-                <include>**/*.aar</include>
-              </includes>
-              <targetPath>WEB-INF/services</targetPath>
-            </resource>
-            <resource>
-              
<directory>${basedir}/resources/${axis2Id}/webapp/axis2-web</directory>
-              <includes>
-                <include>**/*</include>
-              </includes>
-              <targetPath>axis2-web</targetPath>
-            </resource>
-            <resource>
-              
<directory>${basedir}/resources/${axis2Id}/repository/modules</directory>
-              <includes>
-                <include>**/*</include>
-              </includes>
-              <targetPath>WEB-INF/modules</targetPath>
-            </resource>
-            <resource>
-              <directory>${basedir}/resources/${axis2Id}/conf</directory>
-              <includes>
-                <include>**/*.xml</include>
-              </includes>
-              <targetPath>WEB-INF/conf</targetPath>
-            </resource>
-            <resource>
-              <directory>${basedir}/conf</directory>
-              <includes>
-                <!-- <include>log4j.xml</include> -->
-                <include>log4j.properties</include>
-              </includes>
-              <targetPath>WEB-INF/classes</targetPath>
-            </resource>
-          </webResources>
-          
<webXml>${basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml</webXml>
-        </configuration>
-      </plugin>
-
-      <!-- execution: mvn -Djetty.port=9999 jetty:run-war -->
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <configuration>
-          <webApp>${project.build.directory}/${project.artifactId}</webApp>
-        </configuration>
-      </plugin>
-    </plugins>
-
-  </build>
-
-  <repositories>
-    <repository>
-      <id>ibiblio</id>
-      <name>ibiblio repository</name>
-      <url>http://www.ibiblio.org/maven2</url>
-    </repository>
-    <repository>
-      <id>personar</id>
-      <name>personar repository</name>
-      
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository/</url>
-    </repository>
-    <repository>
-      <id>personar_leg</id>
-      <name>personar repository</name>
-      
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository/</url>
-      <layout>legacy</layout>
-    </repository>
-    <repository>
-      <id>codehaus-release-repo</id>
-      <name>Codehaus Release Repo</name>
-      <url>http://repository.codehaus.org</url>
-    </repository>
-  </repositories>
-
-  <dependencies>
-      <dependency>
-      <groupId>perfsonar</groupId>
-      <artifactId>ps-mdm-base2</artifactId>
-      <version>0.0.5</version>
-    </dependency>
-    <dependency>
-      <groupId>rrdjtool</groupId>
-      <artifactId>rrdjtool</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-        <groupId>commons-digester</groupId>
-        <artifactId>commons-digester</artifactId>
-        <version>2.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-jaxws</artifactId>
-        <version>1.4.1</version>
-    </dependency>
-
-    <!-- got for auth -->
-    <dependency>
-      <groupId>opensaml</groupId>
-      <artifactId>opensaml1</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>bouncycastle</groupId>
-      <artifactId>bcprov-jdk15</artifactId>
-      <version>124</version>
-    </dependency>
-    <dependency>
-      <groupId>xml-security</groupId>
-      <artifactId>xmlsec</artifactId>
-      <version>1.3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>edugain</groupId>
-      <artifactId>edugain</artifactId>
-      <version>1.0-RC2</version>
-    </dependency>
-    <dependency>
-      <groupId>perfsonar</groupId>
-      <artifactId>perfsonar-authr</artifactId>
-      <version>0.5</version>
-    </dependency>
-    <dependency>
-      <groupId>wss4j</groupId>
-      <artifactId>wss4j</artifactId>
-      <version>1.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.rampart</groupId>
-      <artifactId>rampart-core</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.8.0</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xerces-xml-apis</artifactId>
-      <version>2.8.0</version>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.7.0</version>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan-serializer</artifactId>
-      <version>2.7.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xacml</groupId>
-      <artifactId>sunxacml</artifactId>
-      <version>1.2</version>
-    </dependency>
-
-  </dependencies>
-
-  <reporting>
-    <excludeDefaults>true</excludeDefaults>
-    <outputDirectory>${basedir}/doc/site</outputDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>index</report>
-              <report>summary</report>
-              <report>project-team</report>
-              <report>dependencies</report>
-              <report>mailing-list</report>
-              <report>issue-tracking</report>
-              <report>scm</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>javancss-maven-plugin</artifactId>
-        <configuration>
-          <failOnViolation>false</failOnViolation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <minimumTokens>100</minimumTokens>
-          <targetJdk>1.5</targetJdk>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-</project>

Copied: tags/perfsonar-java-rrd-ma-3.3-0rc4/pom.xml (from rev 5748, 
trunk/perfsonar-java-rrd-ma/pom.xml)
===================================================================
--- tags/perfsonar-java-rrd-ma-3.3-0rc4/pom.xml                         (rev 
0)
+++ tags/perfsonar-java-rrd-ma-3.3-0rc4/pom.xml 2010-09-13 15:13:12 UTC (rev 
5749)
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+  <description>
+
+    $Id$
+    project: perfSONAR
+    date: 2009/02/18
+    author: romradz, pikusa
+
+  </description>
+
+-->
+
+<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";>>
+
+  <properties>
+    <configurationFile>configuration-ma.xml</configurationFile>
+    <axis2Id>axis2-1.4.1</axis2Id>
+  </properties>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.geant.perfsonar</groupId>
+  <artifactId>perfsonar-java-rrd-ma</artifactId>
+  <packaging>war</packaging>
+  <name>RRD Measurement Archive</name>
+  <version>3.3</version>
+  <description>Round Robin Database Measurement Archive for
+               perfSONAR. For more information see the 
wiki-page.</description>
+  
<url>http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_Java_RRD_MA_release_candidate</url>
+
+  <issueManagement>
+    <system>bugzilla</system>
+    <url>http://bugzilla.perfsonar.net</url>
+  </issueManagement>
+
+  <inceptionYear>2009</inceptionYear>
+
+  <scm>
+    <connection>scm:svn:anonsvn.internet2.edu/svn/</connection>
+    
<developerConnection>scm:svn:svn.internet2.edu/svn/perfsonar/</developerConnection>
+  </scm>
+
+  <organization>
+    <name>perfSONAR</name>
+    <url>http://www.perfsonar.net</url>
+  </organization>
+
+  <build>
+
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+    <outputDirectory>${basedir}/bin</outputDirectory>
+    <directory>${basedir}/build</directory>
+    <finalName>${project.artifactId}</finalName>
+
+    <plugins>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-configuration</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <delete dir="${basedir}/conf/tmp" failonerror="false"/>
+                <!-- <copy 
file="${basedir}/conf/base2/configuration-rules.xml"  
todir="${basedir}/conf/tmp"/> -->
+                <copy file="${basedir}/conf/${configurationFile}"           
todir="${basedir}/conf/tmp"/>
+                <copy file="${basedir}/conf/webAdminConfig.xml"           
todir="${basedir}/conf/tmp"/>
+               <copy file="${basedir}/conf/configuration.xml.template"       
    todir="${basedir}/conf/tmp"/>
+                <move file="${basedir}/conf/tmp/${configurationFile}"       
tofile="${basedir}/conf/tmp/configuration.xml"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>create-aar</id>
+            <phase>compile</phase>
+            <configuration>
+              <tasks>
+                <property name="aar.name" value="${project.artifactId}"/>
+                <copy toDir="${basedir}/bin" failonerror="false">
+                  <fileset dir="${basedir}/conf/axis2">
+                    <include name="**/*.xml"/>
+                  </fileset>
+                </copy>
+                <mkdir dir="${project.build.directory}"/>
+                <jar destfile="${basedir}/build/${aar.name}.aar">
+                  <fileset includes="**/Axis2PerfsonarServiceConnPoint.class 
**/*.xml" dir="${basedir}/bin"/>
+                </jar>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>${basedir}/conf/tmp</directory>
+              <includes>
+                <include>**/*</include>
+              </includes>
+              <targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
+            </resource>
+            <resource>
+              <directory>${basedir}/build</directory>
+              <includes>
+                <include>**/*.aar</include>
+              </includes>
+              <targetPath>WEB-INF/services</targetPath>
+            </resource>
+            <resource>
+              
<directory>${basedir}/resources/${axis2Id}/webapp/axis2-web</directory>
+              <includes>
+                <include>**/*</include>
+              </includes>
+              <targetPath>axis2-web</targetPath>
+            </resource>
+            <resource>
+              
<directory>${basedir}/resources/${axis2Id}/repository/modules</directory>
+              <includes>
+                <include>**/*</include>
+              </includes>
+              <targetPath>WEB-INF/modules</targetPath>
+            </resource>
+            <resource>
+              <directory>${basedir}/resources/${axis2Id}/conf</directory>
+              <includes>
+                <include>**/*.xml</include>
+              </includes>
+              <targetPath>WEB-INF/conf</targetPath>
+            </resource>
+            <resource>
+              <directory>${basedir}/conf</directory>
+              <includes>
+                <!-- <include>log4j.xml</include> -->
+                <include>log4j.properties</include>
+              </includes>
+              <targetPath>WEB-INF/classes</targetPath>
+            </resource>
+          </webResources>
+          
<webXml>${basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml</webXml>
+        </configuration>
+      </plugin>
+
+      <!-- execution: mvn -Djetty.port=9999 jetty:run-war -->
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <configuration>
+          <webApp>${project.build.directory}/${project.artifactId}</webApp>
+        </configuration>
+      </plugin>
+    </plugins>
+
+  </build>
+
+  <repositories>
+    <repository>
+      <id>ibiblio</id>
+      <name>ibiblio repository</name>
+      <url>http://www.ibiblio.org/maven2</url>
+    </repository>
+    <repository>
+      <id>personar</id>
+      <name>personar repository</name>
+      
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository</url>
+    </repository>
+    <repository>
+      <id>personar_leg</id>
+      <name>personar repository</name>
+      
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository</url>
+      <layout>legacy</layout>
+    </repository>
+    <repository>
+      <id>codehaus-release-repo</id>
+      <name>Codehaus Release Repo</name>
+      <url>http://repository.codehaus.org</url>
+    </repository>
+    <repository>
+      <id>geant-repository</id>
+      <name>perfSONAR repository</name>
+      <url>http://maven.geant.net/repo</url>
+    </repository>
+
+  </repositories>
+
+
+  <distributionManagement>
+    <repository>
+      <id>geant-developers-repository</id>
+      <name>perfSONAR repository</name>
+      
<url>scpexe:///repo</url>
+      <uniqueVersion>false</uniqueVersion>
+    </repository>
+  </distributionManagement>
+
+
+  <dependencies>
+      <dependency>
+      <groupId>net.geant.perfsonar</groupId>
+      <artifactId>ps-mdm-base2</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>rrdjtool</groupId>
+      <artifactId>rrdjtool</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <version>2.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.axis2</groupId>
+        <artifactId>axis2-jaxws</artifactId>
+        <version>1.4.1</version>
+    </dependency>
+
+    <!-- got for auth -->
+    <dependency>
+      <groupId>opensaml</groupId>
+      <artifactId>opensaml1</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>bouncycastle</groupId>
+      <artifactId>bcprov-jdk15</artifactId>
+      <version>124</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-security</groupId>
+      <artifactId>xmlsec</artifactId>
+      <version>1.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>edugain</groupId>
+      <artifactId>edugain</artifactId>
+      <version>1.0-RC2</version>
+    </dependency>
+    <dependency>
+      <groupId>perfsonar</groupId>
+      <artifactId>perfsonar-authr</artifactId>
+      <version>0.5</version>
+    </dependency>
+    <dependency>
+      <groupId>wss4j</groupId>
+      <artifactId>wss4j</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.rampart</groupId>
+      <artifactId>rampart-core</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.8.0</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xerces-xml-apis</artifactId>
+      <version>2.8.0</version>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan-serializer</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xacml</groupId>
+      <artifactId>sunxacml</artifactId>
+      <version>1.2</version>
+    </dependency>
+
+  </dependencies>
+
+  <reporting>
+    <excludeDefaults>true</excludeDefaults>
+    <outputDirectory>${basedir}/doc/site</outputDirectory>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+              <report>summary</report>
+              <report>project-team</report>
+              <report>dependencies</report>
+              <report>mailing-list</report>
+              <report>issue-tracking</report>
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jxr-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>javancss-maven-plugin</artifactId>
+        <configuration>
+          <failOnViolation>false</failOnViolation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <configuration>
+          <linkXref>true</linkXref>
+          <sourceEncoding>utf-8</sourceEncoding>
+          <minimumTokens>100</minimumTokens>
+          <targetJdk>1.5</targetJdk>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>