perfsonar development work

Author: nordunet.behrmann
Date: 2012-08-29 13:41:46 +0100 (Wed, 29 Aug 2012)
New Revision: 5983

Added:
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/sbin/
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/sbin/nmwg-sql-converter
Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/install
   trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/rpm/ps-mdm-rrd-ma.specs
   trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/packaging.xml
Log:
perfsonar-java-rrd-ma-SQL_backend: Add nmwg-sql-converter

The nmwg-sql-converter converts NMWG meta data descriptions to SQL
for insertion into the RRD meta data database.

The script is installed in /usr/sbin/

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/install
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/install       
2012-08-29 11:52:59 UTC (rev 5982)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/install       
2012-08-29 12:41:46 UTC (rev 5983)
@@ -2,6 +2,6 @@
 doc /usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF
 samples /usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF
 debian/perfsonar-java-rrd-ma.xml /etc/tomcat6/Catalina/localhost/
+sbin/* usr/sbin
 
 
-

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-29 11:52:59 UTC (rev 5982)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/rpm/ps-mdm-rrd-ma.specs 
  2012-08-29 12:41:46 UTC (rev 5983)
@@ -51,6 +51,7 @@
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/run/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/log
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sbindir}
 
 
 # copy the service content to the tomcat webapps directory
@@ -60,6 +61,7 @@
 %{__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
+%{__cp}    sbin/nmwg-sql-converter ${RPM_BUILD_ROOT}%{_sbindir}
 
 #rrdtool restore ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.xml 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.rrd -f || true
 
@@ -110,6 +112,7 @@
 %{_sysconfdir}/%{name}
 /usr/share/doc/%{name}
 /usr/share/doc/%{name}/schema
+%attr(755,root,root) /usr/sbin/nmwg-sql-converter
 %{prefix}
 
 

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2012-08-29 11:52:59 
UTC (rev 5982)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2012-08-29 12:41:46 
UTC (rev 5983)
@@ -18,6 +18,7 @@
         <configurationFile>configuration-ma.xml</configurationFile>
         <axis2Id>axis2-1.4.1</axis2Id>
         <aar.name>${project.artifactId}</aar.name>
+        <version.nmwg-sql-converter>1.0.0</version.nmwg-sql-converter>
     </properties>
 
     <build>
@@ -221,6 +222,12 @@
             <version>1.0.6</version>
         </dependency>
         <dependency>
+            <groupId>net.geant.perfsonar</groupId>
+            <artifactId>nmwg-sql-converter</artifactId>
+            <version>${version.nmwg-sql-converter}</version>
+            <classifier>jar-with-dependencies</classifier>
+        </dependency>
+        <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
             <version>3.4.0</version>

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/packaging.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/packaging.xml   
  2012-08-29 11:52:59 UTC (rev 5982)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/packaging.xml   
  2012-08-29 12:41:46 UTC (rev 5983)
@@ -1,4 +1,5 @@
-<assembly>
+<assembly 
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+          
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
 http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
     <id>packaging</id>
     <includeBaseDirectory>false</includeBaseDirectory>
 
@@ -16,4 +17,13 @@
             <outputDirectory>samples</outputDirectory>
         </fileSet>
     </fileSets>
+
+    <files>
+        <file>
+            <source>src/main/sbin/nmwg-sql-converter</source>
+            <outputDirectory>sbin</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>755</fileMode>
+        </file>
+    </files>
 </assembly>
\ No newline at end of file

Added: 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/sbin/nmwg-sql-converter
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/sbin/nmwg-sql-converter  
                          (rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/sbin/nmwg-sql-converter  
  2012-08-29 12:41:46 UTC (rev 5983)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -jar 
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/lib/nmwg-sql-converter-${version.nmwg-sql-converter}-jar-with-dependencies.jar
 "$@"