Changed code that reports it as a validation error to not have a properties file entry for model values containing a '$[' sequence

Author: mwooten

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -340,11 +340,13 @@ WLSDPLY-05029={0} is not one of the attribute names allowed in model location {1
 WLSDPLY-05030=Model location {0} uses variable {1} to represent the name of a model subfolder or attribute. \
   Substitution variables can only be used for folder instance names and attribute values.
 WLSDPLY-05031=Attribute {0} in model location {1} references a relative file location {2}.  This makes the model \
-  subject to failure unless the tool in voked from the correct location to resolve the relative path to the file. \
+  subject to failure unless the tool invoked from the correct location to resolve the relative path to the file. \
   It is recommended to use a path token if the absolute path is expected to change between systems.
 WLSDPLY-05032=Attribute {0} in model location {1} should be a dictionary but was a {2}
 WLSDPLY-05033=Attribute {0} in model location {1} should be a string but was a {2}
 WLSDPLY-05034=The value for attribute {0} in model location {1} should be a string or a list but was a {2}
+WLSDPLY-05035=The {0} attribute with value {1} in model location {2}, should be a string but was a {3}
+WLSDPLY-05036=Attribute {0} in model location {1}, uses the {2} macro expression for an integer or references to other another server template configuration element. The Oracle documentation for server templates, cites this as being not supported.
 
 
 # wlsdeploy/tools/validate/usage_printer.py

core/src/test/python/validation_test.py

@@ -23,11 +23,12 @@ class ValidationTestCase(unittest.TestCase):
     _class_name = 'ValidationTestCase'
     _resources_dir = '../../test-classes'
     _model_file = _resources_dir + '/test_jms_mail.json'
-    _variable_file = _resources_dir + "/test_sub_variable_file.properties"
+    _variable_file = None
+    _archive_file = None
+    # _variable_file = _resources_dir + "/test_sub_variable_file.properties"
     # _model_file = _resources_dir + '/test_empty.json'
     # _variable_file = _resources_dir + "/test_invalid_variable_file.properties"
-    # _variable_file = None
-    _archive_file = _resources_dir + "/test_jms_archive.zip"
+    # _archive_file = _resources_dir + "/test_jms_archive.zip"
     _logger = PlatformLogger('wlsdeploy.validate')
 
     def setUp(self):
@@ -41,11 +42,15 @@ def testModelValidation(self):
         mw_home = os.environ['MW_HOME']
         args_map = {
             '-oracle_home': mw_home,
-            '-model_file': self._model_file,
-            '-variable_file': self._variable_file,
-            '-archive_file': self._archive_file
+            '-model_file': self._model_file
         }
 
+        if self._variable_file is not None:
+            args_map['-variable_file'] = self._variable_file
+
+        if self._variable_file is not None:
+            args_map['-archive_file'] = self._archive_file
+
         model_context = ModelContext('ValidationTestCase', args_map)
 
         try: