Skip to content

Commit cf47484

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'jira-wdt-952-rmi-forwarding' into 'main'
Support RMI forwarding folder for Domain, Server, and ServerTemplate See merge request weblogic-cloud/weblogic-deploy-tooling!1845
2 parents bd88e75 + 35b19bb commit cf47484

File tree

6 files changed

+107
-0
lines changed

6 files changed

+107
-0
lines changed

‎core/src/main/python/wlsdeploy/aliases/alias_entries.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
from wlsdeploy.aliases.model_constants import REMOTE_CONSOLE_HELPER
7575
from wlsdeploy.aliases.model_constants import RESOURCE_MANAGER
7676
from wlsdeploy.aliases.model_constants import RESOURCES
77+
from wlsdeploy.aliases.model_constants import RMI_FORWARDING
7778
from wlsdeploy.aliases.model_constants import SNMP_AGENT
7879
from wlsdeploy.aliases.model_constants import SNMP_AGENT_DEPLOYMENT
7980
from wlsdeploy.aliases.model_constants import SYSTEM_COMPONENT
@@ -126,6 +127,7 @@ class AliasEntries(object):
126127
'NMProperties',
127128
REMOTE_CONSOLE_HELPER,
128129
"RestfulManagementServices",
130+
RMI_FORWARDING,
129131
'Security',
130132
'SecurityConfiguration',
131133
'Server',

‎core/src/main/python/wlsdeploy/aliases/model_constants.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
RESPONSE_TIME_REQUEST_CLASS = 'ResponseTimeRequestClass'
279279
RESTFUL_MANAGEMENT_SERVICES = 'RestfulManagementServices'
280280
REST_NOTIFICATION = 'RestNotification'
281+
RMI_FORWARDING = 'RmiForwarding'
281282
RO_SQL_AUTHENTICATOR = 'ReadOnlySQLAuthenticator'
282283
ROLE_MAPPER = 'RoleMapper'
283284
SAF_AGENT = 'SAFAgent'

‎core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ def discover(self):
148148

149149
model_top_folder_name, callouts = self.get_callouts()
150150
discoverer.add_to_model_if_not_empty(self._dictionary, model_top_folder_name, callouts)
151+
152+
self.discover_domain_named_mbeans(model_constants.RMI_FORWARDING, self._dictionary)
153+
151154
finally:
152155
if current_tree is not None:
153156
current_tree()

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RmiForwarding.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"copyright": "Copyright (c) 2025, Oracle and/or its affiliates.",
3+
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
4+
"wlst_type": "R${mi:MI}Forwarding${:s}",
5+
"online_bean": "weblogic.management.configuration.RMIForwardingMBean",
6+
"child_folders_type": "multiple",
7+
"version" : "[15.1.1,)",
8+
"folders": {
9+
"ConfigurationProperty" : {
10+
"wlst_type" : "ConfigurationPropert${y:ies}",
11+
"online_bean": "weblogic.management.configuration.ConfigurationPropertyMBean",
12+
"child_folders_type": "multiple",
13+
"version" : "[15.1.1,)",
14+
"folders" : {},
15+
"attributes" : {
16+
"EncryptValueRequired": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "EncryptValueRequired", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
17+
"EncryptedValueEncrypted": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "EncryptedValueEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method" : "GET", "access": "IGNORED" } ],
18+
"Notes": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
19+
"Value": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Value", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
20+
},
21+
"wlst_attributes_path": "WP001",
22+
"wlst_paths": {
23+
"WP001": "/R${mi:MI}Forwarding${:s}/%RMIFORWARDING%/ConfigurationPropert${y:ies}/%PROPERTY_NAME%"
24+
}
25+
}
26+
},
27+
"attributes": {
28+
"Notes": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
29+
"Url": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Url", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
30+
},
31+
"wlst_attributes_path": "WP001",
32+
"wlst_paths": {
33+
"WP001": "/R${mi:MI}Forwarding${:s}/%RMIFORWARDING%"
34+
}
35+
}

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,39 @@
633633
"WP001": "/Server${:s}/%SERVER%/OverloadProtection/%OVERLOADPROTECTION%"
634634
}
635635
},
636+
"RmiForwarding": {
637+
"wlst_type": "R${mi:MI}Forwarding${:s}",
638+
"online_bean": "weblogic.management.configuration.RMIForwardingMBean",
639+
"child_folders_type": "multiple",
640+
"version" : "[15.1.1,)",
641+
"folders": {
642+
"ConfigurationProperty" : {
643+
"wlst_type" : "ConfigurationPropert${y:ies}",
644+
"online_bean": "weblogic.management.configuration.ConfigurationPropertyMBean",
645+
"child_folders_type": "multiple",
646+
"version" : "[15.1.1,)",
647+
"folders" : {},
648+
"attributes" : {
649+
"EncryptValueRequired": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "EncryptValueRequired", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
650+
"EncryptedValueEncrypted": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "EncryptedValueEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method" : "GET", "access": "IGNORED" } ],
651+
"Notes": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
652+
"Value": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Value", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
653+
},
654+
"wlst_attributes_path": "WP001",
655+
"wlst_paths": {
656+
"WP001": "/Server${:s}/%SERVER%/R${mi:MI}Forwarding${:s}/%RMIFORWARDING%/ConfigurationPropert${y:ies}/%PROPERTY_NAME%"
657+
}
658+
}
659+
},
660+
"attributes": {
661+
"Notes": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
662+
"Url": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Url", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
663+
},
664+
"wlst_attributes_path": "WP001",
665+
"wlst_paths": {
666+
"WP001": "/Server${:s}/%SERVER%/R${mi:MI}Forwarding${:s}/%RMIFORWARDING%"
667+
}
668+
},
636669
"ServerDebug": {
637670
"wlst_type": "ServerDebug",
638671
"online_bean": "weblogic.management.configuration.ServerDebugMBean",

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,39 @@
645645
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/OverloadProtection/%OVERLOADPROTECTION%"
646646
}
647647
},
648+
"RmiForwarding": {
649+
"wlst_type": "R${mi:MI}Forwarding${:s}",
650+
"online_bean": "weblogic.management.configuration.RMIForwardingMBean",
651+
"child_folders_type": "multiple",
652+
"version" : "[15.1.1,)",
653+
"folders": {
654+
"ConfigurationProperty" : {
655+
"wlst_type" : "ConfigurationPropert${y:ies}",
656+
"online_bean": "weblogic.management.configuration.ConfigurationPropertyMBean",
657+
"child_folders_type": "multiple",
658+
"version" : "[15.1.1,)",
659+
"folders" : {},
660+
"attributes" : {
661+
"EncryptValueRequired": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "EncryptValueRequired", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
662+
"EncryptedValueEncrypted": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "EncryptedValueEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method" : "GET", "access": "IGNORED" } ],
663+
"Notes": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
664+
"Value": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Value", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
665+
},
666+
"wlst_attributes_path": "WP001",
667+
"wlst_paths": {
668+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/R${mi:MI}Forwarding${:s}/%RMIFORWARDING%/ConfigurationPropert${y:ies}/%PROPERTY_NAME%"
669+
}
670+
}
671+
},
672+
"attributes": {
673+
"Notes": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
674+
"Url": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "Url", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
675+
},
676+
"wlst_attributes_path": "WP001",
677+
"wlst_paths": {
678+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/R${mi:MI}Forwarding${:s}/%RMIFORWARDING%"
679+
}
680+
},
648681
"ServerDebug": {
649682
"wlst_type": "ServerDebug",
650683
"online_bean": "weblogic.management.configuration.ServerDebugMBean",

0 commit comments

Comments
 (0)