perfsonar development work

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

Modified:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/AuxiliaryComponentManager.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
   
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/configuration/properties/PropertiesConfigurationComponent.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/context/inMemory/InMemoryContext.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/Scheduler.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/StringBufferOutputStream.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddress.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddressConvertor.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IpTrie.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IpTrieNode.java
   trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/Trie.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/TrieNode.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/WSSAuthNX509Data.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClient.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserIDCallbackHandler.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthNEERequestGenerator.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthREERequestGenerator.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/client/base/xquery/lookupService/GenericXQueryExpression.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchManager.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrRequest.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecurityToken.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/XmlDbResult.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/HTTPResult.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
Log:
perfsonar_base, perfsonar-java-sql-ma: Declare fields final when possible

Issue: PSSERVICES-597

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/AuxiliaryComponentManager.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/AuxiliaryComponentManager.java
      2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/AuxiliaryComponentManager.java
      2012-10-05 09:22:53 UTC (rev 6016)
@@ -34,7 +34,7 @@
     /**
      * Static reference to Auxiliary Component Manager
      */
-    private static AuxiliaryComponentManager componentManager = new 
AuxiliaryComponentManager();
+    private static final AuxiliaryComponentManager componentManager = new 
AuxiliaryComponentManager();
 
     private static final Object initialiseMutex = new Object();
 
@@ -45,7 +45,7 @@
     /**
      * Map of components (component_name, component object reference)
      */
-    private ConcurrentMap<String, AuxiliaryComponent> components = new 
ConcurrentHashMap<String, AuxiliaryComponent>();
+    private final ConcurrentMap<String, AuxiliaryComponent> components = new 
ConcurrentHashMap<String, AuxiliaryComponent>();
 
     private String webInfLocation;
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
  2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
  2012-10-05 09:22:53 UTC (rev 6016)
@@ -57,8 +57,8 @@
     public class Entry
     {
 
-        private String name;
-        private String value;
+        private final String name;
+        private final String value;
 
         public Entry(String name, String value)
         {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
 2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
 2012-10-05 09:22:53 UTC (rev 6016)
@@ -37,11 +37,11 @@
 
 public class DynamicCrypto implements Crypto
 {
-    private static Log log = LogFactory.getLog(DynamicCrypto.class);
+    private static final Log log = LogFactory.getLog(DynamicCrypto.class);
     protected static CertificateFactory certFact;
     protected Properties properties = null;
     protected KeyStore keystore = null;
-    static String SKI_OID = "2.5.29.14";
+    static final String SKI_OID = "2.5.29.14";
 
     public DynamicCrypto() throws CredentialException
     {

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:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
     2012-10-05 09:22:53 UTC (rev 6016)
@@ -31,10 +31,10 @@
     private ConfigurationComponent configuration;
 
     private boolean checkAuthN;
-    private Set<String> messageTypesAuthN;
+    private final Set<String> messageTypesAuthN;
 
     private boolean checkAuthR;
-    private Set<String> messageTypesAuthR;
+    private final Set<String> messageTypesAuthR;
 
     public WSSecAuthNComponent()
     {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
   2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
   2012-10-05 09:22:53 UTC (rev 6016)
@@ -20,7 +20,7 @@
     implements AuxiliaryComponent, ConfigurationComponent
 {
 
-    private Logger logger = 
Logger.getLogger(PropertiesConfigurationComponent.class.getName());
+    private final Logger logger = 
Logger.getLogger(PropertiesConfigurationComponent.class.getName());
 
     // ---------------------------------- class fields
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/context/inMemory/InMemoryContext.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/context/inMemory/InMemoryContext.java
    2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/context/inMemory/InMemoryContext.java
    2012-10-05 09:22:53 UTC (rev 6016)
@@ -16,7 +16,7 @@
 public class InMemoryContext implements AuxiliaryComponent, 
PerfsonarContextComponent
 {
 
-    private ConcurrentMap<Object, Object> backingMap = new 
ConcurrentHashMap<Object, Object>();
+    private final ConcurrentMap<Object, Object> backingMap = new 
ConcurrentHashMap<Object, Object>();
     private String componentName;
 
     @Override

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
   2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
   2012-10-05 09:22:53 UTC (rev 6016)
@@ -24,7 +24,7 @@
 
     private String componentName = "expression_mapping";
 
-    private Map<String, String> mappings;
+    private final Map<String, String> mappings;
 
 
     // --------------------------------------------------- Constructor

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/Scheduler.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/Scheduler.java
   2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/Scheduler.java
   2012-10-05 09:22:53 UTC (rev 6016)
@@ -44,7 +44,7 @@
 
     private int wakeupInterval = 10000; //milliseconds
 
-    private Set<SchedulerTask> tasks = Collections.synchronizedSet(new 
HashSet<SchedulerTask>());
+    private final Set<SchedulerTask> tasks = Collections.synchronizedSet(new 
HashSet<SchedulerTask>());
 
 
     //  -------------------------------------------------- Constructor

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:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/SchedulerTask.java
       2012-10-05 09:22:53 UTC (rev 6016)
@@ -4,7 +4,7 @@
 public class SchedulerTask
 {
 
-    private long MIN_INTERVAL = 100; //ms
+    private final long MIN_INTERVAL = 100; //ms
 
     // --------------------------------------------- private variables
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/StringBufferOutputStream.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/StringBufferOutputStream.java
    2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/StringBufferOutputStream.java
    2012-10-05 09:22:53 UTC (rev 6016)
@@ -15,7 +15,7 @@
     /**
      * Local StringBuffer
      */
-    private StringBuffer sb;
+    private final StringBuffer sb;
 
 
     /**

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddress.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddress.java
    2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddress.java
    2012-10-05 09:22:53 UTC (rev 6016)
@@ -9,7 +9,7 @@
  */
 public class IPAddress
 {
-    private String addrAsString;
+    private final String addrAsString;
     private long addrAsLong;
     private long maskAsLong;
 

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:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddressConvertor.java
   2012-10-05 09:22:53 UTC (rev 6016)
@@ -10,7 +10,7 @@
     private String ipAddress;
     private int subnetMask;
     private String keyMappedToIPAddress;
-    String message = "Invalid IP address specified";
+    final String message = "Invalid IP address specified";
 
     public IPAddressConvertor(String ipAddress) throws 
InvalidIPAddressException
     {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IpTrie.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IpTrie.java 
      2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IpTrie.java 
      2012-10-05 09:22:53 UTC (rev 6016)
@@ -15,8 +15,8 @@
 {
 
 
-    private Trie trie;
-    private ArrayList<IpTrieNode> nodelist;
+    private final Trie trie;
+    private final ArrayList<IpTrieNode> nodelist;
     IpTrieNode root;
 
     public IpTrie(Trie t)

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IpTrieNode.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IpTrieNode.java
   2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IpTrieNode.java
   2012-10-05 09:22:53 UTC (rev 6016)
@@ -8,15 +8,15 @@
  */
 public class IpTrieNode
 {
-    long mask;
+    final long mask;
     long ipAddress;
-    long key;
-    String keyString;
-    String addrString;
-    TrieNode trieNode;
+    final long key;
+    final String keyString;
+    final String addrString;
+    final TrieNode trieNode;
     IpTrieNode parent;
     IpTrieNode childZero, childOne;
-    long childCount;
+    final long childCount;
 
     public IpTrieNode(TrieNode tnode, long position, long currentKey)
     {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/Trie.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/Trie.java 
2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/Trie.java 
2012-10-05 09:22:53 UTC (rev 6016)
@@ -15,14 +15,14 @@
 {
     private int nodeCount;
 
-    private ArrayList<TrieNode> keyList = new ArrayList<TrieNode>();
+    private final ArrayList<TrieNode> keyList = new ArrayList<TrieNode>();
 
     public ArrayList<TrieNode> getKeyList()
     {
         return keyList;
     }
 
-    private TrieNode rootNode;
+    private final TrieNode rootNode;
 
     public Trie(TrieNode rootnode)
     {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/TrieNode.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/TrieNode.java
     2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/TrieNode.java
     2012-10-05 09:22:53 UTC (rev 6016)
@@ -25,7 +25,7 @@
 
     private TrieNode childOne;
 
-    HelperClass helper = new HelperClass();
+    final HelperClass helper = new HelperClass();
 
     public void incrementChildCount()
     {

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:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
    2012-10-05 09:22:53 UTC (rev 6016)
@@ -50,10 +50,10 @@
 import org.w3c.dom.Text;
 
 public class WSSAuthNSAMLData implements AuthNSAMLData {
-       private static int defaultTtl=900;
+       private static final int defaultTtl=900;
 
-       private String sigalg = XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1;
-    private String digalg = MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1;
+       private final String sigalg = XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1;
+    private 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/WSSAuthNX509Data.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
    2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
    2012-10-05 09:22:53 UTC (rev 6016)
@@ -42,7 +42,7 @@
 import org.w3c.dom.Element;
 
 public class WSSAuthNX509Data implements AuthNX509Data {
-       private static int defaultTtl=900;
+       private static final int defaultTtl=900;
 
        @Override
     public Object addX509STInMessage(Object message,String 
privKeyFile,String certFile) throws PerfSONARException {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClient.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClient.java
 2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClient.java
 2012-10-05 09:22:53 UTC (rev 6016)
@@ -16,9 +16,9 @@
 
 public class SASLCAClient {
        private ClientProtocolHandler clientProtocolHandler;
-       private UserID userID;
-       private UserIDCallbackHandler cbh;
-       private SASLCAClientConfiguration clientConfig;
+       private final UserID userID;
+       private final UserIDCallbackHandler cbh;
+       private final SASLCAClientConfiguration clientConfig;
 
        public SASLCAClient(UserID userID, SASLCAClientConfiguration 
clientConfig) throws PerfSONARException {
                this.userID=userID;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserIDCallbackHandler.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserIDCallbackHandler.java
        2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserIDCallbackHandler.java
        2012-10-05 09:22:53 UTC (rev 6016)
@@ -9,7 +9,7 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 
 public class UserIDCallbackHandler implements CallbackHandler {
-       UserID userId;
+       final UserID userId;
        
        public UserIDCallbackHandler(UserID userId) {
                this.userId=userId;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
       2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
       2012-10-05 09:22:53 UTC (rev 6016)
@@ -18,12 +18,12 @@
 import org.perfsonar.service.base.authn.AttrRequest;
 
 public class AttrEERequestGenerator implements RequestGenerator {
-       private static String metaId = "attrmetadata";
-       private static String paramsId = "keys";
-       private static String paramKey = "SecurityToken";
-       private static String dataId = "attr1";
-       private static String 
WSS_X509="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
-       private static String messageType = "AttrEERequest";
+       private static final String metaId = "attrmetadata";
+       private static final String paramsId = "keys";
+       private static final String paramKey = "SecurityToken";
+       private static final String dataId = "attr1";
+       private static final String 
WSS_X509="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
+       private static final String messageType = "AttrEERequest";
 
        @Override
     public Message generateRequestMessage() throws PerfSONARException {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthNEERequestGenerator.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthNEERequestGenerator.java
      2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthNEERequestGenerator.java
      2012-10-05 09:22:53 UTC (rev 6016)
@@ -8,12 +8,12 @@
 import org.perfsonar.client.base.requests.RequestGenerator;
 
 public class AuthNEERequestGenerator implements RequestGenerator {
-       private static String metaId = "authNmetadata";
-       private static String paramsId = "keys";
-       private static String paramKey = "SecurityToken";
-       private static String dataId = "authN1";
-       private static String 
WSS_X509="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
-       private static String messageType = "AuthNEERequest";
+       private static final String metaId = "authNmetadata";
+       private static final String paramsId = "keys";
+       private static final String paramKey = "SecurityToken";
+       private static final String dataId = "authN1";
+       private static final String 
WSS_X509="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
+       private static final String messageType = "AuthNEERequest";
 
        @Override
     public Message generateRequestMessage() throws PerfSONARException {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthREERequestGenerator.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthREERequestGenerator.java
      2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthREERequestGenerator.java
      2012-10-05 09:22:53 UTC (rev 6016)
@@ -8,12 +8,12 @@
 import org.perfsonar.client.base.requests.RequestGenerator;
 
 public class AuthREERequestGenerator implements RequestGenerator {
-       private static String metaId = "authRmetadata";
-       private static String paramsId = "keys";
-       private static String paramKey = "SecurityToken";
-       private static String dataId = "authR1";
-       private static String 
WSS_X509="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
-       private static String messageType = "AuthREERequest";
+       private static final String metaId = "authRmetadata";
+       private static final String paramsId = "keys";
+       private static final String paramKey = "SecurityToken";
+       private static final String dataId = "authR1";
+       private static final String 
WSS_X509="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
+       private static final String messageType = "AuthREERequest";
 
        @Override
     public Message generateRequestMessage() throws PerfSONARException {

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:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSDeregisterRequestGenerator.java
       2012-10-05 09:22:53 UTC (rev 6016)
@@ -44,7 +44,7 @@
        /**
         * data Id
         */
-       private String keyName = "lsKey";
+       private 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:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSKeepaliveRequestGenerator.java
        2012-10-05 09:22:53 UTC (rev 6016)
@@ -43,7 +43,7 @@
        /**
         * data Id
         */
-       private String keyName = "lsKey";
+       private final String keyName = "lsKey";
 
        /**
         * Default query

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
      2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
      2012-10-05 09:22:53 UTC (rev 6016)
@@ -27,7 +27,7 @@
 
     // ---------------------------------------------------- instance 
variables
 
-    private HashMap<String,Condition> conditions
+    private final HashMap<String,Condition> conditions
         = new HashMap<String,Condition>();
 
     private int resultType = RETURN_SERVICE_URL;
@@ -261,8 +261,8 @@
          public final static int SUFFIX   = 2;
          public final static int CONTAINS = 3;
 
-         private String name;
-         private String value;
+         private final String name;
+         private final String value;
          private int conditionType = 0;
 
          public Condition(String name, String value, int conditionType) {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchManager.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchManager.java
  2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchManager.java
  2012-10-05 09:22:53 UTC (rev 6016)
@@ -4,7 +4,7 @@
 
 public class AADispatchManager
 {
-    AADispatchProtocol protocol;
+    final AADispatchProtocol protocol;
 
     public AADispatchManager(AADispatchProtocol prot)
     {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrRequest.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrRequest.java
        2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrRequest.java
        2012-10-05 09:22:53 UTC (rev 6016)
@@ -10,7 +10,7 @@
 {
     String issuer;
     String subject;
-    Map<String, Map<String, List<String>>> attrs;
+    final Map<String, Map<String, List<String>>> attrs;
 
     public AttrRequest()
     {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
       2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
       2012-10-05 09:22:53 UTC (rev 6016)
@@ -29,9 +29,9 @@
     public static final int ATTR_BAD_RESPONSE = 1;
     public static final String NS_SUBJECT_AA = 
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/as/attr/1.0/";;
 
-    private Map<String, List<String>> attributes;
+    private final Map<String, List<String>> attributes;
     private String samlRawResponse;
-    private XPath xpath;
+    private final XPath xpath;
 
     public AttrResponse()
     {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecurityToken.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecurityToken.java
       2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecurityToken.java
       2012-10-05 09:22:53 UTC (rev 6016)
@@ -4,7 +4,7 @@
 
 public class SecurityToken
 {
-    private SecTokenManager tm;
+    private final SecTokenManager tm;
     private Object secToken;
     private Object secTokenValue;
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
     2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
     2012-10-05 09:22:53 UTC (rev 6016)
@@ -49,7 +49,7 @@
         LSSUMMARY("lssummary"),
         CONTEXT("context");
 
-        private String name;
+        private final String name;
 
 
         ContentType(String name)
@@ -79,7 +79,7 @@
 
     // -------------------------------------------- class fields
 
-    private Message responseMessage = null;
+    private final Message responseMessage = null;
 
     private String componentName = "ls-registrator";
 
@@ -89,7 +89,7 @@
 
     private Scheduler scheduler = null;
 
-    private ArrayList<Message> responseMessages = new ArrayList<Message>();
+    private final ArrayList<Message> responseMessages = new 
ArrayList<Message>();
 
     // ---------------------------------- constructors
 

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:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2012-10-05 09:22:53 UTC (rev 6016)
@@ -53,7 +53,7 @@
     //private ExistDbHttpXmlStorageManager storage = null;
     //private ExistDbXmlrpcXmlStorageManager storage = null;
     private ExistDbGenericStorageManager storage = null;
-    private int connectionType = HTTP; //XMLRPC or HTTP
+    private final int connectionType = HTTP; //XMLRPC or HTTP
 
 
     // ----------------------------------------------------------------------
@@ -609,10 +609,10 @@
     class ServiceSummary
     {
 
-        public HashSet<String> eventTypes = new HashSet<String>();
+        public final HashSet<String> eventTypes = new HashSet<String>();
         public HashSet<String> domains = new HashSet<String>();
         public HashSet<String> ipAddresses = new HashSet<String>();
-        public HashSet<String> keywords = new HashSet<String>();
+        public final HashSet<String> keywords = new HashSet<String>();
 
         public String toString()
         {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/XmlDbResult.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/XmlDbResult.java
        2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/XmlDbResult.java
        2012-10-05 09:22:53 UTC (rev 6016)
@@ -16,7 +16,7 @@
 
     // -------------------------------------------- Instance variables
 
-    private String[] results;
+    private final String[] results;
     private int total = 0; //total results
     private int start = 0; //number of first result returned
     private int count = 0; //number of total results returned

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/HTTPResult.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/HTTPResult.java
      2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/HTTPResult.java
      2012-10-05 09:22:53 UTC (rev 6016)
@@ -10,9 +10,9 @@
 public class HTTPResult
 {
 
-    private InputStream response;
-    private int resultCode;
-    private String resultMessage;
+    private final InputStream response;
+    private final int resultCode;
+    private final String resultMessage;
 
     public HTTPResult(
         InputStream response,

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:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
    2012-10-05 09:22:53 UTC (rev 6016)
@@ -36,9 +36,9 @@
     //-------------------------------------------- class fields
 
 
-    private String digesterRules = "perfsonar/conf/eventType-rules.xml";
+    private final String digesterRules = 
"perfsonar/conf/eventType-rules.xml";
 
-    private String digesterInput = "perfsonar/conf/eventType-map.xml";
+    private final String digesterInput = "perfsonar/conf/eventType-map.xml";
 
     private String componentName = null;
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
   2012-10-05 09:22:52 UTC (rev 6015)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
   2012-10-05 09:22:53 UTC (rev 6016)
@@ -319,7 +319,7 @@
     private class StringBufferOutputStream extends OutputStream
     {
 
-        private StringBuffer sb;
+        private final StringBuffer sb;
 
         public StringBufferOutputStream(StringBuffer sb)
         {