Revision: 15548
Author: brainslog
Date: Mon Nov 29 09:25:41 2010
Log: Several fixes related with Diameter Dictionary Configuration

Update Issue 1963
Fixes to config and diameter.xml location.
http://code.google.com/p/mobicents/source/detail?r=15548

Modified:
/trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/StackImpl.java /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/helpers/XMLConfiguration.java /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/validation/DictionaryImpl.java /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/validation/MessageRepresentationImpl.java /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/server/impl/helpers/XMLConfiguration.java

=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/StackImpl.java Fri Nov 26 03:59:43 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/StackImpl.java Mon Nov 29 09:25:41 2010
@@ -132,8 +132,8 @@
                Configuration dictionaryConfiguration = dictionaryConfigs[0];
dictionaryClassName = dictionaryConfiguration.getStringValue(Parameters.DictionaryClass.ordinal(), (String) Parameters.DictionaryClass.defValue()); validatorEnabled = dictionaryConfiguration.getBooleanValue(Parameters.DictionaryEnabled.ordinal(), (Boolean) Parameters.DictionaryEnabled.defValue()); - validatorSendLevel = ValidatorLevel.fromString(dictionaryConfiguration.getStringValue(Parameters.DictionaryClass.ordinal(), (String) Parameters.DictionaryClass.defValue())); - validatorReceiveLevel = ValidatorLevel.fromString( dictionaryConfiguration.getStringValue(Parameters.DictionaryClass.ordinal(), (String) Parameters.DictionaryClass.defValue())); + validatorSendLevel = ValidatorLevel.fromString(dictionaryConfiguration.getStringValue(Parameters.DictionarySendLevel.ordinal(), (String) Parameters.DictionarySendLevel.defValue())); + validatorReceiveLevel = ValidatorLevel.fromString( dictionaryConfiguration.getStringValue(Parameters.DictionaryReceiveLevel.ordinal(), (String) Parameters.DictionaryReceiveLevel.defValue()));
         }

createDictionary(dictionaryClassName, validatorEnabled, validatorSendLevel, validatorReceiveLevel);
=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/helpers/XMLConfiguration.java Fri Nov 26 03:59:43 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/helpers/XMLConfiguration.java Mon Nov 29 09:25:41 2010
@@ -275,7 +275,7 @@
       param =  node.getAttributes().getNamedItem("enabled");
       if(param != null) {
         String enabled = param.getNodeValue();
-        dicConfiguration.add(DictionaryEnabled, enabled);
+        dicConfiguration.add(DictionaryEnabled, Boolean.valueOf(enabled));
       }

       param =  node.getAttributes().getNamedItem("sendLevel");
=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/validation/DictionaryImpl.java Fri Nov 26 19:17:07 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/validation/DictionaryImpl.java Mon Nov 29 09:25:41 2010
@@ -73,15 +73,15 @@
   public static final String _VALIDATOR_NODE_SEND_LEVEL_ATTR = "sendLevel";
public static final String _VALIDATOR_NODE_RECEIVE_LEVEL_ATTR = "receiveLevel";

-  private Map<AvpRepresentation, AvpRepresentation> avpMap;
-
-  private Map<String, String> vendorMap;
-
-  private Map<MessageRepresentation, MessageRepresentation> commandMap;
-
-  private Map<String, String> typedefMap;
-
-  private Map<String, AvpRepresentation> nameToCodeMap;
+ private Map<AvpRepresentation, AvpRepresentation> avpMap = new HashMap<AvpRepresentation, AvpRepresentation>();
+
+  private Map<String, String> vendorMap = new HashMap<String, String>();
+
+ private Map<MessageRepresentation, MessageRepresentation> commandMap = new HashMap<MessageRepresentation, MessageRepresentation>();
+
+  private Map<String, String> typedefMap = new HashMap<String, String>();
+
+ private Map<String, AvpRepresentation> nameToCodeMap = new HashMap<String, AvpRepresentation>();

   private boolean configured = false;

@@ -95,22 +95,41 @@
     try {
       is = DictionarySingleton.class.getResourceAsStream(confFile);
       if(is == null) {
- logger.debug("Failed to locate dictionary configuration file: {}, in class classloader. Trying thread context class loader.",confFile); + logger.debug("Failed to locate dictionary configuration file: {}, in class classloader. Trying thread context class loader.", confFile); is = Thread.currentThread().getContextClassLoader().getResourceAsStream(confFile);
       }

       if(is == null) {
- logger.debug("Failed to locate dictionary configuration file: {}, in thread context class classloader. Trying regular file.",confFile);
-        //try FIS
-        File f = new File(confFile);
-        is = new FileInputStream(f);
-      }
-      this.configure(is);
-
+ logger.debug("Failed to locate dictionary configuration file: {}, in thread context class loader. Trying using 'config/' prefix.", confFile); + is = Thread.currentThread().getContextClassLoader().getResourceAsStream("config/" + confFile);
+      }
+
+      if(is == null) {
+ logger.debug("Failed to locate dictionary configuration file: {}, in thread context class loader. Trying regular file.", confFile);
+        File fDict = new File(confFile);
+        if(fDict.exists()) {
+          is = new FileInputStream(fDict);
+        }
+        else {
+ logger.debug("Failed to locate dictionary configuration file: {}, from regular file. Trying using 'config/' prefix.", confFile);
+          fDict = new File("config/" + confFile);
+          if(fDict.exists()) {
+            is = new FileInputStream(fDict);
+          }
+        }
+      }
+
+      if(is != null) {
+        this.configure(is);
+      }
+      else {
+        this.setEnabled(false);
+ logger.warn("Failed to initialize and configure Diameter Dictionary since configuration file was not found. Validator is disabled.");
+      }
     }
     catch(FileNotFoundException fnfe) {
-      //normal, maybe its configured elsewhere?
- logger.debug("Could not load configuration file: {}, from any known location, dictionary is ", confFile);
+      // normal, maybe its configured elsewhere?
+ logger.debug("Could not load configuration file: {}, from any known location.", confFile);
     }
     finally {
       if(is != null) {
=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/validation/MessageRepresentationImpl.java Fri Nov 26 03:59:43 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/validation/MessageRepresentationImpl.java Mon Nov 29 09:25:41 2010
@@ -53,7 +53,7 @@
   private long applicationId = 0;

   private boolean isRequest = false;
- protected Map<AvpRepresentation, AvpRepresentation> unmuttableMessageAvps; + protected Map<AvpRepresentation, AvpRepresentation> unmuttableMessageAvps = new HashMap<AvpRepresentation, AvpRepresentation>();
   private String name = null;

public MessageRepresentationImpl(int commandCode, long applicationId, boolean isRequest) {
=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/server/impl/helpers/XMLConfiguration.java Fri Nov 26 03:59:43 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/server/impl/helpers/XMLConfiguration.java Mon Nov 29 09:25:41 2010
@@ -269,7 +269,7 @@
     param =  node.getAttributes().getNamedItem("enabled");
     if(param != null) {
       String enabled = param.getNodeValue();
-      dicConfiguration.add(DictionaryEnabled, enabled);
+      dicConfiguration.add(DictionaryEnabled, Boolean.valueOf(enabled));
     }

     param =  node.getAttributes().getNamedItem("sendLevel");

Reply via email to