Merge branch 'master' into Issue#168-Arrays-needed-to-version-folders

CarolynRountree · CarolynRountree · commit 251665334764 · 2019-01-18T12:19:47.000-06:00
diff --git a/KnownIssues.txt b/KnownIssues.txt
@@ -10,4 +10,13 @@ ACTION:
    Ignore the following messages logged during discover of a 12.2.1 domain.
 
    ####<Jan 14, 2019 1:14:21 PM> <SEVERE> <CommandExceptionHandler> <handleException> <> <Error: cd() failed.>
-   ####<Jan 14, 2019 1:14:21 PM> <SEVERE> <CommandExceptionHandler> <handleException> <> <Error: ls() failed.>
+   ####<Jan 14, 2019 1:14:21 PM> <SEVERE> <CommandExceptionHandler> <handleException> <> <Error: ls() failed.>
+
+
+ISSUE:
+   The createDomain tool cannot create 11g JRF domains. The tool will issue error messages in the log, and
+   terminate the create process. The discoverDomain tool can discover 11g JRF domains, and those domains can be
+   configured with the updateDomain and deploy tools.
+
+ACTION:
+   Do not use the createDomain tool for 11g JRF domains. This functionality may be available in a future release.
diff --git a/core/src/main/java/oracle/weblogic/deploy/logging/PlatformLogger.java b/core/src/main/java/oracle/weblogic/deploy/logging/PlatformLogger.java
@@ -542,7 +542,9 @@ public static List<Logger> getLoggers() {
         while (e.hasMoreElements()) {
             String loggerName = e.nextElement();
             Logger logger = manager.getLogger(loggerName);
-            topList.add(logger);
+            if(logger != null) {
+                topList.add(logger);
+            }
         }
         return topList;
     }
diff --git a/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java b/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java
@@ -74,6 +74,11 @@ public class WLSDeployArchive {
      */
     public static final String ARCHIVE_COHERENCE_TARGET_DIR = WLSDPLY_ARCHIVE_BINARY_DIR + "/coherence";
 
+    /**
+     * The subdirectory where node manager files are stored and extracted (such as keystore file).
+     */
+    public static final String ARCHIVE_NODE_MANAGER_TARGET_DIR = WLSDPLY_ARCHIVE_BINARY_DIR + "/nodeManager";
+
     /**
      * The subdirectory to which the scripts are extracted.
      */
@@ -867,6 +872,25 @@ public String addFileStoreDirectory(String fileStoreName) throws
         return newName;
     }
 
+    /**
+     * Add a Node Manager Identity Key Store file to the node manager directory in the archive.
+     *
+     * @param keystoreFile the file to add
+     * @return the new location of the file to use in the model
+     * @throws WLSDeployArchiveIOException if an error occurs while archiving the file
+     * @throws IllegalArgumentException if the file does not exist
+     */
+    public String addNodeManagerKeyStoreFile(File keystoreFile) throws WLSDeployArchiveIOException {
+        final String METHOD = "addNodeManagerKeyStoreFile";
+
+        LOGGER.entering(CLASS, METHOD, keystoreFile);
+
+        validateExistingFile(keystoreFile, "keyStoreFile", getArchiveFileName(), METHOD);
+        String newName = addItemToZip(ARCHIVE_NODE_MANAGER_TARGET_DIR, keystoreFile);
+        LOGGER.exiting(CLASS, METHOD, newName);
+        return newName;
+    }
+
     /**
      * This method removes all binaries from the archive.  This method is intended to
      * be invoked by discovery to remove binaries from a previous run that might
diff --git a/core/src/main/python/create.py b/core/src/main/python/create.py
@@ -362,7 +362,7 @@ def main(args):
         variable_map = {}
         if model_context.get_variable_file():
             variable_map = variables.load_variables(model_context.get_variable_file())
-        variables.substitute(model, variable_map)
+        variables.substitute(model, variable_map, model_context)
     except VariableException, ex:
         __logger.severe('WLSDPLY-20004', _program_name, ex.getLocalizedMessage(), error=ex,
                         class_name=_class_name, method_name=_method_name)
diff --git a/core/src/main/python/deploy.py b/core/src/main/python/deploy.py
@@ -448,7 +448,7 @@ def main(args):
         variable_map = {}
         if model_context.get_variable_file():
             variable_map = variables.load_variables(model_context.get_variable_file())
-        variables.substitute(model_dictionary, variable_map)
+        variables.substitute(model_dictionary, variable_map, model_context)
     except VariableException, ex:
         __logger.severe('WLSDPLY-20004', _program_name, ex.getLocalizedMessage(), error=ex,
                         class_name=_class_name, method_name=_method_name)
diff --git a/core/src/main/python/update.py b/core/src/main/python/update.py
@@ -466,7 +466,7 @@ def main(args):
         variable_map = {}
         if model_context.get_variable_file():
             variable_map = variables.load_variables(model_context.get_variable_file())
-        variables.substitute(model_dictionary, variable_map)
+        variables.substitute(model_dictionary, variable_map, model_context)
     except VariableException, ex:
         __logger.severe('WLSDPLY-20004', _program_name, ex.getLocalizedMessage(), error=ex,
                         class_name=_class_name, method_name=_method_name)
diff --git a/core/src/main/python/wlsdeploy/tool/deploy/applications_deployer.py b/core/src/main/python/wlsdeploy/tool/deploy/applications_deployer.py
@@ -387,6 +387,9 @@ def __get_library_references(self, base_location):
         _method_name = '__get_library_references'
 
         self.logger.entering(str(base_location), class_name=self._class_name, method_name=_method_name)
+        # In 12.1.3 and older release this internal library is accidentally exposed in libraryruntimes mbean
+
+        internal_skip_list = ['bea_wls_async_response']
 
         location = LocationContext(base_location).append_location(LIBRARY)
         token_name = self.alias_helper.get_name_token(location)
@@ -403,6 +406,8 @@ def __get_library_references(self, base_location):
             libs = self.wlst_helper.get_existing_object_list(library_runtime_path)
 
             for lib in libs:
+                if lib in internal_skip_list:
+                    continue
                 self.wlst_helper.domain_runtime()
                 self.wlst_helper.cd(library_runtime_path + lib)
                 runtime_attributes = self.wlst_helper.lsa()
diff --git a/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py
@@ -578,7 +578,7 @@ def _add_library(self, server_name, classpath_name):
 
     def _add_keystore_file_to_archive(self, model_name, model_value, location):
         """
-        Add the Server custom trust or identity keystore file to the archive.
+        Add the custom trust or identity keystore file to the archive.
         :param model_name: attribute name in the model
         :param model_value: converted model value for the attribute
         :param location: context containing the current location information
@@ -591,20 +591,62 @@ def _add_keystore_file_to_archive(self, model_name, model_value, location):
             server_name = self._get_server_name_from_location(location)
             archive_file = self._model_context.get_archive_file()
             file_path = self._convert_path(model_value)
-            _logger.finer('WLSDPLY-06623', file_path, server_name, class_name=_class_name, method_name=_method_name)
-            try:
-                new_name = archive_file.addServerKeyStoreFile(server_name, File(file_path))
-            except IllegalArgumentException, iae:
-                _logger.warning('WLSDPLY-06624', server_name, file_path, iae.getLocalizedMessage(),
-                                class_name=_class_name, method_name=_method_name)
-            except WLSDeployArchiveIOException, wioe:
-                de = exception_helper.create_discover_exception('WLSDPLY-06625', server_name, file_path,
-                                                                wioe.getLocalizedMessage())
-                _logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
-                raise de
+            if server_name:
+                new_name = self._add_server_keystore_file_to_archive(server_name, archive_file, file_path)
+            else:
+                new_name = self._add_node_manager_keystore_file_to_archive(archive_file, file_path)
+
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=new_name)
         return new_name
 
+    def _add_server_keystore_file_to_archive(self, server_name, archive_file, file_path):
+        """
+        Add the Server custom trust or identity keystore file to the archive.
+        :param server_name: attribute name in the model
+        :param archive_file: converted model value for the attribute
+        :param file_path: context containing the current location information
+        :return: modified location and name for the model keystore file
+        """
+        _method_name = '_add_server_keystore_file_to_archive'
+        _logger.entering(server_name, archive_file, file_path, class_name=_class_name, method_name=_method_name)
+        _logger.finer('WLSDPLY-06623', file_path, server_name, class_name=_class_name, method_name=_method_name)
+        new_name = None
+
+        try:
+            new_name = archive_file.addServerKeyStoreFile(server_name, File(file_path))
+        except IllegalArgumentException, iae:
+            _logger.warning('WLSDPLY-06624', server_name, file_path, iae.getLocalizedMessage(),
+                            class_name=_class_name, method_name=_method_name)
+        except WLSDeployArchiveIOException, wioe:
+            de = exception_helper.create_discover_exception('WLSDPLY-06625', server_name, file_path,
+                                                            wioe.getLocalizedMessage())
+            _logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
+            raise de
+        return new_name
+
+    def _add_node_manager_keystore_file_to_archive(self, archive_file, file_path):
+        """
+        Add the node manager custom trust or identity keystore file to the archive.
+        :param archive_file: converted model value for the attribute
+        :param file_path: context containing the current location information
+        :return: modified location and name for the model keystore file
+        """
+        _method_name = '_add_node_manager_keystore_file_to_archive'
+        _logger.entering(archive_file, file_path, class_name=_class_name, method_name=_method_name)
+        _logger.finer('WLSDPLY-06636', file_path, class_name=_class_name, method_name=_method_name)
+        new_name = None
+
+        try:
+            new_name = archive_file.addNodeManagerKeyStoreFile(File(file_path))
+        except IllegalArgumentException, iae:
+            _logger.warning('WLSDPLY-06637', file_path, iae.getLocalizedMessage(), class_name=_class_name,
+                            method_name=_method_name)
+        except WLSDeployArchiveIOException, wioe:
+            de = exception_helper.create_discover_exception('WLSDPLY-06638', file_path, wioe.getLocalizedMessage())
+            _logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
+            raise de
+        return new_name
+
     def _get_server_name_from_location(self, location):
         """
         Retrieve the server name from the location context file.
diff --git a/core/src/main/python/wlsdeploy/tool/validate/validator.py b/core/src/main/python/wlsdeploy/tool/validate/validator.py
@@ -222,16 +222,17 @@ def __validate_model_file(self, model_dict, variables_file_name, archive_file_na
         if self._model_file_name is not None:
             self._logger.info('WLSDPLY-05003', self._model_file_name, class_name=_class_name, method_name=_method_name)
 
-        if variables_file_name is not None:
-            self._logger.info('WLSDPLY-05004', variables_file_name, class_name=_class_name, method_name=_method_name)
-            try:
+        try:
+            if variables_file_name is not None:
+                self._logger.info('WLSDPLY-05004', variables_file_name, class_name=_class_name, method_name=_method_name)
                 self._variable_properties = variables.load_variables(variables_file_name)
-                variables.substitute(model_dict, self._variable_properties)
-            except VariableException, ve:
-                ex = exception_helper.create_validate_exception('WLSDPLY-20004', 'validateModel',
-                                                                ve.getLocalizedMessage(), error=ve)
-                self._logger.throwing(ex, class_name=_class_name, method_name=_method_name)
-                raise ex
+
+            variables.substitute(model_dict, self._variable_properties, self._model_context)
+        except VariableException, ve:
+            ex = exception_helper.create_validate_exception('WLSDPLY-20004', 'validateModel',
+                                                            ve.getLocalizedMessage(), error=ve)
+            self._logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+            raise ex
 
         if archive_file_name is not None:
             self._logger.info('WLSDPLY-05005', archive_file_name, class_name=_class_name, method_name=_method_name)
diff --git a/core/src/main/python/wlsdeploy/util/variables.py b/core/src/main/python/wlsdeploy/util/variables.py
@@ -25,6 +25,7 @@
 _variable_pattern = re.compile("\\$\\{[\w.-]+\\}")
 _file_variable_pattern = re.compile("@@FILE:[\w.\\\/:-]+@@")
 _property_pattern = re.compile("@@PROP:[\w.-]+@@")
+_file_nested_variable_pattern = re.compile("@@FILE:@@[\w]+@@[\w.\\\/:-]+@@")
 
 
 def load_variables(file_path):
@@ -126,20 +127,22 @@ def get_variable_names(text):
     return names
 
 
-def substitute(dictionary, variables):
+def substitute(dictionary, variables, model_context):
     """
     Substitute fields in the specified dictionary with variable values.
     :param dictionary: the dictionary in which to substitute variables
     :param variables: a dictionary of variables for substitution
+    :param model_context: used to resolve variables in file paths
     """
-    _process_node(dictionary, variables)
+    _process_node(dictionary, variables, model_context)
 
 
-def _process_node(nodes, variables):
+def _process_node(nodes, variables, model_context):
     """
     Process variables in the node.
     :param nodes: the dictionary to process
     :param variables: the variables to use
+    :param model_context: used to resolve variables in file paths
     """
     # iterate over copy to avoid concurrent change for add/delete
     if type(nodes) is OrderedDict:
@@ -150,22 +153,23 @@ def _process_node(nodes, variables):
         value = nodes[key]
 
         # if the key changes with substitution, remove old key and map value to new key
-        new_key = _substitute(key, variables)
+        new_key = _substitute(key, variables, model_context)
         if new_key is not key:
             nodes.pop(key)
             nodes[new_key] = value
 
         if isinstance(value, dict):
-            _process_node(value, variables)
+            _process_node(value, variables, model_context)
         elif type(value) is str:
-            nodes[key] = _substitute(value, variables)
+            nodes[key] = _substitute(value, variables, model_context)
 
 
-def _substitute(text, variables):
+def _substitute(text, variables, model_context):
     """
     Substitute the variable placeholders with the variable value.
     :param text: the text to process for variable placeholders
     :param variables: the variables to use
+    :param model_context: used to resolve variables in file paths
     :return: the replaced text
     """
     method_name = '_substitute'
@@ -185,6 +189,8 @@ def _substitute(text, variables):
 
     # skip lookups for text with no @@
     if '@@' in text:
+
+        # do properties first, to cover the case @@FILE:/dir/@@PROP:name@@.txt@@
         tokens = _property_pattern.findall(text)
         if tokens:
             for token in tokens:
@@ -204,6 +210,15 @@ def _substitute(text, variables):
                 value = _read_value_from_file(path)
                 text = text.replace(token, value)
 
+        # special case for @@FILE:@@ORACLE_HOME@@/dir/name.txt@@
+        tokens = _file_nested_variable_pattern.findall(text)
+        if tokens:
+            for token in tokens:
+                path = token[7:-2]
+                path = model_context.replace_token_string(path)
+                value = _read_value_from_file(path)
+                text = text.replace(token, value)
+
     return text
 
 
diff --git a/core/src/main/python/wlsdeploy/util/wlst_helper.py b/core/src/main/python/wlsdeploy/util/wlst_helper.py
@@ -837,7 +837,7 @@ def deploy_application(application_name, *args, **kwargs):
     try:
         result = wlst.deploy(application_name, *args, **kwargs)
     except wlst.WLSTException, e:
-        pwe = exception_helper.create_pywlst_exception('WLSDPLY-00068', application_name, args, kwargs,
+        pwe = exception_helper.create_pywlst_exception('WLSDPLY-00058', application_name, args, kwargs,
                                                        _format_exception(e), error=e)
         _logger.throwing(class_name=_class_name, method_name=_method_name, error=pwe)
         raise pwe
diff --git a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties
@@ -618,6 +618,9 @@ WLSDPLY-06632=Discovering {0} XML Entity Caches
 WLSDPLY-06633=Adding XML Entity Cache{0}
 WLSDPLY-06634=Discovering {0} XML Registries
 WLSDPLY-06635=Adding XML Registry {0}
+WLSDPLY-06636=Adding keystore file {0} for node manager to archive file
+WLSDPLY-06637=Unable to locate and add node manager keystore file {0} to the archive file : {1}
+WLSDPLY-06638=Unexpected exception attempting to add node manager keystore file {0} to the archive : {1}
 
 # multi_tenant_discoverer.py, multi_tenant_resources_dsi
 WLSDPLY-06700=Discover Multi-tenant
diff --git a/core/src/main/typedefs/JRF.json b/core/src/main/typedefs/JRF.json
@@ -4,13 +4,25 @@
     "name": "JRF",
     "description": "JRF type domain definitions",
     "versions": {
+        "10.3.6": "JRF_11G",
         "12.1.2": "JRF_1212",
         "12.1.3": "JRF_1213",
         "12.2.1": "JRF_12CR2",
         "12.2.1.3": "JRF_12213",
         "19.1":     "JRF_19CR1"
     },
     "definitions": {
+        "JRF_11G" : {
+            "baseTemplate": "@@WL_HOME@@/common/templates/domains/wls.jar",
+            "extensionTemplates": [
+                "@@ORACLE_HOME@@/oracle_common/common/templates/applications/jrf_template_11.1.1.jar",
+                "@@ORACLE_HOME@@/oracle_common/common/templates/applications/oracle.jrf.ws.async_template_11.1.1.jar",
+                "@@ORACLE_HOME@@/oracle_common/common/templates/applications/oracle.wsmpm_template_11.1.1.jar",
+                "@@ORACLE_HOME@@/oracle_common/common/templates/applications/oracle.em_11_1_1_0_0_template.jar"
+            ],
+            "serverGroupsToTarget" : [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS" ]
+        },
         "JRF_1212" : {
             "baseTemplate": "@@WL_HOME@@/common/templates/wls/wls.jar",
             "extensionTemplates": [
@@ -69,8 +81,10 @@
             "coherence-transaction-rar",
             "DMS Application%%",
             "em",
+            "FMW Welcome Page Application%%",
             "opss-rest",
             "state-management-provider-memory-rar",
+            "wsil-wls",
             "wsm-pm"
         ],
         "coherence-clusters": [
@@ -82,6 +96,7 @@
             "opss-audit-DBDS",
             "opss-audit-viewDS",
             "opss-data-source",
+            "opss-ds",
             "WLSSchemaDataSource"
         ],
         "file-stores": [
@@ -147,9 +162,13 @@
             "UIX%%"
         ],
         "shutdown-classes": [
-            "DMSShutdown"
+            "DMSShutdown",
+            "JOC-Shutdown"
         ],
         "startup-classes": [
+            "JMX Framework Startup Class",
+            "JOC-Startup",
+            "JPS Startup Class",
             "WSM Startup Class",
             "Web Services Startup Class",
             "JRF Startup Class",
diff --git a/core/src/test/python/variables_test.py b/core/src/test/python/variables_test.py

Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,9 @@ public static List<Logger> getLoggers() {`
`542`	`542`	`while (e.hasMoreElements()) {`
`543`	`543`	`String loggerName = e.nextElement();`
`544`	`544`	`Logger logger = manager.getLogger(loggerName);`
`545`		`- topList.add(logger);`
	`545`	`+ if(logger != null) {`
	`546`	`+ topList.add(logger);`
	`547`	`+ }`
`546`	`548`	`}`
`547`	`549`	`return topList;`
`548`	`550`	`}`