Undo copying wdt custom file and clean up extract logic

Author: jshum2479

operator/src/main/resources/scripts/modelInImage.sh

@@ -1319,26 +1319,18 @@ restoreAppAndLibs() {
           exitOrLoop
         fi
 
-        # expand the archive apps and shared lib to the wlsdeploy/* directories
-        # the config.xml is referencing them from that path
-        # exclude standalone app module in wlsdeploy/applications/*.xml since it is included int zipped up domain config
-        # zip, the original xml in the archive may have wdt tokenized notations.
+        # expand the archive apps, shared lib and other wlsdeploy/* directories
+        # exclude directories that are already expanded separately and already included in domain config zip
+        #   wlsdeploy/domainBin, wlsdeploy/domainLibraries, config/ - avoid confusion but no harm
+        #   wlsdeploy/applications/*.xml since it is included int zipped up domain config
+        #   zip, the original xml in the archive may have wdt tokenized notations.
         cd ${DOMAIN_HOME} || return 1
-        unzip -o ${IMG_ARCHIVES_ROOTDIR}/${file} -x "wlsdeploy/domainBin/*"
+        unzip -o ${IMG_ARCHIVES_ROOTDIR}/${file} -x "wlsdeploy/domainBin/*" -x "wlsdeploy/domainLibraries/*" -x "wlsdeploy/applications/*.xml" -x "config/*"
         if [ $? -ne 0 ] ; then
           trace SEVERE "Domain Source Type is FromModel, error in extracting application archive ${IMG_ARCHIVES_ROOTDIR}/${file}"
           return 1
         fi
 
-        if versionGE ${WDT_VERSION} "4.0.0" ; then
-          trace INFO "Newer version of WDT 4.0.0 - check if there is old archive format of these files"
-          if [ -d ${DOMAIN_HOME}/wlsdeploy/custom ] ; then
-            # copy to under DOMAIN_HOME/config
-            mkdir -p ${DOMAIN_HOME}/config/wlsdeploy/custom
-            cp -R ${DOMAIN_HOME}/wlsdeploy/custom/* ${DOMAIN_HOME}/config/wlsdeploy/custom
-          fi
-
-        fi
     done
 
 }
@@ -1349,10 +1341,6 @@ restoreZippedDbWallets() {
   if [ "$count" -gt  0 ] ; then
     find ${DOMAIN_HOME}/wlsdeploy/dbWallets/*/*.zip -type f  | xargs -I % sh -c 'unzip -jo % -d $(dirname %) ; rm %'
   fi
-  count=$(find ${DOMAIN_HOME}/config/wlsdeploy/dbWallets/*/*.zip -type f 2>/dev/null | wc -l)
-  if [ "$count" -gt  0 ] ; then
-    find ${DOMAIN_HOME}/config/wlsdeploy/dbWallets/*/*.zip -type f  | xargs -I % sh -c 'unzip -jo % -d $(dirname %) ; rm %'
-  fi
 }
 
 
@@ -1389,7 +1377,7 @@ prepareMIIServer() {
   encrypt_decrypt_domain_secret "decrypt" ${DOMAIN_HOME} ${MII_PASSPHRASE}
 
   # We restore the app and libs from the archive first,  the domain zip may contain any standalone application
-  # modules under wlsdeploy/applications/*.xml.  In the next step, if any standalon application module exists collected
+  # modules under wlsdeploy/applications/*.xml.  In the next step, if any standalone application module exists collected
   # during introspection, it will overwrite the tokenized version in the archive.
 
   trace "Model-in-Image: Restoring apps and libraries"