Skip to content

Commit 6a6fd39

Browse files
rakillenrakillen
committed
Issue #132 - Change some folders to single/unpredictable naming
1 parent fb2f1ad commit 6a6fd39

File tree

2 files changed

+50
-21
lines changed

2 files changed

+50
-21
lines changed

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

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
},
3131
"COM": {
3232
"wlst_type": "COM",
33+
"child_folders_type": "single_unpredictable",
34+
"default_name_value": "${NO_NAME_0:%SERVER%}",
3335
"folders": {},
3436
"attributes": {
3537
"ApartmentThreaded": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApartmentThreaded", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ],
@@ -42,7 +44,7 @@
4244
},
4345
"wlst_attributes_path": "WP001",
4446
"wlst_paths": {
45-
"WP001": "/Server${:s}/%SERVER%/COM/%SERVER%"
47+
"WP001": "/Server${:s}/%SERVER%/COM/%SERVER_COM%"
4648
}
4749
},
4850
"ConfigurationProperty" : {
@@ -82,6 +84,8 @@
8284
},
8385
"DefaultFileStore": {
8486
"wlst_type": "DefaultFileStore",
87+
"child_folders_type": "single_unpredictable",
88+
"default_name_value": "${NO_NAME_0:%SERVER%}",
8589
"folders": {},
8690
"attributes": {
8791
"BlockSize": [ {"version": "[10,10.3.4)", "wlst_mode": "both", "wlst_name": "BlockSize", "wlst_path": "WP001", "value": {"default": "${512:-1}" }, "wlst_type": "integer", "access": "${:RO}"},
@@ -99,7 +103,7 @@
99103
},
100104
"wlst_attributes_path": "WP001",
101105
"wlst_paths": {
102-
"WP001": "/Server${:s}/%SERVER%/DefaultFileStore/${NO_NAME_0:%SERVER%}"
106+
"WP001": "/Server${:s}/%SERVER%/DefaultFileStore/%SERVER_DEFAULTFILESTORE%"
103107
}
104108
},
105109
"ExecuteQueue": {
@@ -159,6 +163,8 @@
159163
},
160164
"IIOP": {
161165
"wlst_type": "IIOP",
166+
"child_folders_type": "single_unpredictable",
167+
"default_name_value": "${NO_NAME_0:%SERVER%}",
162168
"folders": {},
163169
"attributes": {
164170
"CompleteMessageTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompleteMessageTimeout", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ],
@@ -180,7 +186,7 @@
180186
},
181187
"wlst_attributes_path": "WP001",
182188
"wlst_paths": {
183-
"WP001": "/Server${:s}/%SERVER%/IIOP/%SERVER%"
189+
"WP001": "/Server${:s}/%SERVER%/IIOP/%SERVE_IIOP%"
184190
}
185191
},
186192
"JTAMigratableTarget": {
@@ -213,6 +219,8 @@
213219
},
214220
"Log": {
215221
"wlst_type": "Log",
222+
"child_folders_type": "single_unpredictable",
223+
"default_name_value": "${NO_NAME_0:%SERVER%}",
216224
"folders": {},
217225
"attributes": {
218226
"BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSizeKb", "wlst_path": "WP001", "value": {"default": 8 }, "wlst_type": "integer"} ],
@@ -257,7 +265,7 @@
257265
},
258266
"wlst_attributes_path": "WP001",
259267
"wlst_paths": {
260-
"WP001": "/Server${:s}/%SERVER%/Log/%SERVER%"
268+
"WP001": "/Server${:s}/%SERVER%/Log/%SERVER_LOG%"
261269
}
262270
},
263271
"NetworkAccessPoint": {
@@ -361,6 +369,8 @@
361369
},
362370
"ServerDebug": {
363371
"wlst_type": "ServerDebug",
372+
"child_folders_type": "single_unpredictable",
373+
"default_name_value": "${NO_NAME_0:%SERVER%}",
364374
"folders": {},
365375
"attributes": {
366376
"ApplicationContainer": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationContainer", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ],
@@ -852,7 +862,7 @@
852862
},
853863
"wlst_attributes_path": "WP001",
854864
"wlst_paths": {
855-
"WP001": "/Server${:s}/%SERVER%/ServerDebug/%SERVER%"
865+
"WP001": "/Server${:s}/%SERVER%/ServerDebug/%SERVER_DEBUG%"
856866
}
857867
},
858868
"ServerDiagnosticConfig": {
@@ -894,6 +904,8 @@
894904
},
895905
"ServerStart": {
896906
"wlst_type": "ServerStart",
907+
"child_folders_type": "single_unpredictable",
908+
"default_name_value": "${NO_NAME_0:%SERVER%}",
897909
"folders": {},
898910
"attributes": {
899911
"Arguments": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Arguments", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string[space]" } ],
@@ -911,7 +923,7 @@
911923
},
912924
"wlst_attributes_path": "WP001",
913925
"wlst_paths": {
914-
"WP001": "/Server${:s}/%SERVER%/ServerStart/%SERVER%"
926+
"WP001": "/Server${:s}/%SERVER%/ServerStart/%SERVER_START%"
915927
}
916928
},
917929
"SingleSignOnServices" : {
@@ -971,6 +983,8 @@
971983
},
972984
"SSL": {
973985
"wlst_type": "SSL",
986+
"child_folders_type": "single_unpredictable",
987+
"default_name_value": "${NO_NAME_0:%SERVER%}",
974988
"folders": {},
975989
"attributes": {
976990
"AcceptKssDemoCertsEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AcceptKssDemoCertsEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
@@ -1017,7 +1031,7 @@
10171031
},
10181032
"wlst_attributes_path": "WP001",
10191033
"wlst_paths": {
1020-
"WP001": "/Server${:s}/%SERVER%/SSL/%SERVER%"
1034+
"WP001": "/Server${:s}/%SERVER%/SSL/%SERVER_SSL%"
10211035
}
10221036
},
10231037
"TransactionLogJDBCStore": {
@@ -1065,6 +1079,8 @@
10651079
},
10661080
"WebServer": {
10671081
"wlst_type": "WebServer",
1082+
"child_folders_type": "single_unpredictable",
1083+
"default_name_value": "${NO_NAME_0:%SERVER%}",
10681084
"folders": {
10691085
"WebServerLog": {
10701086
"wlst_type": "WebServerLog",
@@ -1093,7 +1109,7 @@
10931109
},
10941110
"wlst_attributes_path": "WP001",
10951111
"wlst_paths": {
1096-
"WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER%/WebServerLog/%WEBSERVERLOG%"
1112+
"WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%/WebServerLog/%WEBSERVERLOG%"
10971113
}
10981114
}
10991115
},
@@ -1132,8 +1148,8 @@
11321148
},
11331149
"wlst_attributes_path": "WP001",
11341150
"wlst_paths": {
1135-
"WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER%",
1136-
"WP002": "/Server${:s}/%SERVER%/WebServer/%SERVER%/Targets"
1151+
"WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%",
1152+
"WP002": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%/Targets"
11371153
}
11381154
},
11391155
"WebService": {

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

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
},
3232
"COM": {
3333
"wlst_type": "COM",
34+
"child_folders_type": "single_unpredictable",
35+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
3436
"folders": {},
3537
"attributes": {
3638
"ApartmentThreaded": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApartmentThreaded", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
@@ -43,7 +45,7 @@
4345
},
4446
"wlst_attributes_path": "WP001",
4547
"wlst_paths": {
46-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/COM/%SERVERTEMPLATE%"
48+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/COM/%SERVERTEMPLATE_COM%"
4749
}
4850
},
4951
"ConfigurationProperty" : {
@@ -83,6 +85,8 @@
8385
},
8486
"DefaultFileStore": {
8587
"wlst_type": "DefaultFileStore",
88+
"child_folders_type": "single_unpredictable",
89+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
8690
"folders": {},
8791
"attributes": {
8892
"BlockSize": [ {"version": "[10,10.3.4)", "wlst_mode": "both", "wlst_name": "BlockSize", "wlst_path": "WP001", "value": {"default": "${512:-1}"}, "wlst_type": "integer", "access": "${:RO}"},
@@ -100,7 +104,7 @@
100104
},
101105
"wlst_attributes_path": "WP001",
102106
"wlst_paths": {
103-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DefaultFileStore/${NO_NAME_0:%SERVERTEMPLATE%}"
107+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DefaultFileStore/%SERVERTEMPLATE_DEFAULTFILESTORE%"
104108
}
105109
},
106110
"ExecuteQueue": {
@@ -160,6 +164,8 @@
160164
},
161165
"IIOP": {
162166
"wlst_type": "IIOP",
167+
"child_folders_type": "single_unpredictable",
168+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
163169
"folders": {},
164170
"attributes": {
165171
"CompleteMessageTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompleteMessageTimeout", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ],
@@ -181,7 +187,7 @@
181187
},
182188
"wlst_attributes_path": "WP001",
183189
"wlst_paths": {
184-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/IIOP/%SERVERTEMPLATE%"
190+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/IIOP/%SERVERTEMPLATE_IIOP%"
185191
}
186192
},
187193
"JTAMigratableTarget": {
@@ -214,6 +220,8 @@
214220
},
215221
"Log": {
216222
"wlst_type": "Log",
223+
"child_folders_type": "single_unpredictable",
224+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
217225
"folders": {},
218226
"attributes": {
219227
"BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSizeKb", "wlst_path": "WP001", "value": {"default": 8 }, "wlst_type": "integer"} ],
@@ -258,8 +266,7 @@
258266
},
259267
"wlst_attributes_path": "WP001",
260268
"wlst_paths": {
261-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/%SERVERTEMPLATE%",
262-
"WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/${NO_NAME_0:%SERVERTEMPLATE%}"
269+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/%SERVERTEMPLATE_LOG%"
263270
}
264271
},
265272
"NetworkAccessPoint": {
@@ -362,6 +369,8 @@
362369
},
363370
"ServerDebug": {
364371
"wlst_type": "ServerDebug",
372+
"child_folders_type": "single_unpredictable",
373+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
365374
"folders": {},
366375
"attributes": {
367376
"ApplicationContainer": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationContainer", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ],
@@ -853,7 +862,7 @@
853862
},
854863
"wlst_attributes_path": "WP001",
855864
"wlst_paths": {
856-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDebug/${NO_NAME_0:%SERVERTEMPLATE%}"
865+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDebug/%SERVERTEMPLATE_DEBUG%"
857866
}
858867
},
859868
"ServerDiagnosticConfig": {
@@ -895,6 +904,8 @@
895904
},
896905
"ServerStart": {
897906
"wlst_type": "ServerStart",
907+
"child_folders_type": "single_unpredictable",
908+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
898909
"folders": {},
899910
"attributes": {
900911
"BeaHome": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BeaHome", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ],
@@ -912,7 +923,7 @@
912923
},
913924
"wlst_attributes_path": "WP001",
914925
"wlst_paths": {
915-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerStart/${NO_NAME_0:%SERVERTEMPLATE%}"
926+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerStart/%SERVERTEMPLATE_START%"
916927
}
917928
},
918929
"SingleSignOnServices" : {
@@ -1020,7 +1031,7 @@
10201031
},
10211032
"wlst_attributes_path": "WP001",
10221033
"wlst_paths": {
1023-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SSL/%SERVERTEMPLATESSL%"
1034+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SSL/%SERVERTEMPLATE_SSL%"
10241035
}
10251036
},
10261037
"TransactionLogJDBCStore": {
@@ -1068,6 +1079,8 @@
10681079
},
10691080
"WebServer": {
10701081
"wlst_type": "WebServer",
1082+
"child_folders_type": "single_unpredictable",
1083+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
10711084
"folders": {
10721085
"WebServerLog": {
10731086
"wlst_type": "WebServerLog",
@@ -1094,7 +1107,7 @@
10941107
},
10951108
"wlst_attributes_path": "WP001",
10961109
"wlst_paths": {
1097-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/${NO_NAME_0:%SERVERTEMPLATE%}/WebServerLog/${NO_NAME_0:%SERVERTEMPLATE%}"
1110+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/WebServerLog/${NO_NAME_0:%SERVERTEMPLATE%}"
10981111
}
10991112
}
11001113
},
@@ -1133,8 +1146,8 @@
11331146
},
11341147
"wlst_attributes_path": "WP001",
11351148
"wlst_paths": {
1136-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/${NO_NAME_0:%SERVERTEMPLATE%}",
1137-
"WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/${NO_NAME_0:%SERVERTEMPLATE%}/Targets"
1149+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%",
1150+
"WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/Targets"
11381151
}
11391152
},
11401153
"WebService": {

0 commit comments

Comments
 (0)