Skip to content

Commit 2a3e43b

Browse files
committed
Merge branch 'online-deploy-filtering' into 'develop-4.0'
filtering apps/libraries during online app deployment using the domain... See merge request weblogic-cloud/weblogic-deploy-tooling!1660
2 parents 9ff0c76 + 384f5e4 commit 2a3e43b

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Diff for: core/src/main/python/wlsdeploy/tool/deploy/applications_online_deployer.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,11 @@ def __get_existing_apps(self):
199199

200200
for app in apps:
201201
if running_apps is not None and app in running_apps:
202+
if self.model_context.get_domain_typedef().is_filtered(location, app):
203+
continue
204+
202205
app_location = LocationContext(location).add_name_token(token_name, app)
206+
203207
wlst_attributes_path = self.aliases.get_wlst_attributes_path(app_location)
204208
self.wlst_helper.cd(wlst_attributes_path)
205209
attributes_map = self.wlst_helper.lsa()
@@ -244,7 +248,7 @@ def __get_existing_library_references(self):
244248
self.wlst_helper.domain_runtime()
245249
libs = self.wlst_helper.get_existing_object_list(library_runtime_path)
246250
for lib in libs:
247-
if lib in internal_skip_list:
251+
if lib in internal_skip_list or self.model_context.get_domain_typedef().is_filtered(location, lib):
248252
continue
249253
self.__get_library_reference_attributes(existing_libraries, lib, library_runtime_path, location,
250254
token_name)

Diff for: documentation/4.0/content/release-notes/_index.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pre = "<b> </b>"
2727
with online Update Domain and Deploy Applications tools. For non-archive applications/libraries, online deployment of
2828
binaries outside of the archive will always assume that the binaries are available to the Administration Server at the
2929
model-specified paths. Neither the `-remote` or SSH options will attempt to upload the non-archived binaries.
30-
- #1654, #1655, #1656, #1658, #1659, #1660 - Overhaul of the Create Domain Tool's support for running RCU and applying
30+
- #1654, #1655, #1656, #1658, #1659, #1661 - Overhaul of the Create Domain Tool's support for running RCU and applying
3131
RCU-related changes to the RCU Data Sources.
3232

3333
#### Other Changes
@@ -95,6 +95,8 @@ pre = "<b> </b>"
9595
Source overrides for the STB data source set in the model.
9696
- #1659 - Fixed an issue with the Create Domain Tool where it was ignoring any Data Source overrides for the OPSS data
9797
source set in the model when fixing the jps-copfig.xml and jps-config-jse.xml files.
98+
- #1660 - Fixed an issue with the Update Domain Tool running in online mode against a JRF domain that was causing extra
99+
analysis of applications and libraries that the JRF domain typedef declares as filtered.
98100

99101
#### Known Issues
100102
- SSH support requires a reasonably recent version of Bouncy Castle. WDT picks up Bouncy Castle from WLST so, for example,

0 commit comments

Comments
 (0)