perfsonar development work

Author: dante.delvaux
Date: 2013-04-29 18:01:57 +0100 (Mon, 29 Apr 2013)
New Revision: 6275

Modified:
   trunk/RELEASES.txt
   trunk/parent/pom.xml
   
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
Log:
Parent: reverting the parent pom.xml to 1.0.2-SNAPSHOT and reconfiguring the 
maven-release-plugin
RRD MA: adding a overriden method stub to RrdLibrary.java for JNA to be happy.

Modified: trunk/RELEASES.txt
===================================================================
--- trunk/RELEASES.txt  2013-04-29 16:22:14 UTC (rev 6274)
+++ trunk/RELEASES.txt  2013-04-29 17:01:57 UTC (rev 6275)
@@ -15,8 +15,9 @@
 those modules have their own release cycles, depending on the need for them 
to
 change (some are very stable, others less).
 
-If you want to manually release a module run:
-    mvn release:clean release:prepare release:perform -pl module-name
+If you want to manually release a module run (in the module own directory):
+    cd module-name
+    mvn release:clean release:prepare
     
  - answer the release plugin questions (defaults are usually ok)
  - the following will be done:
@@ -24,6 +25,8 @@
    - the module will be published to the artifactory server
    - a tag will be created in SVN
    - in trunk, the version number will be increased and -SNAPSHOT added again
+   - the "release:perform" step will be done inside the "release-prepare" 
(see
+     parent/pom.xml)
 
 With Jenkins
 ------------

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2013-04-29 16:22:14 UTC (rev 6274)
+++ trunk/parent/pom.xml        2013-04-29 17:01:57 UTC (rev 6275)
@@ -7,7 +7,7 @@
     
     <groupId>net.geant.perfsonar</groupId>
     <artifactId>parent</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -135,8 +135,8 @@
                 <configuration>
                     
<tagBase>svn+ssh:///GEANT/SA2/ps-java-services/tags/${project.artifactId}/</tagBase>
                     <tagNameFormat>@{project.version}</tagNameFormat>
-                    <completionGoals>versions:use-releases 
versions:update-parent</completionGoals>
                     <scmCommentPrefix>[${project.artifactId}]: 
</scmCommentPrefix>
+                    <completionGoals>release:perform versions:update-parent 
versions:use-releases</completionGoals>
                 </configuration>
             </plugin>
             <plugin>

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
  2013-04-29 16:22:14 UTC (rev 6274)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
  2013-04-29 17:01:57 UTC (rev 6275)
@@ -1,5 +1,7 @@
 package org.perfsonar.service.measurementArchive.rrdType.storage.rrd;
 
+import java.util.List;
+
 import com.sun.jna.Library;
 import com.sun.jna.Native;
 import com.sun.jna.NativeLibrary;
@@ -13,7 +15,6 @@
  */
 public interface RrdLibrary extends Library
 {
-    // CHECKSTYLE_OFF: ALL
     public static final String JNA_LIBRARY_NAME = "rrd";
     public static final NativeLibrary JNA_NATIVE_LIB = 
NativeLibrary.getInstance(RrdLibrary.JNA_LIBRARY_NAME);
     public static final RrdLibrary INSTANCE = (RrdLibrary) 
Native.loadLibrary(RrdLibrary.JNA_LIBRARY_NAME,
@@ -27,19 +28,24 @@
 
     void rrd_freemem(Pointer mem);
 
-    public static class time_t extends Structure
-    {
+    public static class time_t extends Structure {
         public int value;
 
-        public time_t()
-        {
+        public time_t() {
         }
 
-        public time_t(int value)
-        {
+        public time_t(int value) {
             this.value = value;
         }
+        
+        /* (non-Javadoc)
+         * @see com.sun.jna.Structure#getFieldOrder()
+         */
+        @Override
+        protected List getFieldOrder() {
+            // TODO Auto-generated method stub
+            return null;
+        }
     }
 
-    // CHECKSTYLE_ON: ALL
 }