Issue #343 Clear targeting of JDBC placeholders that were created

Author: rakillen

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -102,7 +102,7 @@ def update(self):
         self._topology_helper.create_placeholder_server_templates(self._topology)
 
         # create placeholders for JDBC resources that may be referenced in cluster definition.
-        self._topology_helper.create_placeholder_jdbc_resources(self._resources)
+        jdbc_names = self._topology_helper.create_placeholder_jdbc_resources(self._resources)
 
         self._process_section(self._topology, folder_list, CLUSTER, location)
         self._process_section(self._topology, folder_list, SERVER_TEMPLATE, location)
@@ -113,6 +113,9 @@ def update(self):
 
         self._process_section(self._topology, folder_list, SERVER, location)
 
+        # targets may have been inadvertently assigned when clusters were added
+        self.topology_helper.clear_jdbc_placeholder_targeting(jdbc_names)
+
         self._process_section(self._topology, folder_list, MIGRATABLE_TARGET, location)
 
         new_managed_server_list, new_configured_cluster_list = self._create_list_of_setservergroups_targets()