perfsonar development work

Author: psnc.pietrzak
Date: 2010-05-24 14:37:09 +0100 (Mon, 24 May 2010)
New Revision: 5674

Modified:
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/axis2interface/PerfsonarService.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
Log:
Added log when JRE version is not compatible with JRE=1.6.0

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/axis2interface/PerfsonarService.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/axis2interface/PerfsonarService.java
   2010-05-24 13:21:35 UTC (rev 5673)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/axis2interface/PerfsonarService.java
   2010-05-24 13:37:09 UTC (rev 5674)
@@ -3,14 +3,17 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.context.ServiceContext;
+import org.apache.log4j.Logger;
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.requesthandler.axis2.Axis2RequestHandler;
+import org.perfsonar.base2.service.validation.JREVersion;
 
 /**
  * Axis2 handler for perfSONAR service
  * 
  * @author Roman Lapacz
  * @author Maciej Glowiak
+ * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
  *
  */
 public class PerfsonarService {
@@ -42,6 +45,13 @@
      */
     public void init(ServiceContext sc) {
         //runs while starting
+       final JREVersion jreVersion = new JREVersion();
+       if (!jreVersion.isJRECompatibleWith(1, 6)) {
+               Logger.getLogger(PerfsonarService.class).error("In order to 
run perfSONAR service JRE version must be >= 1.6.0. "
+                       + "JRE version is " + jreVersion.getJREVersion() + "."
+                       + "The application will terminate the servlet 
container.");
+               System.exit(1);
+       }
         serviceContext = sc;
         try {
             //init manager for the first time while starting service 

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2010-05-24 13:21:35 UTC (rev 5673)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2010-05-24 13:37:09 UTC (rev 5674)
@@ -54,8 +54,6 @@
 
 
     public Axis2RequestHandler() {
-       if (!new JREVersion().isJRECompatibleWith(1, 6))
-               System.exit(1);
     }