Skip to content

Commit e18256c

Browse files
Wdt 249 jms referenced error destinations (#654)
* Add placeholders for jms entities that can be referenced * create placeholders for jms resources * remove print statements * Add template to placeholders
1 parent 48e8e2e commit e18256c

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,23 @@ def _add_jms_resources(self, resource_nodes, location):
122122

123123
# SAF imported destination may reference error handling, and vice versa
124124
self.topology_helper.create_placeholder_named_elements(location, SAF_ERROR_HANDLING, resource_nodes)
125+
# Error destinations for Topics, Queues, Templates reference other Topics, Queues
126+
self._create_placeholder_for_error_destinations(location, resource_nodes)
125127

126128
for element_name in self.resource_elements:
127129
model_nodes = dictionary_utils.get_dictionary_element(resource_nodes, element_name)
128130
self._add_named_elements(element_name, model_nodes, location)
129131
return
130132

133+
def _create_placeholder_for_error_destinations(self, location, resource_nodes):
134+
self.topology_helper.create_placeholder_named_elements(location, QUEUE, resource_nodes)
135+
self.topology_helper.create_placeholder_named_elements(location, DISTRIBUTED_QUEUE, resource_nodes)
136+
self.topology_helper.create_placeholder_named_elements(location, UNIFORM_DISTRIBUTED_QUEUE, resource_nodes)
137+
self.topology_helper.create_placeholder_named_elements(location, TOPIC, resource_nodes)
138+
self.topology_helper.create_placeholder_named_elements(location, DISTRIBUTED_TOPIC, resource_nodes)
139+
self.topology_helper.create_placeholder_named_elements(location, UNIFORM_DISTRIBUTED_TOPIC, resource_nodes)
140+
self.topology_helper.create_placeholder_named_elements(location, TEMPLATE, resource_nodes)
141+
131142
def _add_jndi_properties(self, property_name_nodes, location):
132143
"""
133144
Add each property entry from property nodes and set its attributes.

core/src/main/python/wlsdeploy/tool/util/attribute_setter.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,6 @@ def __find_jms_destination_mbean(self, location, destination_name):
793793
:raises BundleAwareException of the specified type: if destination is not found
794794
"""
795795
method_name = '__find_jms_destination_mbean'
796-
797796
resource_location = self.__get_parent_location(location, JMS_RESOURCE)
798797
for type_name in self.__destination_type_names:
799798
mbean = self.__find_in_location(resource_location, type_name, destination_name)

0 commit comments

Comments
 (0)