Skip to content

Commit 97502aa

Browse files
CarolynRountreeCarolynRountree
committed
Merge branch 'WDT-Support-for-1411' of github.com:oracle/weblogic-deploy-tooling into WDT-Support-for-1411
2 parents 793cccf + 9888b4c commit 97502aa

File tree

8 files changed

+90
-71
lines changed

8 files changed

+90
-71
lines changed

‎core/src/main/python/wlsdeploy/tool/validate/validator.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -896,9 +896,6 @@ def __validate_path_tokens_attribute(self, attribute_name, attribute_value, mode
896896

897897
value_data_type = validation_utils.get_python_data_type(attribute_value)
898898

899-
if value_data_type == 'string':
900-
attribute_value = attribute_value.toString()
901-
902899
self._logger.finest('value_data_type={0}', value_data_type,
903900
class_name=_class_name, method_name=_method_name)
904901

‎installer/src/main/bin/createDomain.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -211,20 +211,23 @@ fi
211211
# Validate the JVM version based on whether or not the user asked us to use encryption
212212
#
213213
JVM_FULL_VERSION=`${JAVA_EXE} -fullversion 2>&1 | awk -F"\"" '{ print $2 }'`
214-
JVM_VERSION_PART_ONE=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
215-
JVM_VERSION_PART_TWO=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
214+
# set JVM version to the major version, unless equal to 1, like 1.8.0, then use the minor version
215+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
216216

217-
if [ ${JVM_VERSION_PART_ONE} -le 1 ]; then
218-
if [ ${JVM_VERSION_PART_TWO} -lt ${MIN_JDK_VERSION} ]; then
219-
if [ ${JVM_VERSION_PART_TWO} -lt 7 ]; then
220-
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
221-
else
222-
echo "JDK version 1.8 or higher is required when using encryption" >&2
223-
fi
224-
exit 2
217+
if [ "${JVM_VERSION}" -eq "1" ]; then
218+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
219+
fi
220+
221+
if [ ${JVM_VERSION} -lt ${MIN_JDK_VERSION} ]; then
222+
if [ ${JVM_VERSION} -lt 7 ]; then
223+
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
224+
else
225+
echo "JDK version 1.8 or higher is required when using encryption" >&2
225226
fi
227+
exit 2
228+
else
229+
echo "JDK version is ${JVM_FULL_VERSION}"
226230
fi
227-
echo "JDK version is ${JVM_FULL_VERSION}"
228231

229232
#
230233
# Check for values of required arguments for this script to continue.

‎installer/src/main/bin/deployApps.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,20 +189,23 @@ fi
189189
# Validate the JVM version based on whether or not the user asked us to use encryption
190190
#
191191
JVM_FULL_VERSION=`${JAVA_EXE} -fullversion 2>&1 | awk -F"\"" '{ print $2 }'`
192-
JVM_VERSION_PART_ONE=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
193-
JVM_VERSION_PART_TWO=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
192+
# set JVM version to the major version, unless equal to 1, like 1.8.0, then use the minor version
193+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
194194

195-
if [ ${JVM_VERSION_PART_ONE} -le 1 ]; then
196-
if [ ${JVM_VERSION_PART_TWO} -lt ${MIN_JDK_VERSION} ]; then
197-
if [ ${JVM_VERSION_PART_TWO} -lt 7 ]; then
198-
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
199-
else
200-
echo "JDK version 1.8 or higher is required when using encryption" >&2
201-
fi
202-
exit 2
195+
if [ "${JVM_VERSION}" -eq "1" ]; then
196+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
197+
fi
198+
199+
if [ ${JVM_VERSION} -lt ${MIN_JDK_VERSION} ]; then
200+
if [ ${JVM_VERSION} -lt 7 ]; then
201+
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
202+
else
203+
echo "JDK version 1.8 or higher is required when using encryption" >&2
203204
fi
205+
exit 2
206+
else
207+
echo "JDK version is ${JVM_FULL_VERSION}"
204208
fi
205-
echo "JDK version is ${JVM_FULL_VERSION}"
206209

207210
#
208211
# Check for values of required arguments for this script to continue.

‎installer/src/main/bin/discoverDomain.sh

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,20 @@ case "${JVM_OUTPUT}" in
124124
esac
125125

126126
JVM_FULL_VERSION=`${JAVA_EXE} -fullversion 2>&1 | awk -F"\"" '{ print $2 }'`
127-
JVM_VERSION_PART_ONE=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
128-
JVM_VERSION_PART_TWO=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
127+
# set JVM version to the major version, unless equal to 1, like 1.8.0, then use the minor version
128+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
129129

130-
if [ ${JVM_VERSION_PART_ONE} -le 1 ]; then
131-
if [ ${JVM_VERSION_PART_TWO} -lt 7 ]; then
132-
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
133-
exit 2
134-
fi
130+
if [ "${JVM_VERSION}" -eq "1" ]; then
131+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
132+
echo "set JVM version to minor " ${JVM_VERSION}
133+
fi
134+
135+
if [ ${JVM_VERSION} -lt 7 ]; then
136+
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
137+
exit 2
138+
else
139+
echo "JDK version is ${JVM_FULL_VERSION}"
135140
fi
136-
echo "JDK version is ${JVM_FULL_VERSION}"
137141

138142
#
139143
# Check to see if no args were given and print the usage message

‎installer/src/main/bin/encryptModel.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,20 +124,23 @@ case "${JVM_OUTPUT}" in
124124
esac
125125

126126
JVM_FULL_VERSION=`${JAVA_EXE} -fullversion 2>&1 | awk -F"\"" '{ print $2 }'`
127-
JVM_VERSION_PART_ONE=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
128-
JVM_VERSION_PART_TWO=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
127+
# set JVM version to the major version, unless equal to 1, like 1.8.0, then use the minor version
128+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
129129

130-
if [ ${JVM_VERSION_PART_ONE} -le 1 ]; then
131-
if [ ${JVM_VERSION_PART_TWO} -lt 8 ]; then
132-
if [ ${JVM_VERSION_PART_TWO} -lt 7 ]; then
133-
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
134-
else
135-
echo "JDK version 1.8 or higher is required when using encryption" >&2
136-
fi
137-
exit 2
130+
if [ "${JVM_VERSION}" -eq "1" ]; then
131+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
132+
fi
133+
134+
if [ ${JVM_VERSION} -lt 8 ]; then
135+
if [ ${JVM_VERSION} -lt 7 ]; then
136+
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
137+
else
138+
echo "JDK version 1.8 or higher is required when using encryption" >&2
138139
fi
140+
exit 2
141+
else
142+
echo "JDK version is ${JVM_FULL_VERSION}"
139143
fi
140-
echo "JDK version is ${JVM_FULL_VERSION}"
141144

142145
#
143146
# Check to see if no args were given and print the usage message

‎installer/src/main/bin/injectVariables.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,19 @@ case "${JVM_OUTPUT}" in
136136
esac
137137

138138
JVM_FULL_VERSION=`${JAVA_EXE} -fullversion 2>&1 | awk -F"\"" '{ print $2 }'`
139-
JVM_VERSION_PART_ONE=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
140-
JVM_VERSION_PART_TWO=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
139+
# set JVM version to the major version, unless equal to 1, like 1.8.0, then use the minor version
140+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
141141

142-
if [ ${JVM_VERSION_PART_ONE} -le 1 ]; then
143-
if [ ${JVM_VERSION_PART_TWO} -lt 7 ]; then
144-
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
145-
exit 2
146-
fi
142+
if [ "${JVM_VERSION}" -eq "1" ]; then
143+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
144+
fi
145+
146+
if [ ${JVM_VERSION} -lt 7 ]; then
147+
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
148+
exit 2
149+
else
150+
echo "JDK version is ${JVM_FULL_VERSION}"
147151
fi
148-
echo "JDK version is ${JVM_FULL_VERSION}"
149152

150153
#
151154
# Check to see if no args were given and print the usage message

‎installer/src/main/bin/updateDomain.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -188,20 +188,23 @@ fi
188188
# Validate the JVM version based on whether or not the user asked us to use encryption
189189
#
190190
JVM_FULL_VERSION=`${JAVA_EXE} -fullversion 2>&1 | awk -F"\"" '{ print $2 }'`
191-
JVM_VERSION_PART_ONE=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
192-
JVM_VERSION_PART_TWO=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
191+
# set JVM version to the major version, unless equal to 1, like 1.8.0, then use the minor version
192+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
193193

194-
if [ ${JVM_VERSION_PART_ONE} -le 1 ]; then
195-
if [ ${JVM_VERSION_PART_TWO} -lt ${MIN_JDK_VERSION} ]; then
196-
if [ ${JVM_VERSION_PART_TWO} -lt 7 ]; then
197-
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
198-
else
199-
echo "JDK version 1.8 or higher is required when using encryption" >&2
200-
fi
201-
exit 2
194+
if [ "${JVM_VERSION}" -eq "1" ]; then
195+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
196+
fi
197+
198+
if [ ${JVM_VERSION} -lt ${MIN_JDK_VERSION} ]; then
199+
if [ ${JVM_VERSION} -lt 7 ]; then
200+
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
201+
else
202+
echo "JDK version 1.8 or higher is required when using encryption" >&2
202203
fi
204+
exit 2
205+
else
206+
echo "JDK version is ${JVM_FULL_VERSION}"
203207
fi
204-
echo "JDK version is ${JVM_FULL_VERSION}"
205208

206209
#
207210
# Check for values of required arguments for this script to continue.

‎installer/src/main/bin/validateModel.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,19 @@ case "${JVM_OUTPUT}" in
151151
esac
152152

153153
JVM_FULL_VERSION=`${JAVA_EXE} -fullversion 2>&1 | awk -F"\"" '{ print $2 }'`
154-
JVM_VERSION_PART_ONE=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
155-
JVM_VERSION_PART_TWO=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
154+
# set JVM version to the major version, unless equal to 1, like 1.8.0, then use the minor version
155+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
156156

157-
if [ ${JVM_VERSION_PART_ONE} -le 1 ]; then
158-
if [ ${JVM_VERSION_PART_TWO} -lt 7 ]; then
159-
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
160-
exit 2
161-
fi
157+
if [ "${JVM_VERSION}" -eq "1" ]; then
158+
JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $2 }'`
159+
fi
160+
161+
if [ ${JVM_VERSION} -lt 7 ]; then
162+
echo "You are using an unsupported JDK version ${JVM_FULL_VERSION}" >&2
163+
exit 2
164+
else
165+
echo "JDK version is ${JVM_FULL_VERSION}"
162166
fi
163-
echo "JDK version is ${JVM_FULL_VERSION}"
164167

165168
#
166169
# Check to see if no args were given and print the usage message

0 commit comments

Comments
 (0)