perfsonar development work

Author: nordunet.behrmann
Date: 2012-08-29 12:35:29 +0100 (Wed, 29 Aug 2012)
New Revision: 5980

Added:
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/packaging.xml
Removed:
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/configuration.xml
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/configuration.xml.template
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/rrdma_db.sql
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/test_rrdma_db.sql
Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/package.sh
   trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/rpm/ps-mdm-rrd-ma.specs
   trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
Log:
perfsonar-java-rrd-ma-SQL_backend: Clean up build and packaging

- Use the normal Maven target/ directory for output files
- Remove temporary conf/tmp files from repository
- Move part of packaging from package.sh to Maven assembly
- Make RPM buildable on Debian (ie non-bash and build with recent
  version of RPM)
- Remove rrdjtool as a dependency from the RPM

Deleted: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/configuration.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/configuration.xml  
2012-08-28 12:59:35 UTC (rev 5979)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/configuration.xml  
2012-08-29 11:35:29 UTC (rev 5980)
@@ -1,175 +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.service.measurementArchive.rrdType.MetadataKeyMessageHandler"
 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>
-      
-      <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
 name="metadataStorageDAO2">
-        <option name="uri" value="jdbc:mysql://localhost:3306/"/>
-        <option name="schema" value ="perfsonar_ma"/>
-        <option name="username" value="perfsonar_ma"/>
-        <option name="password" value="testpass"/>
-      </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>

Deleted: 
trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/configuration.xml.template
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/configuration.xml.template 
2012-08-28 12:59:35 UTC (rev 5979)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/configuration.xml.template 
2012-08-29 11:35:29 UTC (rev 5980)
@@ -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="${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.service.measurementArchive.rrdType.MetadataKeyMessageHandler"
 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: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/rrdma_db.sql
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/rrdma_db.sql       
2012-08-28 12:59:35 UTC (rev 5979)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/rrdma_db.sql       
2012-08-29 11:35:29 UTC (rev 5980)
@@ -1,46 +0,0 @@
-# running:
-# mysql -u root -p < rrdma_db.sql
-
-DROP  DATABASE IF EXISTS perfsonar_ma
-
-CREATE DATABASE
-    perfsonar_ma;
-
-
-USE perfsonar_ma
-
-
-CREATE USER
-    perfsonar_ma;
-
-
-GRANT
-    SELECT, INSERT, UPDATE, DELETE ON
-    perfsonar_ma.* TO 'perfsonar_ma'@'localhost'
-    IDENTIFIED BY 'testpass';
-
-
-
-CREATE TABLE
-   interfaces
-   (metadataId INT NOT NULL AUTO_INCREMENT,
-       subjId VARCHAR(20) NOT NULL,
-        hostName VARCHAR(20) NOT NULL,
-        ifAddress VARCHAR(20) NOT NULL,
-        ifAddressType VARCHAR(4) NOT NULL,
-        ifName VARCHAR(100) NOT NULL,
-        ifDescription VARCHAR(255) NOT NULL,
-        direction VARCHAR(20) NOT NULL,
-        capacity VARCHAR(20) NOT NULL,
-        keyword VARCHAR(100),
-        eventType VARCHAR(100) NOT NULL,
-        file VARCHAR(100) NOT NULL,
-        dataSource VARCHAR(20) NOT NULL,
-        valueUnits VARCHAR(20) NOT NULL,
-        dataSourceStep VARCHAR(20),
-        dataSourceType VARCHAR(20),
-        dataSourceHeartbeat VARCHAR(20), 
-        dataSourceMinValue VARCHAR(20),
-        dataSourceMaxValue VARCHAR(20),
-        PRIMARY KEY (metadataId));
-        

Deleted: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/test_rrdma_db.sql
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/test_rrdma_db.sql  
2012-08-28 12:59:35 UTC (rev 5979)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/tmp/test_rrdma_db.sql  
2012-08-29 11:35:29 UTC (rev 5980)
@@ -1,25 +0,0 @@
-# running:
-# mysql -u root -p < test_rrdma_db.sql
-
-USE perfsonar_ma
-
-
-INSERT
-       INTO interfaces
-       VALUES (NULL, 'subj1',  'test-hostName1', 
'10.1.2.1','ipv4','TenGigabitEthernet1/1', 'test1', 'in',
-'1000BaseT','first', 'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
-       
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
-'inoctets', 'Bps', '300', 'ABSOLUTE','100', '0', '10000000');
-
-INSERT
-       INTO interfaces
-       VALUES (NULL, 'subj1',  'test-hostName2', 
'10.1.2.2','ipv4','TenGigabitEthernet1/1', 'test2', 'in',
-'1000BaseT','', 'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
-       
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
-'inoctets', 'Bps', '300', 'ABSOLUTE','100', '0', '10000000');
-INSERT
-       INTO interfaces
-       VALUES (NULL, 'subj1',  'test-hostName3', '10.1.2.3','ipv4', 
'TenGigabitEthernet1/1','test3', 'in',
-'1000BaseT','', 'http://ggf.org/ns/nmwg/characteristic/errors/2.0',
-       
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
-'inoctets', 'Bps', '300', 'ABSOLUTE','100', '0', '10000000');

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/package.sh
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/package.sh        
2012-08-28 12:59:35 UTC (rev 5979)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/package.sh        
2012-08-29 11:35:29 UTC (rev 5980)
@@ -3,12 +3,14 @@
 #update: Piotr Pikusa 
<>
 . package.conf
 
+set -e
+
 do_clean_up() {
 
        echo " CLEAN UP"
        cd $CURR_DIR
        rm -rf temp
-       rm -rf target 
+       rm -rf target
        echo
 
 }
@@ -19,106 +21,92 @@
 # 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  
+       echo
 
 }
 
 #
 # create debian structure
 # 1)create directories deb{debian,build}
-# 2)copy required configuration files for deb-packaging 
+# 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"    
+       echo "[ ] Copying RRD MA to temp/deb"
+       cp -av ../target/packaging/* temp/deb/
+       echo "[ ] Copying package files"
        cp -v deb/* temp/deb/debian
        echo
-       echo 
+       echo
 
 }
 
 
 #
-# build debian package 
+# build debian package
 #
 build_deb_package() {
-       
+
        cd $CURR_DIR
        echo " CREATE DEB"
 
        cd temp/deb
-       fakeroot dpkg-buildpackage -d
+       fakeroot dpkg-buildpackage -d || :
        echo
-       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
-       rm -rf temp 
+       rm -rf temp
        echo
-       echo 
+       echo
 }
 
 #
 # create rpm structure
 # 1)create directories rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}
-# 2)tar.gz project 
+# 2)tar.gz project
 # 3)copy tar.gz to SOURCES directory
-# 4)copy required configuration file for deb-packaging 
+# 4)copy required configuration file for deb-packaging
 #
 do_rpm_struct() {
-    
+
        cd $CURR_DIR;
-       echo " CREATE RPM STRUCT"    
+       echo " CREATE RPM STRUCT"
        rm -rfv temp/rpm
        mkdir temp/rpm
-       mkdir -pv temp/rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}    
+       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
-       
+       cp -vr ../target/packaging/* temp/$SERVICE_NAME-$RPM_VERSION/
+
        echo "[ ] TAR"
        cd temp
        tar -czhf $SERVICE_NAME-$RPM_VERSION.tar.gz $SERVICE_NAME-$RPM_VERSION
-       cd ..   
+       cd ..
        echo "[ ] Copy tarball into SOURCES"
        pwd
        mv -v temp/$SERVICE_NAME-$RPM_VERSION.tar.gz temp/rpm/rpmbuild/SOURCES
@@ -128,20 +116,20 @@
        echo "[ ] Copy RPM .specs file"
        cp -v rpm/$RPM_SPEC_NAME temp/rpm/rpmbuild/
        echo
-       echo 
+       echo
 }
 
 #
-# build rpm package 
+# build rpm package
 #
 build_rpm_package() {
 
        echo " CREATE RPM PACKAGE"
        cd $CURR_DIR
        cd temp/rpm/rpmbuild
-       rpmbuild -bb $RPM_SPEC_NAME
+       rpmbuild --define "_topdir $(pwd)" -bb $RPM_SPEC_NAME
        echo
-       echo 
+       echo
 
 }
 
@@ -154,9 +142,9 @@
        file=$(find temp/rpm/rpmbuild/RPMS/noarch -regex ".+\.rpm$")
        mkdir target
        cp $file target
-       rm -rf temp 
+       rm -rf temp
        echo
-       echo 
+       echo
 
 }
 

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/rpm/ps-mdm-rrd-ma.specs
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/rpm/ps-mdm-rrd-ma.specs 
  2012-08-28 12:59:35 UTC (rev 5979)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/rpm/ps-mdm-rrd-ma.specs 
  2012-08-29 11:35:29 UTC (rev 5980)
@@ -13,7 +13,6 @@
 packager: Piotr Pikusa 
<>
 URL: http://www.perfsonar.org
 Requires: tomcat6
-Requires: rrdjtool
 Requires: rrdtool
 Requires: mysql-server
 Requires: mysql
@@ -35,9 +34,6 @@
 
 
 %build
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    
-popd
 
 
 
@@ -58,22 +54,13 @@
 
 
 # copy the service content to the tomcat webapps directory
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
-    %{__cp} -a  %{name} ${RPM_BUILD_ROOT}%{perfix_no_name}
-popd
+%{__cp} -a  build/%{name} ${RPM_BUILD_ROOT}%{perfix_no_name}
+%{__cp} -a doc/* ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
+%{__cp} -a samples/requests/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
+%{__cp} -a samples/responses/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
+%{__cp} -a samples/rrd/* ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd
+%{__cp} -a samples/metadata_configuration_files/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/metadata_configuration_files
 
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
-    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
-popd
-
-
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    %{__cp} -a samples/requests/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
-    %{__cp} -a samples/responses/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
-    %{__cp} -a samples/rrd/* ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd
-    %{__cp} -a samples/metadata_configuration_files/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/metadata_configuration_files
-popd
-
 #rrdtool restore ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.xml 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.rrd -f || true
 
 

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2012-08-28 12:59:35 
UTC (rev 5979)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2012-08-29 11:35:29 
UTC (rev 5980)
@@ -17,13 +17,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <configurationFile>configuration-ma.xml</configurationFile>
         <axis2Id>axis2-1.4.1</axis2Id>
+        <aar.name>${project.artifactId}</aar.name>
     </properties>
 
     <build>
-        <outputDirectory>${project.basedir}/bin</outputDirectory>
-        <directory>${project.basedir}/build</directory>
-       <finalName>${project.artifactId}</finalName>
-
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -44,24 +41,24 @@
                         <phase>process-resources</phase>
                         <configuration>
                             <tasks>
-                                <delete dir="${project.basedir}/conf/tmp" 
failonerror="false" />
                                 <!--
                                             <copy 
file="${project.basedir}/conf/base2/configuration-rules.xml"
-                                            
todir="${project.basedir}/conf/tmp"/>
+                                            
todir="${project.build.directory}/conf"/>
                                         -->
                                 <copy 
file="${project.basedir}/conf/${configurationFile}"
-                                      todir="${project.basedir}/conf/tmp" />
-                                <!-- <copy 
file="${project.basedir}/conf/webAdminConfig.xml" 
todir="${project.basedir}/conf/tmp" />
+                                      
todir="${project.build.directory}/conf" />
+                                <!-- <copy 
file="${project.basedir}/conf/webAdminConfig.xml" 
todir="${project.build.directory}/conf" />
                                 -->
                                 <copy 
file="${project.basedir}/conf/configuration.xml.template"
-                                      todir="${project.basedir}/conf/tmp" />
+                                      
todir="${project.build.directory}/conf" />
                                 <copy 
file="${project.basedir}/conf/rrdma_db.sql"
-                                      todir="${project.basedir}/conf/tmp" />
+                                      
todir="${project.build.directory}/conf" />
                                 <copy 
file="${project.basedir}/conf/test_rrdma_db.sql"
-                                      todir="${project.basedir}/conf/tmp" />
-                                <move 
file="${project.basedir}/conf/tmp/${configurationFile}"
-                                      
tofile="${project.basedir}/conf/tmp/configuration.xml" />
-                                <copy 
file="${project.basedir}/conf/webAdminConfig.xml" 
todir="${project.basedir}/conf/tmp"/>
+                                      
todir="${project.build.directory}/conf" />
+                                <move 
file="${project.build.directory}/conf/${configurationFile}"
+                                      
tofile="${project.build.directory}/conf/configuration.xml" />
+                                <copy 
file="${project.basedir}/conf/webAdminConfig.xml"
+                                      
todir="${project.build.directory}/conf"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -73,16 +70,15 @@
                         <phase>compile</phase>
                         <configuration>
                             <tasks>
-                                <property name="aar.name" 
value="${project.artifactId}" />
-                                <copy toDir="${project.basedir}/bin" 
failonerror="false">
+                                <copy 
toDir="${project.build.outputDirectory}" failonerror="false">
                                     <fileset 
dir="${project.basedir}/conf/axis2">
                                         <include name="**/*.xml" />
                                     </fileset>
                                 </copy>
                                 <mkdir dir="${project.build.directory}" />
-                                <jar 
destfile="${project.basedir}/build/${aar.name}.aar">
+                                <jar 
destfile="${project.build.directory}/${aar.name}.aar">
                                     <fileset 
includes="**/Axis2PerfsonarServiceConnPoint.class **/*.xml"
-                                             dir="${project.basedir}/bin" />
+                                             
dir="${project.build.outputDirectory}" />
                                 </jar>
                             </tasks>
                         </configuration>
@@ -99,14 +95,14 @@
                 <configuration>
                     <webResources>
                         <resource>
-                            
<directory>${project.basedir}/conf/tmp</directory>
+                            
<directory>${project.build.directory}/conf</directory>
                             <includes>
                                 <include>**/*</include>
                             </includes>
                             
<targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
                         </resource>
                         <resource>
-                            <directory>${project.basedir}/build</directory>
+                            <directory>${project.build.directory}</directory>
                             <includes>
                                 <include>**/*.aar</include>
                             </includes>
@@ -146,6 +142,31 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <descriptors>
+                        
<descriptor>src/main/assembly/packaging.xml</descriptor>
+                    </descriptors>
+                    <formats>
+                        <format>dir</format>
+                    </formats>
+                    <finalName>packaging</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <attach>false</attach>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- execution: mvn -Djetty.port=9999 jetty:run-war -->
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
@@ -154,6 +175,7 @@
                     
<webApp>${project.build.directory}/${project.artifactId}</webApp>
                 </configuration>
             </plugin>
+
         </plugins>
 
     </build>

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/packaging.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/packaging.xml   
                          (rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/packaging.xml   
  2012-08-29 11:35:29 UTC (rev 5980)
@@ -0,0 +1,19 @@
+<assembly>
+    <id>packaging</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            
<directory>${project.build.directory}/${project.build.finalName}</directory>
+            <outputDirectory>build/perfsonar-java-rrd-ma</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>doc</directory>
+            <outputDirectory>doc</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>samples</directory>
+            <outputDirectory>samples</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file