Merge branch 'coherence-file-handling' into 'main'

Reworking the handling of Coherence cluster and cache config files

See merge request weblogic-cloud/weblogic-deploy-tooling!1530

Author: robertpatrick

core/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <artifactId>weblogic-deploy</artifactId>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java

@@ -4536,7 +4536,7 @@ protected String addItemToZip(String zipPathPrefix, File itemToAdd, String prefe
 
     protected static String getURLArchiveName(String zipPathPrefix, URL url, boolean useFileNameInEntryPath) {
         String newName = zipPathPrefix;
-        String urlFileName = new File(url.getFile()).getName();
+        String urlFileName = new File(url.getPath()).getName();
         if (useFileNameInEntryPath) {
             if (!newName.endsWith(ZIP_SEP)) {
                 newName += ZIP_SEP;
@@ -4550,7 +4550,7 @@ protected String addUrlToZip(String zipPathPrefix, URL url, String extension, bo
         throws WLSDeployArchiveIOException {
         final String METHOD = "addUrlToZip";
 
-        LOGGER.entering(CLASS, METHOD, zipPathPrefix, extension, useFileNameInEntryPath);
+        LOGGER.entering(CLASS, METHOD, zipPathPrefix, url, extension, useFileNameInEntryPath);
         HttpURLConnection connection = null;
         InputStream is = null;
         File tmpFile = null;
@@ -4573,7 +4573,7 @@ protected String addUrlToZip(String zipPathPrefix, URL url, String extension, bo
 
             fos = new FileOutputStream(tmpFile);
             copyFile(is, fos);
-            newName = addSingleFileToZip(tmpFile, newName, METHOD);
+            newName = addSingleFileToZip(tmpFile, urlFileName, METHOD);
         } catch (IOException ioe) {
             WLSDeployArchiveIOException aioe =
                 new WLSDeployArchiveIOException("WLSDPLY-01410", ioe, url, ioe.getLocalizedMessage());
@@ -5005,7 +5005,9 @@ private static void closeMapInputStreams(Map<String, InputStream> map) {
 
     private String addSingleFileToZip(File itemToAdd, String preferredName, String callingMethod)
         throws WLSDeployArchiveIOException {
+        final String METHOD = "addSingleFileToZip";
 
+        LOGGER.entering(CLASS, METHOD, itemToAdd, preferredName, callingMethod);
         String newName = null;
         FileInputStream inputStream = null;
         try {
@@ -5022,6 +5024,7 @@ private String addSingleFileToZip(File itemToAdd, String preferredName, String c
                 }
             }
         }
+        LOGGER.exiting(CLASS, METHOD, newName);
         return newName;
     }
 

core/src/main/python/wlsdeploy/aliases/model_constants.py

@@ -41,11 +41,11 @@
 CLUSTER = 'Cluster'
 CLUSTER_MESSAGING_MODE = 'ClusterMessagingMode'
 COHERENCE_ACTIVE_DIRECTORY = 'ActiveDirectory'
-COHERENCE_CACHE_CONFIG_FILE = 'CacheConfigurationFile'
 COHERENCE_ADDRESS_PROVIDERS = 'CoherenceAddressProviders'
 COHERENCE_ADDRESS_PROVIDER = 'CoherenceAddressProvider'
 COHERENCE_CACHE = 'CoherenceCache'
 COHERENCE_CACHE_CONFIG = 'CoherenceCacheConfig'
+COHERENCE_CACHE_CONFIG_FILE = 'CacheConfigurationFile'
 COHERENCE_CLUSTER_SYSTEM_RESOURCE = 'CoherenceClusterSystemResource'
 COHERENCE_CLUSTER_PARAMS = 'CoherenceClusterParams'
 COHERENCE_CUSTOM_CLUSTER_CONFIGURATION = 'CustomClusterConfigurationFileName'
@@ -55,6 +55,7 @@
 COHERENCE_PARTITION_CACHE_CONFIGS = 'CoherencePartitionCacheConfig'
 COHERENCE_PERSISTENCE_PARAMS = 'CoherencePersistenceParams'
 COHERENCE_RESOURCE = 'CoherenceResource'
+COHERENCE_RUNTIME_CACHE_CONFIG_URI = 'RuntimeCacheConfigurationUri'
 COHERENCE_SERVICE = 'CoherenceService'
 COHERENCE_SNAPSHOT_DIRECTORY = 'SnapshotDirectory'
 COHERENCE_SOCKET_ADDRESS = 'CoherenceSocketAddress'

core/src/main/python/wlsdeploy/exception/exception_helper.py

@@ -456,6 +456,14 @@ def convert_error_to_exception():
     return custom_exception
 
 
+def get_error_message_from_exception(ex):
+    if isinstance(ex, Throwable):
+        message =  ex.getLocalizedMessage()
+    else:
+        message = ex.to_string()
+    return message
+
+
 def _return_exception_params(*args, **kwargs):
     """
     Get the exception parameters from the list

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

@@ -58,7 +58,6 @@
 from wlsdeploy.aliases.model_constants import PRODUCTION_MODE_ENABLED
 from wlsdeploy.aliases.model_constants import RESOURCES
 from wlsdeploy.aliases.model_constants import RCU_COMP_INFO
-from wlsdeploy.aliases.model_constants import RCU_DB_INFO
 from wlsdeploy.aliases.model_constants import RCU_STG_INFO
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP_TEMPLATE
@@ -215,7 +214,7 @@ def _create_named_mbeans(self, type_name, model_nodes, base_location, log_create
         :param type_name: the model folder type
         :param model_nodes: the model dictionary of the specified model folder type
         :param base_location: the base location object to use to create the MBeans
-        :param log_created: whether or not to log created at INFO level, by default it is logged at the FINE level
+        :param log_created: whether to log created at INFO level, by default it is logged at the FINE level
         :raises: CreateException: if an error occurs
         """
         self.topology_helper.check_coherence_cluster_references(type_name, model_nodes)