Skip to content

Commit 7e97394

Browse files
robertpatrickrobertpatrick
authored
Merge pull request #12 from oracle/issue#11-discovery-number-format-exception
Fix discovery of SOA/OSB 12.2.1.3 domain
2 parents 0c7b4f1 + aa8c284 commit 7e97394

File tree

5 files changed

+42
-30
lines changed

5 files changed

+42
-30
lines changed

‎core/src/main/java/oracle/weblogic/deploy/util/WLSDeployZipFile.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,9 @@ public String addZipDirectoryEntry(String entryName, boolean rename) throws WLSD
406406
LOGGER.finer("WLSDPLY-01507", entryName);
407407
newEntryName = getNextUniqueEntryName(entryName);
408408
LOGGER.finer("WLSDPLY-01508", entryName, newEntryName);
409+
if (!newEntryName.endsWith("/")) {
410+
newEntryName += "/";
411+
}
409412
}
410413

411414
boolean success = addZipDirectoryEntry(newEntryName);

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from java.lang import Class
1414
from java.lang import Exception as JException
1515
from java.lang import Long
16+
from java.lang import NumberFormatException
1617
from java.lang import RuntimeException
1718
from java.lang import String
1819
from java.util import Properties
@@ -632,6 +633,7 @@ def convert_to_type(data_type, value, subtype=None, delimiter=None):
632633
:param value: the value
633634
:return: the value converted to the specified type
634635
"""
636+
_method_name = 'convert_to_type'
635637
#
636638
# TypeUtils.convertToType doesn't work for passwords...
637639
#
@@ -642,7 +644,13 @@ def convert_to_type(data_type, value, subtype=None, delimiter=None):
642644
# String back to a Python string...ugly but effective.
643645
new_value = str(String(value))
644646
else:
645-
new_value = TypeUtils.convertToType(data_type, value, delimiter)
647+
try:
648+
new_value = TypeUtils.convertToType(data_type, value, delimiter)
649+
except NumberFormatException, nfe:
650+
ex = exception_helper.create_alias_exception('WLSDPLY-08021', value, data_type, delimiter,
651+
nfe.getLocalizedMessage(), error=nfe)
652+
_logger.throwing(ex, class_name=_class_name, method_name=_method_name)
653+
raise ex
646654

647655
if new_value is not None:
648656
if data_type == LONG:

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@
55
"child_folders_type": "multiple",
66
"folders": {},
77
"attributes": {
8-
"AltDescriptorDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AltDescriptorDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
9-
"AltDescriptorPath": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "AltDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
10-
"AltWLSDescriptorPath": [ {"version": "[10,10.3.6)", "wlst_mode": "offline", "wlst_name": "AltWlsDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" },
11-
{"version": "[10.3.6,)", "wlst_mode": "offline", "wlst_name": "AltWLSDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
12-
"ApplicationIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
13-
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
14-
"CacheInAppDirectory": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CacheInAppDirectory", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
15-
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "integer" } ],
16-
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "value": {"default": 100 }, "wlst_type": "integer" } ],
17-
"DeploymentPrincipalName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
18-
"InstallDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InstallDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
19-
"ModuleType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}"} ],
20-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
21-
"ParallelDeployModules": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ParallelDeployModules", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
22-
"PlanDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PlanDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
23-
"PlanPath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PlanPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
24-
"PlanStagingMode": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "PlanStagingMode", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
25-
"SecurityDDModel": [ {"version": "[10,12.1.2)", "wlst_mode": "offline", "wlst_name": "SecurityDdModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" },
26-
{"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "SecurityDDModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" },
27-
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "SecurityDDModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" } ],
28-
"SourcePath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}", "uses_path_tokens": "true" } ],
29-
"StagingMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StagingMode", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
8+
"AltDescriptorDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AltDescriptorDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
9+
"AltDescriptorPath": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "AltDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
10+
"AltWLSDescriptorPath": [ {"version": "[10,10.3.6)", "wlst_mode": "offline", "wlst_name": "AltWlsDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" },
11+
{"version": "[10.3.6,)", "wlst_mode": "offline", "wlst_name": "AltWLSDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
12+
"ApplicationIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
13+
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
14+
"CacheInAppDirectory": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CacheInAppDirectory", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
15+
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
16+
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "value": {"default": 100 }, "wlst_type": "integer" } ],
17+
"DeploymentPrincipalName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
18+
"InstallDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InstallDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
19+
"ModuleType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}"} ],
20+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
21+
"ParallelDeployModules": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ParallelDeployModules", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
22+
"PlanDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PlanDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
23+
"PlanPath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PlanPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
24+
"PlanStagingMode": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "PlanStagingMode", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
25+
"SecurityDDModel": [ {"version": "[10,12.1.2)", "wlst_mode": "offline", "wlst_name": "SecurityDdModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" },
26+
{"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "SecurityDDModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" },
27+
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "SecurityDDModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" } ],
28+
"SourcePath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}", "uses_path_tokens": "true" } ],
29+
"StagingMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StagingMode", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
3030
"Target": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "delimited_string" },
31-
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
32-
"Untargeted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Untargeted", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
33-
"ValidateDDSecurityData": [ {"version": "[10,12.1.2)", "wlst_mode": "offline", "wlst_name": "ValidateDdSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "${:RO}" },
34-
{"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "${:RO}" },
35-
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "${:RO}" } ],
36-
"VersionIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "VersionIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
31+
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
32+
"Untargeted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Untargeted", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
33+
"ValidateDDSecurityData": [ {"version": "[10,12.1.2)", "wlst_mode": "offline", "wlst_name": "ValidateDdSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "${:RO}" },
34+
{"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "${:RO}" },
35+
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "${:RO}" } ],
36+
"VersionIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "VersionIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
3737
},
3838
"wlst_attributes_path": "WP001",
3939
"wlst_paths": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"ApplicationIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationIdentifier", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string" } ],
3232
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string" } ],
3333
"CacheInAppDirectory": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CacheInAppDirectory", "wlst_path": "WP001", "value": { "default": "false" }, "wlst_type": "boolean" } ],
34-
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "value": { "default": "false" }, "wlst_type": "integer" } ],
34+
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string" } ],
3535
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "value": { "default": 100 }, "wlst_type": "integer" } ],
3636
"DeploymentPrincipalName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string" } ],
3737
"InstallDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InstallDir", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ],

‎core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@ WLSDPLY-08017=Failed to parse version range {0}: {1}
614614
WLSDPLY-08018=Invalid property string format: {0}
615615
WLSDPLY-08019=Invalid path type {0}
616616
WLSDPLY-08020=Unable to load class object for MBean class {0}: {1}
617+
WLSDPLY-08021=Failed to convert {0} to data type {1} with a delimiter of {2}: {3}
617618

618619
# wlsdeploy/aliases/alias_entries.py
619620
WLSDPLY-08100=Location contains unknown top-level folder {0}

0 commit comments

Comments
 (0)