perfsonar development work

Author: dante.delvaux
Date: 2013-05-27 19:04:42 +0100 (Mon, 27 May 2013)
New Revision: 6424

Modified:
   trunk/RELEASES.txt
   trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/PerfSONAR.java
   
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
Log:
pSbase3: simplifying logging when annotations are not present, but thread bug 
still present (tests are very slow).

Modified: trunk/RELEASES.txt
===================================================================
--- trunk/RELEASES.txt  2013-05-24 19:33:52 UTC (rev 6423)
+++ trunk/RELEASES.txt  2013-05-27 18:04:42 UTC (rev 6424)
@@ -43,7 +43,7 @@
 With Jenkins
 ------------
 This is the recommended way of making a release: through the pS-rel Jenkins 
job
-at https://ci.geant.net/jenkins/view/perfSONAR/job/pS-rel
+at https://ci.geant.net/jenkins/view/perfSONAR/job/perfSONAR-release/
 
 You go to the "Release" action, choose the module you want to release and 
make
 it happen!  The manual process is automated through the maven-release-plugin 
and
@@ -51,21 +51,11 @@
  - removing the -SNAPSHOT from the module version number
  - tagging the release in SVN
  - increasing the module version number and adding -SNAPSHOT again
- - installing locally (mvn on the Jenkins server cannot deploy to 
Artifactory)
+ - installing locally and deploying to Artifactory
  - replacing -SNAPSHOT with the released artifact in other modules 
dependencies
  - (at some point we should also add the versions:update-parent goal)
- - publishing in the artifactory server
 
-All, except the last step, are currently configured in the Jenkins job.  See
-https://issues.geant.net/jira/browse/SWDSD-446 for more information on why
-
-So now we currently need to publish manually with:
-    mvn release:perform -pl module-name \
-    
-DconnectionUrl=scm:svn:http://svn.geant.net/GEANTA2/ps-java-services/tags/module-name/x.y.z/
-
-(replace the module-name and version numbers x.y.z, of course)
-
-This deployment (default release:perform) also publish a source and a javadoc
+This default deployment (release:perform) also publish a source and a javadoc
 jars.  We need to see if we want to keep this.
 
 
@@ -77,7 +67,11 @@
 The changelog files (usually one for .deb and another one for .rpm) must be
 updated accordingly with the development done since the last version.
 
+All released perfSONAR services should be published to the repository server.
+See https://forge.geant.net/forge/display/perfsonar/Repository+maintenance 
for
+more information.
 
+
 Notes
 -----
 See mvn-settings.xml if you have some issues finding a released parent 
pom.xml

Modified: 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/PerfSONAR.java
===================================================================
--- 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/PerfSONAR.java  
2013-05-24 19:33:52 UTC (rev 6423)
+++ 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/PerfSONAR.java  
2013-05-27 18:04:42 UTC (rev 6424)
@@ -85,24 +85,11 @@
     private void loadConfiguration() {
         try {
             configure(getXPathAnnotations());
-        } catch (Exception ex) {
-            logger.debug("No @XPath annotations found ({}): {}", 
ex.getClass(), ex.getMessage());
-        }
-        try {
             configure(getHandlerAnnotations());
-        } catch (Exception ex) {
-            logger.debug("No Handler (@MatadataKey) annotations found ({}): 
{}", ex.getClass(), ex.getMessage());
-        }
-        try {
             configure(getLookupServiceRegisterAnnotations());
-        } catch (Exception ex) {
-            logger.debug("No @LookupServiceRegister annotations found ({}): 
{}", ex.getClass(), ex.getMessage());
-        }
-
-        try {
             configure(getSelfTestsAnnotations());
         } catch (Exception ex) {
-            logger.debug("No SelfTest annotations found ({}): {}", 
ex.getClass(), ex.getMessage());
+            logger.warn("Problem when trying to load anotations ({}): {}", 
ex.getClass(), ex.getMessage());
         }
     }
 
@@ -110,7 +97,7 @@
         try {
             return 
Class.forName("net.geant.perfsonar.SelfTestsConfiguration");
         } catch (ClassNotFoundException ex) {
-            logger.trace("SelfTestConfiguration class not found!");
+            logger.trace("No SelfTeest annotation or 
net.geant.perfsonar.SelfTestConfiguration class not found!");
             return null;
         }
     }
@@ -119,7 +106,7 @@
         try {
             return 
Class.forName("net.geant.perfsonar.LookupServiceRegister");
         } catch (ClassNotFoundException ex) {
-            logger.trace("LookupServiceRegister class not found!");
+            logger.debug("No @LookupServiceRegister annotation or 
net.geant.perfsonar.LookupServiceRegister class not found!");
             return null;
         }
     }
@@ -128,7 +115,7 @@
         try {
             return Class.forName("net.geant.perfsonar.Handlers");
         } catch (ClassNotFoundException ex) {
-            logger.trace("Handlers class not found!");
+            logger.debug("No @MetadataKey annotation or 
net.geant.perfsonar.Handlers class not found!");
             return null;
         }
     }
@@ -137,14 +124,16 @@
         try {
             return Class.forName("net.geant.perfsonar.XPaths");
         } catch (ClassNotFoundException ex) {
-            logger.trace("XPaths class not found!");
+            logger.debug("No @XPaths annotation or 
net.geant.perfsonar.XPaths class not found!");
             return null;
         }
     }
 
     private void configure(Class<?> annotations) throws Exception {
-        annotations.newInstance();
-        usingAPT = true;
+        if (annotations != null) {
+            annotations.newInstance();
+            usingAPT = true;
+        }
     }
 
     private static Scheduler createThreadPool() {

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
   2013-05-24 19:33:52 UTC (rev 6423)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
   2013-05-27 18:04:42 UTC (rev 6424)
@@ -48,7 +48,6 @@
                 Configuration.getHandler("MetadataKeyRequest"));
     }
 
-    @Ignore
     @Test
     public void checkMetadataKey() throws SAXException, IOException {
         logger.info("•••• Checking metadata key request");