Skip to content

Issue#633 determining when to perform opss db #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
May 26, 2020
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1cf3b57
Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator
CarolynRountree Feb 14, 2020
abe7db6
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Feb 18, 2020
426d6a7
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Feb 19, 2020
8a7deed
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Feb 20, 2020
8a24ba3
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Mar 2, 2020
e31e042
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Mar 3, 2020
467661d
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Mar 3, 2020
576929f
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Mar 5, 2020
ca7d16a
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Mar 20, 2020
ea66448
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Mar 26, 2020
f4a6221
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Mar 27, 2020
8dbb625
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Apr 2, 2020
fa6c7db
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Apr 3, 2020
dbc3c9a
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Apr 8, 2020
76b82a0
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Apr 9, 2020
66ef4bd
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Apr 10, 2020
aec0b14
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Apr 13, 2020
c7fcd14
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Apr 15, 2020
f8ff6fd
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Apr 27, 2020
dcbc996
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Apr 29, 2020
f0eb1ca
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree May 4, 2020
c99c5da
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree May 5, 2020
20e60e3
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree May 13, 2020
5ae6340
Merge branch 'master' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree May 21, 2020
16315e1
Expand the parmeters of what might be JRF domain
CarolynRountree May 22, 2020
755391d
Merge branch 'master' into Issue#633-determining-when-to-perform-opss-db
ddsharpe May 25, 2020
a4db59d
Merge branch 'master' into Issue#633-determining-when-to-perform-opss-db
ddsharpe May 25, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/src/main/python/wlsdeploy/tool/create/domain_typedef.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class DomainTypedef(object):

JRF_TEMPLATE_REGEX = "^(.*jrf_template[0-9._]*\\.jar)|(Oracle JRF WebServices Asynchronous services)$"
RESTRICTED_JRF_TEMPLATE_REGEX = "^(Oracle Restricted JRF)$"
JRF_SERVER_GROUP = 'JRF-MAN-SVR'

def __init__(self, program_name, domain_type):
"""
Expand Down Expand Up @@ -108,13 +109,16 @@ def has_jrf_resources(self):

def is_jrf_domain_type(self):
"""
Determine if this is a JRF domain type by checking for the JRF extension template.
Determine if this is a JRF domain type by checking for the JRF extension template or
JRF SVR GrOUP.
This returns False for the Restricted JRF domain type.
:return: True if the JRF template is present
"""
for template in self.get_extension_templates():
if re.match(self.JRF_TEMPLATE_REGEX, template):
return True
if self.JRF_SERVER_GROUP in self.get_server_groups_to_target():
return True
return False

def is_restricted_jrf_domain_type(self):
Expand Down