perfsonar development work

Author: dante.delvaux
Date: 2013-04-27 18:09:02 +0100 (Sat, 27 Apr 2013)
New Revision: 6258

Modified:
   trunk/RELEASES.txt
   trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
Log:
RRD MA: correcting RPM build.

Modified: trunk/RELEASES.txt
===================================================================
--- trunk/RELEASES.txt  2013-04-25 17:57:31 UTC (rev 6257)
+++ trunk/RELEASES.txt  2013-04-27 17:09:02 UTC (rev 6258)
@@ -15,6 +15,15 @@
 Each of those artifacts have their own release cycles, depending on the
 need for them to change (some are very stable, others less).
 
+Making a release is done through Jenkins, with the pS-rel job at
+https://ci.geant.net/jenkins/view/perfSONAR/job/pS-rel
+
+You got to the "Release" action, choose the module you want to release
+and make it happen!  All is done through the maven-release-plugin:
+ - removing the -SNAPSHOT from the module version number
+ - publishing in the artifactory server
+ - tagging the release in SVN
+
 Releasing a perfSONAR service
 -----------------------------
 When releasing a full perfSONAR service, this one must depend on released

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-04-25 17:57:31 
UTC (rev 6257)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-04-27 17:09:02 
UTC (rev 6258)
@@ -32,7 +32,7 @@
         <resources>
             <resource>
                 <!-- The webAdminConfig.xml must be filtered to have the 
name and version filled in -->
-                <directory>src/main/resources/perfsonar/conf</directory>
+                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
@@ -221,6 +221,7 @@
                             <include>*.xml</include>
                             <include>**/*.xml</include>
                         </includes>
+                        <filtering>true</filtering>
                     </resource>
                     <resource>
                         <directory>${basedir}/src/main/resources</directory>