perfsonar development work

Author: nordunet.behrmann
Date: 2012-10-05 10:22:55 +0100 (Fri, 05 Oct 2012)
New Revision: 6018

Modified:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/SchedulerTask.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddressConvertor.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClientConfiguration.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSDeregisterRequestGenerator.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSKeepaliveRequestGenerator.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
Log:
perfsonar_base: Make field static when possible

Issue: PSSERVICES-597

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
     2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
     2012-10-05 09:22:55 UTC (rev 6018)
@@ -25,7 +25,7 @@
 
 public class WSSecAuthNComponent implements AuthNComponent, 
AuxiliaryComponent
 {
-    private final String COMP_ID_SERVICE = "service.as.comp_id";
+    private static final String COMP_ID_SERVICE = "service.as.comp_id";
     private String componentName = null;
     private LoggerComponent logger;
     private ConfigurationComponent configuration;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/SchedulerTask.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/SchedulerTask.java
       2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/SchedulerTask.java
       2012-10-05 09:22:55 UTC (rev 6018)
@@ -4,7 +4,7 @@
 public class SchedulerTask
 {
 
-    private final long MIN_INTERVAL = 100; //ms
+    private static final long MIN_INTERVAL = 100; //ms
 
     // --------------------------------------------- private variables
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddressConvertor.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddressConvertor.java
   2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddressConvertor.java
   2012-10-05 09:22:55 UTC (rev 6018)
@@ -10,7 +10,7 @@
     private String ipAddress;
     private int subnetMask;
     private String keyMappedToIPAddress;
-    final String message = "Invalid IP address specified";
+    static final String message = "Invalid IP address specified";
 
     public IPAddressConvertor(String ipAddress) throws 
InvalidIPAddressException
     {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
    2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
    2012-10-05 09:22:55 UTC (rev 6018)
@@ -52,8 +52,8 @@
 public class WSSAuthNSAMLData implements AuthNSAMLData {
        private static final int defaultTtl=900;
 
-       private final String sigalg = XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1;
-    private final String digalg = MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1;
+       private static final String sigalg = 
XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1;
+    private static final String digalg = 
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1;
 
        @Override
     public Object addSAMLSTInMessage(Object message,

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClientConfiguration.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClientConfiguration.java
    2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClientConfiguration.java
    2012-10-05 09:22:55 UTC (rev 6018)
@@ -63,15 +63,15 @@
 
        private ConfigurationComponent config;
 
-       private final String SASLCA_SERVER_PARAM = "service.saslca.server";
+       private static final String SASLCA_SERVER_PARAM = 
"service.saslca.server";
 
-       private final String SASLCA_SERVER_PORT = "service.saslca.port";
+       private static final String SASLCA_SERVER_PORT = 
"service.saslca.port";
 
-       private final String SASLCA_KEY_ALG = "service.saslca.keyalg";
+       private static final String SASLCA_KEY_ALG = "service.saslca.keyalg";
 
-       private final String SASLCA_KEY_STRENGTH = "server.saslca.keystrengh";
+       private static final String SASLCA_KEY_STRENGTH = 
"server.saslca.keystrengh";
 
-       private final String SASLCA_SEC_LAYER = "server.saslca.seclayer";
+       private static final String SASLCA_SEC_LAYER = 
"server.saslca.seclayer";
 
        /** hostname of the SASL-CA server */
        private String serverName = null;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSDeregisterRequestGenerator.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSDeregisterRequestGenerator.java
       2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSDeregisterRequestGenerator.java
       2012-10-05 09:22:55 UTC (rev 6018)
@@ -44,7 +44,7 @@
        /**
         * data Id
         */
-       private final String keyName = "lsKey";
+       private static final String keyName = "lsKey";
 
        /**
         * Default query

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSKeepaliveRequestGenerator.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSKeepaliveRequestGenerator.java
        2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSKeepaliveRequestGenerator.java
        2012-10-05 09:22:55 UTC (rev 6018)
@@ -43,7 +43,7 @@
        /**
         * data Id
         */
-       private final String keyName = "lsKey";
+       private static final String keyName = "lsKey";
 
        /**
         * Default query

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
     2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
     2012-10-05 09:22:55 UTC (rev 6018)
@@ -44,8 +44,8 @@
     public static final String WSS_X509 = 
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
     public static final String WSS_SAML = 
"http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1";;
 
-    private final String AS_POINT_PARAM = "service.as.point";
-    private final String SAX_PARSER_CONFIG = "service.sax_parser.config";
+    private static final String AS_POINT_PARAM = "service.as.point";
+    private static final String SAX_PARSER_CONFIG = 
"service.sax_parser.config";
     private LoggerComponent logger;
     private ConfigurationComponent config;
     private String asPoint;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
 2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
 2012-10-05 09:22:55 UTC (rev 6018)
@@ -42,8 +42,8 @@
 
 public class SecTokenSOAPManager implements SecTokenManager
 {
-    private final String WSSECHEADER_NS = 
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";;
-    private final String WSSECHEADER = "Security";
+    private static final String WSSECHEADER_NS = 
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";;
+    private static final String WSSECHEADER = "Security";
     private static final String URN_USER_FED = ":user:";
 
     private LoggerComponent logger = null;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2012-10-05 09:22:55 UTC (rev 6018)
@@ -53,7 +53,7 @@
     //private ExistDbHttpXmlStorageManager storage = null;
     //private ExistDbXmlrpcXmlStorageManager storage = null;
     private ExistDbGenericStorageManager storage = null;
-    private final int connectionType = HTTP; //XMLRPC or HTTP
+    private static final int connectionType = HTTP; //XMLRPC or HTTP
 
 
     // ----------------------------------------------------------------------

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
    2012-10-05 09:22:54 UTC (rev 6017)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
    2012-10-05 09:22:55 UTC (rev 6018)
@@ -36,9 +36,9 @@
     //-------------------------------------------- class fields
 
 
-    private final String digesterRules = 
"perfsonar/conf/eventType-rules.xml";
+    private static final String digesterRules = 
"perfsonar/conf/eventType-rules.xml";
 
-    private final String digesterInput = "perfsonar/conf/eventType-map.xml";
+    private static final String digesterInput = 
"perfsonar/conf/eventType-map.xml";
 
     private String componentName = null;