Merge pull request #142 from oracle/issue#140-standalone-validation-fails-with-tokens

Issue #140 - Check for token prefix before checking for relative paths

Author: ddsharpe

core/src/main/python/wlsdeploy/tool/validate/validator.py

@@ -922,9 +922,9 @@ def __validate_single_path_in_archive(self, path, attribute_name, model_folder_p
             self._logger.finest('tokens={0}', str(tokens), class_name=_class_name, method_name=_method_name)
             # TODO(mwooten) - This would be a good place to validate any path token found...
 
-            substituted_path = self._model_context.replace_token_string(path)
-            if not os.path.isabs(substituted_path):
-                validation_result.add_info('WLSDPLY-05031', attribute_name, model_folder_path, substituted_path)
+            if not self._model_context.has_token_prefix(path):
+                if not os.path.isabs(path):
+                    validation_result.add_info('WLSDPLY-05031', attribute_name, model_folder_path, path)
 
         return validation_result
 

core/src/main/python/wlsdeploy/util/model_context.py

@@ -425,6 +425,18 @@ def replace_tokens_in_path(self, attribute_name, resource_dict):
         resource_dict[attribute_name] = result
         return
 
+    def has_token_prefix(self, path):
+        """
+        Determines if the specified path begins with one of the known, portable token prefix paths.
+        :param path: the path to check for token prefix
+        :return: true if the path begins with a known prefix, false otherwise
+        """
+        return path.startswith(self.__ORACLE_HOME_TOKEN) or \
+               path.startswith(self.__WL_HOME_TOKEN) or \
+               path.startswith(self.__DOMAIN_HOME_TOKEN) or \
+               path.startswith(self.__CURRENT_DIRECTORY_TOKEN) or \
+               path.startswith(self.__TEMP_DIRECTORY_TOKEN)
+
     def replace_tokens(self, resource_type, resource_name, attribute_name, resource_dict):
         """
         Replace the tokens in attribute value with the current value.