Skip to content

Commit 7aab905

Browse files
robertpatrickrobertpatrick
committed
finishing the weblogic-deploy renaming work
1 parent 52062f9 commit 7aab905

14 files changed

+66
-66
lines changed

‎core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<parent>
1212
<artifactId>weblogic-deploy</artifactId>
13-
<groupId>oracle.weblogic.lifecycle</groupId>
13+
<groupId>com.oracle.weblogic.lifecycle</groupId>
1414
<version>0.6-SNAPSHOT</version>
1515
<relativePath>../pom.xml</relativePath>
1616
</parent>

‎installer/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<parent>
1313
<artifactId>weblogic-deploy</artifactId>
14-
<groupId>oracle.weblogic.lifecycle</groupId>
14+
<groupId>com.oracle.weblogic.lifecycle</groupId>
1515
<version>0.6-SNAPSHOT</version>
1616
<relativePath>../pom.xml</relativePath>
1717
</parent>
@@ -57,7 +57,7 @@
5757
<goal>single</goal>
5858
</goals>
5959
<configuration>
60-
<finalName>${wls-deploy-installer-name}</finalName>
60+
<finalName>${weblogic-deploy-installer-name}</finalName>
6161
<descriptors>
6262
<descriptor>src/assembly/zip.xml</descriptor>
6363
</descriptors>

‎installer/src/assembly/zip.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
7070
<useProjectArtifact>false</useProjectArtifact>
7171
<includes>
72-
<include>oracle.weblogic.lifecycle:weblogic-deploy-core</include>
72+
<include>com.oracle.weblogic.lifecycle:weblogic-deploy-core</include>
7373
</includes>
7474
</dependencySet>
7575
<dependencySet>

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -227,30 +227,30 @@ IF DEFINED DOMAIN_TYPE (
227227
IF "%USE_JRF_WLST%" == "TRUE" (
228228
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
229229
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
230-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
231-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
230+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
231+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
232232
GOTO found_wlst
233233
)
234234
) ELSE (
235235
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
236236
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
237-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
237+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
238238
GOTO found_wlst
239239
)
240240
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
241241
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
242-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
242+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
243243
GOTO found_wlst
244244
)
245245
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
246246
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
247247
@rem WLS 12.1.2 or WLS 12.1.3
248248
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
249-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
249+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
250250
) ELSE (
251251
@rem WLS 12.2.1+
252252
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
253-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
253+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
254254
)
255255
GOTO found_wlst
256256
)

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -254,22 +254,22 @@ else
254254
if [ "${USE_JRF_WLST}" = "TRUE" ]; then
255255
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
256256
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
257-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
258-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
257+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
258+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
259259
fi
260260
else
261261
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
262262
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
263-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
263+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
264264
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
265265
WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
266-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
266+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
267267
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
268268
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
269-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
269+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
270270
else
271271
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
272-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
272+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
273273
fi
274274
fi
275275

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -225,30 +225,30 @@ IF DEFINED DOMAIN_TYPE (
225225
IF "%USE_JRF_WLST%" == "TRUE" (
226226
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
227227
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
228-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
229-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
228+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
229+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
230230
GOTO found_wlst
231231
)
232232
) ELSE (
233233
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
234234
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
235-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
235+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
236236
GOTO found_wlst
237237
)
238238
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
239239
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
240-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
240+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
241241
GOTO found_wlst
242242
)
243243
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
244244
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
245245
@rem WLS 12.1.2 or WLS 12.1.3
246246
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
247-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
247+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
248248
) ELSE (
249249
@rem WLS 12.2.1+
250250
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
251-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
251+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
252252
)
253253
GOTO found_wlst
254254
)

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -245,22 +245,22 @@ else
245245
if [ "${USE_JRF_WLST}" = "TRUE" ]; then
246246
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
247247
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
248-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
249-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
248+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
249+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
250250
fi
251251
else
252252
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
253253
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
254-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
254+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
255255
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
256256
WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
257-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
257+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
258258
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
259259
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
260-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
260+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
261261
else
262262
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
263-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
263+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
264264
fi
265265
fi
266266

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -202,30 +202,30 @@ IF DEFINED DOMAIN_TYPE (
202202
IF "%USE_JRF_WLST%" == "TRUE" (
203203
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
204204
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
205-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
206-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
205+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
206+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
207207
GOTO found_wlst
208208
)
209209
) ELSE (
210210
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
211211
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
212-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
212+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
213213
GOTO found_wlst
214214
)
215215
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
216216
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
217-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
217+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
218218
GOTO found_wlst
219219
)
220220
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
221221
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
222222
@rem WLS 12.1.2 or WLS 12.1.3
223223
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
224-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
224+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
225225
) ELSE (
226226
@rem WLS 12.2.1+
227227
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
228-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
228+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
229229
)
230230
GOTO found_wlst
231231
)

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -215,22 +215,22 @@ else
215215
if [ "${USE_JRF_WLST}" = "TRUE" ]; then
216216
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
217217
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
218-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
219-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
218+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
219+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
220220
fi
221221
else
222222
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
223223
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
224-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
224+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
225225
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
226226
WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
227-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
227+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
228228
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
229229
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
230-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
230+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
231231
else
232232
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
233-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
233+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
234234
fi
235235
fi
236236

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -221,30 +221,30 @@ IF DEFINED DOMAIN_TYPE (
221221
IF "%USE_JRF_WLST%" == "TRUE" (
222222
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
223223
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
224-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
225-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
224+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
225+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
226226
GOTO found_wlst
227227
)
228228
) ELSE (
229229
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
230230
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
231-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
231+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
232232
GOTO found_wlst
233233
)
234234
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
235235
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
236-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
236+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
237237
GOTO found_wlst
238238
)
239239
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
240240
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
241241
@rem WLS 12.1.2 or WLS 12.1.3
242242
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
243-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
243+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
244244
) ELSE (
245245
@rem WLS 12.2.1+
246246
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
247-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
247+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
248248
)
249249
GOTO found_wlst
250250
)

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -221,22 +221,22 @@ else
221221
if [ "${USE_JRF_WLST}" = "TRUE" ]; then
222222
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
223223
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
224-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
225-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
224+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
225+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
226226
fi
227227
else
228228
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
229229
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
230-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
230+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
231231
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
232232
WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
233-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
233+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
234234
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
235235
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
236-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
236+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
237237
else
238238
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
239-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
239+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
240240
fi
241241
fi
242242

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -212,30 +212,30 @@ IF DEFINED DOMAIN_TYPE (
212212
IF "%USE_JRF_WLST%" == "TRUE" (
213213
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
214214
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
215-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
216-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
215+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
216+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
217217
GOTO found_wlst
218218
)
219219
) ELSE (
220220
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
221221
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
222-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
222+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
223223
GOTO found_wlst
224224
)
225225
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
226226
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
227-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
227+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
228228
GOTO found_wlst
229229
)
230230
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
231231
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
232232
@rem WLS 12.1.2 or WLS 12.1.3
233233
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
234-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
234+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
235235
) ELSE (
236236
@rem WLS 12.2.1+
237237
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
238-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\wls-deploy-core.jar
238+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
239239
)
240240
GOTO found_wlst
241241
)

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -240,22 +240,22 @@ else
240240
if [ "${USE_JRF_WLST}" = "TRUE" ]; then
241241
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
242242
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
243-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
244-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
243+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
244+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
245245
fi
246246
else
247247
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
248248
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
249-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
249+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
250250
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
251251
WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
252-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
252+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
253253
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
254254
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
255-
CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export CLASSPATH
255+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
256256
else
257257
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
258-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/wls-deploy-core.jar; export WLST_EXT_CLASSPATH
258+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
259259
fi
260260
fi
261261

0 commit comments

Comments
 (0)