Skip to content

Commit 742de29

Browse files
bamcgillbamcgill
committedDec 4, 2018
Updating upload directory which is a set of scripts for commisioning the VM
·
18.3.0
1 parent b7c733c commit 742de29

31 files changed

+520
-293
lines changed
 

‎README.md

+30-12
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Oracle Developer Day VM Builder
22
===============================
33

44
Welcome to the packer build for the Oracle Developer Day vm.
5-
This will build a Oracle Linux server and install a 12.2 Oracle database on the machine. Follow the download instructions to download the software to install and follow the build instructions to build the machine. You will need around 30gb of space free to store the downloads and run the build.
5+
This will build a Oracle Linux server and install a 18.3 Oracle database on the machine. Follow the download instructions to download the software to install and follow the build instructions to build the machine. You will need around 30gb of space free to store the downloads and run the build.
66

77
There are several directories which are used in the build
88

@@ -15,9 +15,7 @@ Mandatory Downloads
1515
**These two downloads are mandatory**. If they are not here, the build will not start.
1616

1717
* OracleLinux-R7-U3-Server-x86_64-dvd.iso (needs to be this exactly md5 checked)
18-
* see : http://edelivery.oracle.com/linux (I cannot give more direct link - as (free) login required + need to be over 18)
19-
* linux\*122*_database.zip (12201 has been verified - silent install may be incompatible with later versions)
20-
* see : http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html# - (free) login required to accept license
18+
* LINUX.X64_180000_db_home.zip (183 has been verified - silent install may be incompatible with later versions)
2119

2220
Optional Downloads
2321
--------------
@@ -26,8 +24,8 @@ If these files are available in the **put_files_here** directory, the build will
2624
* jdk-8u\*-linux-x64.tar.gz - **Oracle JDK**
2725
* sqldeveloper-\*-no-jre.zip - **Oracle SQL Developer**
2826
* datamodeler-\*-no-jre.zip **Oracle SQLDeveloper Data Modeler**
29-
* sqlcl-\*-no-jre.zip - **Oracle SQLcl**
30-
* apex_5\*.zip - **Oracle Application Express**
27+
* sqlcl-\*.zip - **Oracle SQLcl**
28+
* apex\_\*.zip - **Oracle Application Express**
3129
* ords\*.zip - **Oracle REST Data Services**
3230

3331
Oracle Internal Files
@@ -51,12 +49,6 @@ update servers. optional export to export the ova.
5149

5250
![packer build](images/packerbuild.png)
5351

54-
Output Directory
55-
----------------
56-
57-
After building you can find the built OVA in the output directory.
58-
If you want the Oracle prebuilt OVA you can find it on Oracle Technology Network (OTN) [here](http://www.oracle.com/technetwork/database/enterprise-edition/databaseappdev-vm-161299.html)
59-
6052
Build Structure
6153
--------------------
6254

@@ -77,3 +69,29 @@ Timings:
7769

7870
Minimum (Oracle Linux + Oracle Database)
7971
Total time 60 mins (accounted for time + 7 mins rounding error / ignore <2 minute).
72+
73+
boot,8
74+
yum update,14
75+
reboot ,3
76+
run database software install (not database build),3
77+
dbca (database build),7
78+
password and 32kvarchar2,6
79+
shrink (fill disk with 0 for easy compression),3
80+
1 x 3 minute reboot + shutdown + minor <1 minute stuff,10
81+
82+
Maximum (Including all optional extras APEX/ORDS/((internal) demos)
83+
Total time 113.5 mins (Accounted for time + 10.5 mins rounding error / ignore <2 minute).
84+
boot,9
85+
yum update,14
86+
reboot,3
87+
run database software install (not database build),4
88+
dbca (database build),8
89+
password and 32kvarchar <should be same as minimum?>,18
90+
apex install ,16
91+
ords install ,4
92+
set up demos and run demo reset,18
93+
shrink (fill disk with 0 for easy compression),2
94+
1 x 3 minute reboot + shutdown + minor <1 minute stuff - this is too long,9
95+
96+
Removing the shrink.sh if not exporting - fills disk with 0 for easy compression.
97+
Run shrink.sh over ssh if subsequently exporting to ova (brings ova file down 60% in size to under 8Gb)

‎packerConfig.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,16 @@
5656
"vboxmanage": [
5757
[ "modifyvm", "{{.Name}}", "--memory", "4096" ],
5858
[ "modifyvm", "{{.Name}}", "--cpus", "2" ],
59-
[ "createhd", "--filename", "Oracle DB Developer VMo_2.vdi", "--size", "30000"],
60-
[ "storageattach", "{{.Name}}", "--storagectl", "SATA Controller", "--port", "1", "--device", "0" ,"--type", "hdd", "--medium", "Oracle DB Developer VMo_2.vdi"],
59+
[ "createhd", "--filename", "Oracle DB Developer VM__2.vdi", "--size", "30000"],
60+
[ "storageattach", "{{.Name}}", "--storagectl", "SATA Controller", "--port", "1", "--device", "0" ,"--type", "hdd", "--medium", "Oracle DB Developer VM__2.vdi"],
6161
[ "modifyvm", "{{.Name}}", "--clipboard", "bidirectional"],
6262
[ "modifyvm", "{{.Name}}", "--draganddrop", "bidirectional"],
6363
[ "modifyvm", "{{.Name}}", "--paravirtprovider", "kvm"],
6464
[ "modifyvm", "{{.Name}}", "--natpf1", "net8,tcp,,1521,,1521"],
6565
[ "modifyvm", "{{.Name}}", "--natpf1", "ssh,tcp,,2222,,22"],
6666
[ "modifyvm", "{{.Name}}", "--natpf1", "apex8080,tcp,,8080,,8080"],
6767
[ "modifyvm", "{{.Name}}", "--natpf1", "apex8081,tcp,,8081,,8081"],
68+
[ "modifyvm", "{{.Name}}", "--natpf1", "ords9090,tcp,,9090,,9090"],
6869
[ "modifyvm", "{{.Name}}", "--audio", "none"],
6970
[ "modifyvm", "{{.Name}}", "--vram", "128"]
7071
],
@@ -90,7 +91,7 @@
9091
"shutdown_timeout": "10m",
9192
"vm_name": "Oracle DB Developer VM",
9293
"http_directory":"upload",
93-
"export_opts": ["--vsys", "0","--eulafile","license.txt", "--product", "Oracle RDBMS 12.2, Application Express 5.1,REST Data Services 3.0,SQL Developer 4.2", "--producturl", "http://otn.oracle.com", "--vendor", "Oracle", "--vendorurl", "http://www.oracle.com", "--version", "May_2017"]
94+
"export_opts": ["--vsys", "0","--eulafile","license.txt", "--product", "Oracle RDBMS 18.3, Application Express 18.1,REST Data Services 18.2,SQL Developer 18.2", "--producturl", "http://otn.oracle.com", "--vendor", "Oracle", "--vendorurl", "http://www.oracle.com", "--version", "July_2017"]
9495
}
9596
]
9697
}

‎start.sh

+12-6
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,19 @@ function cleanup {
4545
# are present otherwise, there is no point in continuing
4646
#
4747
function check_required_files {
48-
export varsaccepted=
49-
if test -f put_files_here/OracleLinux-R7-U3-Server-x86_64-dvd.iso
50-
then
48+
export varsaccepted=
49+
if test -f OracleLinux-R7-U3-Server-x86_64-dvd.iso
50+
then
5151
export varsaccepted=" -var iso_downloaded=y "
52-
cp -n put_files_here/OracleLinux-R7-U3-Server-x86_64-dvd.iso .
53-
fi
54-
if test -f put_files_here/linuxx64*122*database.zip
52+
else
53+
if test -f put_files_here/OracleLinux-R7-U3-Server-x86_64-dvd.iso
54+
then
55+
export varsaccepted=" -var iso_downloaded=y "
56+
mv put_files_here/OracleLinux-R7-U3-Server-x86_64-dvd.iso .
57+
touch put_files_here/OracleLinux-R7-U3-Server-x86_64-dvd.iso
58+
fi
59+
fi
60+
if test -f put_files_here/LINUX.X64_*_db_home.zip
5561
then
5662
export varsaccepted=" $varsaccepted -var oracle_database_downloaded=y "
5763
fi

‎upload/1updateLinux_inner.sh

+20-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ then
3838
fi
3939
}
4040
function yum_update {
41-
41+
#turn off packagekit - sometimes conflicts with yum - not available yet but mask seems to work
42+
/bin/systemctl stop packagekit.service
43+
/bin/systemctl disable packagekit.service
44+
/bin/systemctl mask packagekit.service
4245
yum -y update
4346
yum -y grouplist
4447
yum -y groups list
@@ -47,7 +50,7 @@ yum -y install expect
4750
yum -y install gcc
4851
yum -y install kernel-uek-devel
4952
yum -y install kernel-headers
50-
yum -y install oracle-database-server-12cR2-preinstall
53+
yum -y install oracle-database-preinstall-18c
5154
#oracle-rdbms-server-12cR2-preinstall
5255
usermod -a -g oinstall -G dba,wheel oracle
5356
#need to remove the yum proxy
@@ -86,6 +89,18 @@ systemctl set-default graphical.target
8689
}
8790

8891
function setup_desktop {
92+
cd /tmp
93+
#need to move oracle user before gnome gets started
94+
chmod 755 /home/oracle
95+
#move symbolic link from under me - work or fail fast
96+
mkdir /u01/userhome
97+
chmod 755 /u01/userhome
98+
cp -Rp /home/* /u01/userhome
99+
chmod 755 /u01/userhome/*
100+
#sometimes fails (10% of builds) if process running
101+
ps -ef | grep oracle
102+
rm -rf /home
103+
ln -s /u01/userhome /home
89104
#need a reboot (or finish) after extras install. check by lsmod | grep vbox
90105
su - oracle -c "bash -c 'mkdir ~/.config'"
91106
su - oracle -c "bash -c 'mkdir ~/Desktop; echo images>>~/Desktop/.hidden; echo style.css>>~/Desktop/.hidden'"
@@ -101,7 +116,7 @@ Name[en_US]=Click here to Start Labs
101116
Exec=/usr/bin/firefox /home/oracle/Desktop/ODDHandsOnLabs.html \n
102117
Name=Start Here
103118
Icon=/home/oracle/runTimeClickHere.png
104-
' > ~oracle/Desktop/'Click here to Start.desktop'"
119+
' > /home/oracle/Desktop/'Click here to Start.desktop'"
105120
else
106121
su - oracle -c "echo '[Desktop Entry]
107122
Version=1.0
@@ -112,9 +127,9 @@ Name[en_US]=Click here to Start Browser
112127
Exec=/usr/bin/firefox \n
113128
Name=Start Here
114129
Icon=/home/oracle/runTimeClickHere.png
115-
' > ~oracle/Desktop/'Click here to Start.desktop'"
130+
' > /home/oracle/Desktop/'Click here to Start.desktop'"
116131
fi
117-
su - oracle -c "chmod 755 ~oracle/Desktop/'Click here to Start.desktop'"
132+
su - oracle -c "chmod 755 ~/Desktop/'Click here to Start.desktop'"
118133
su - oracle -c "cp /tmp/1/runTimeClickHere.png ~oracle"
119134
}
120135
function setup_resolution {

‎upload/2afterFirstReboot_inner.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ if test "m$BUILD_WEB_PROXY" != "m"
4444
then
4545
printf "2d\nw\nq"|ed /etc/yum.conf
4646
fi
47-
#fix for intermittant java/sqldeveloper cursor copy issue
48-
cat /etc/default/grub| sed 's/^\(GRUB_CMDLINE_LINUX="[^"]*\)/\1 nomodeset/g' > /tmp/xx
49-
cp /tmp/xx /etc/default/grub
50-
grub2-mkconfig -o /boot/grub2/grub.cfg
47+
#fix for intermittant java/sqldeveloper cursor copy issue supposedly fixed in latest (openjdk?) java152
48+
#cat /etc/default/grub| sed 's/^\(GRUB_CMDLINE_LINUX="[^"]*\)/\1 nomodeset/g' > /tmp/xx
49+
#cp /tmp/xx /etc/default/grub
50+
#grub2-mkconfig -o /boot/grub2/grub.cfg
5151
. ~oracle/buildTimeEnd.sh
5252
exit 0

‎upload/3_1installDbtoolClientTools_inner.sh

+21-8
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727

2828
. ~oracle/runTimeStartScript.sh
29+
dbus-launch gsettings set org.gnome.nautilus.icon-view default-zoom-level small
2930
mkdir -p /home/oracle/java
3031
mkdir -p /home/oracle/Desktop/images
3132
if test -f /tmp/1/jdk8x64.tar.gz
@@ -126,7 +127,7 @@ fi
126127
#actually made further up this script
127128
if test /tmp/1/sqldev.zip
128129
then
129-
cp /tmp/1/"SQL Developer.desktop" /home/oracle/Desktop
130+
cp /tmp/1/"SQL Developer.desktop" /home/oracle/Desktop/
130131
fi
131132
#cp /tmp/1/readme.txt /home/oracle/Desktop
132133
#probably want to skip next 5 commands in testing - and have them prebuilt into the base. what if they ask for a reboot? - force a reboot at end?
@@ -154,7 +155,7 @@ Exec=/home/oracle/bin/datamodeler
154155
Terminal=false
155156
Type=Application
156157
X-Desktop-File-Install-Version=0.21
157-
Categories=X-Red-Hat-Extra;Application;Development;" > /home/oracle/Desktop/Oracle-datamodeler.desktop
158+
" > /home/oracle/Desktop/Oracle-datamodeler.desktop
158159
chmod 755 /home/oracle/Desktop/Oracle-datamodeler.desktop
159160
echo '#!/bin/bash
160161
#should do image or desktop
@@ -173,16 +174,16 @@ echo '#!/bin/bash
173174
#LD_LIBRARY_PATH
174175
#normal .bashrc does not set LD_LIBRARY_PATH even the first time
175176
export ORACLE_BASE=/u01/app/oracle
176-
export ORACLE_HOME=$ORACLE_BASE/product/12.2/db_1
177+
export ORACLE_HOME=$ORACLE_BASE/product/version/db_1
177178
export LD_LIBRARY_PATH=$ORACLE_HOME/lib
178179
if test "m$DBENV" = "m"
179180
then
180181
export TMP=/tmp
181182
export TMPDIR=$TMP
182-
export ORACLE_UNQNAME=orcl12c
183+
export ORACLE_UNQNAME=orclcdb
183184
export ORACLE_BASE=/u01/app/oracle
184-
export ORACLE_HOME=$ORACLE_BASE/product/12.2/db_1
185-
export ORACLE_SID=orcl12c
185+
export ORACLE_HOME=$ORACLE_BASE/product/version/db_1
186+
export ORACLE_SID=orclcdb
186187
export PATH=$ORACLE_HOME/bin:/usr/sbin:$PATH
187188
export LD_LIBRARY_PATH=$ORACLE_HOME/lib
188189
export CLASSPATH=$ORACLE_HOME/jlib:$ORACLE_HOME/rdbms/jlib
@@ -200,12 +201,24 @@ export TMZ="GMT"
200201
export JAVA_HOME=`ls -d /home/oracle/java/jdk* 2>/dev/null`
201202
if test "m$JAVA_HOME" = "m"
202203
then
203-
export JAVA_HOME=/u01/app/oracle/product/12.2/db_1/jdk
204+
export JAVA_HOME=/u01/app/oracle/product/version/db_1/jdk
204205
fi
205206
export PATH=$JAVA_HOME/bin:/home/oracle/bin:/home/oracle/sqlcl/bin:/home/oracle/sqldeveloper:/home/oracle/datamodeler:$PATH:/home/oracle/sqlcl/bin:/home/oracle/sqldeveloper:/home/oracle/bin
206207
export JAVAENV=true
207208
fi'>>/home/oracle/.bashrc
208-
209+
ed -s /home/oracle/Desktop/'Click here to Start.desktop' <<< $',s/Click here to Start/Click here to Start Labs/g\nw'
210+
echo '
211+
bash /tmp/1/buildTimeSetupRestClient.sh
212+
export LD_LIBRARY_PATH=
213+
cd ~/Desktop
214+
echo only rest client worked do this again at the end icon size seems almost similar whether trusted or not
215+
dbus-launch gio set "Rest Client.desktop" "metadata::trusted" yes
216+
dbus-launch gio set "SQL Developer.desktop" "metadata::trusted" yes
217+
dbus-launch gio set "Oracle-datamodeler.desktop" "metadata::trusted" yes
218+
dbus-launch gio set "Click here to Start.desktop" "metadata::trusted" yes
219+
dbus-launch gio set "sql.desktop" "metadata::trusted" yes
220+
' > /tmp/icons.sh
221+
bash /tmp/icons.sh
209222
cp /tmp/1/runTimeSQLDeveloperIcon.png /home/oracle/Desktop/images
210223
cp /tmp/1/runTimeSQLDeveloperIcon.png /home/oracle/Desktop/images
211224
cp /tmp/1/runTimeLabStylesheet.css /home/oracle/Desktop/style.css

‎upload/3_2installDatabase_inner.sh

+8-9
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@
2626

2727

2828
. ~oracle/runTimeStartScript.sh
29-
mkdir /u01/stagevb
30-
mv /tmp/1/linuxx64_122_database.zip /u01/stagevb
31-
cd /u01/stagevb
32-
unzip linuxx64_122_database.zip
29+
mkdir -p /u01/app/oracle/product/version/db_1
30+
mv /tmp/1/LINUX.X64_180000_db_home.zip /u01/app/oracle/product/version/db_1
31+
cd /u01/app/oracle/product/version/db_1
32+
unzip LINUX.X64_180000_db_home.zip
33+
rm LINUX.X64_180000_db_home.zip
3334
echo assumption this results in a directory database
34-
rm linuxx64_122_database.zip
35-
cd /u01/stagevb/database
3635

3736
./runInstaller -silent -ignorePrereq -waitForCompletion -responseFile /tmp/1/buildTimeSoftwareInstall.rsp
3837

@@ -46,10 +45,10 @@ if test "m$DBENV" = "m" -a "m$GNOME_CHECK" = "m0"
4645
then
4746
export TMP=/tmp
4847
export TMPDIR=$TMP
49-
export ORACLE_UNQNAME=orcl12c
48+
export ORACLE_UNQNAME=orclcdb
5049
export ORACLE_BASE=/u01/app/oracle
51-
export ORACLE_HOME=$ORACLE_BASE/product/12.2/db_1
52-
export ORACLE_SID=orcl12c
50+
export ORACLE_HOME=$ORACLE_BASE/product/version/db_1
51+
export ORACLE_SID=orclcdb
5352
#LD_LIBRARY_PATH
5453
export PATH=/home/oracle/bin:/home/oracle/LDLIB:$ORACLE_HOME/bin:/usr/sbin:$PATH
5554
#during install set LD_LIBRARY_PATH otherwise rely on LDLIB wrappers and ~/bin/sql sqlplus and modeller

‎upload/3_6apexInstall_inner.sh

+65-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727

2828
. ~oracle/runTimeStartScript.sh
2929

30+
if test -f /tmp/1/cwallet.sso
31+
then
32+
mkdir /home/oracle/wallet
33+
cp /tmp/1/cwallet.sso /home/oracle/wallet
34+
chmod -R 755 /home/oracle/wallet
35+
fi
3036
cd $ORACLE_HOME/apex
3137
echo apex not preinstalled anymore
3238
ls -l apxremov_con.sql
@@ -78,16 +84,24 @@ EXEC DBMS_UTILITY.compile_schema(schema => 'FLOWS_FILES');
7884
EXEC DBMS_UTILITY.compile_schema(schema => 'APEX_050100');
7985
EXEC DBMS_UTILITY.compile_schema(schema => 'APEX_PUBLIC_USER');
8086
EXEC DBMS_UTILITY.compile_schema(schema => 'FLOWS_FILES');
81-
87+
column totupapex new_val totupapex
88+
--APEX_180100 check
89+
select username totupapex from all_users where username like 'APEX_0%' or username like 'APEX_1%' or username like 'APEX_2%' order by totupapex asc;
90+
clear column
91+
EXEC DBMS_UTILITY.compile_schema(schema => '&totupapex');
92+
EXEC DBMS_UTILITY.compile_schema(schema => 'APEX_PUBLIC_USER');
93+
EXEC DBMS_UTILITY.compile_schema(schema => 'FLOWS_FILES');
8294
--anonymous needs to be unlocked should be unlocked at pdb level might error?? SELECT username, account_status FROM dba_users;
8395
alter user anonymous identified by oracle;
8496
alter user anonymous account unlock;
8597
ALTER USER APEX_050000 identified by oracle;
8698
ALTER USER APEX_050100 identified by oracle;
99+
ALTER USER &totupapex identified by oracle;
87100
ALTER USER APEX_PUBLIC_USER identified by oracle;
88101
ALTER USER FLOWS_FILES identified by oracle;
89102
ALTER USER APEX_050000 ACCOUNT UNLOCK;
90103
ALTER USER APEX_050100 ACCOUNT UNLOCK;
104+
ALTER USER &totupapex ACCOUNT UNLOCK;
91105
ALTER USER APEX_PUBLIC_USER ACCOUNT UNLOCK;
92106
ALTER USER FLOWS_FILES ACCOUNT UNLOCK;
93107
"|$SQL_OR_SQLPLUS sys/oracle@localhost:1521/orcl as sysdba
@@ -191,6 +205,56 @@ end;
191205
/
192206
commit;
193207
" | sqlplus sys/oracle@localhost:1521/orcl as sysdba
208+
echo "whenever sqlerror exit 1
209+
column totupapex new_val totupapex
210+
--APEX_180100 check
211+
select username totupapex from all_users where username like 'APEX_0%' or username like 'APEX_1%' or username like 'APEX_2%' order by totupapex asc;
212+
clear column
213+
alter session set current_schema = &totupapex;
214+
215+
PROMPT <<--------------- Setting Instance Settings --------------->>
216+
begin
217+
wwv_flow_security.g_security_group_id := 10;
218+
wwv_flow_security.g_user := 'ADMIN';
219+
wwv_flow.g_import_in_progress := true;
220+
221+
for c1 in (select user_id
222+
from wwv_flow_fnd_user
223+
where security_group_id = wwv_flow_security.g_security_group_id
224+
and user_name = wwv_flow_security.g_user
225+
) loop
226+
APEX_UTIL.edit_user
227+
( p_user_id => c1.user_id
228+
, p_user_name => wwv_flow_security.g_user
229+
, p_web_password => 'oracle'
230+
, p_new_password => 'oracle'
231+
,p_change_password_on_first_use => 'N',
232+
p_first_password_use_occurred => 'Y' );
233+
end loop;
234+
wwv_flow.g_import_in_progress := false;
235+
APEX_INSTANCE_ADMIN.SET_PARAMETER('PASSWORD_HISTORY_DAYS',0);
236+
APEX_INSTANCE_ADMIN.SET_PARAMETER('STRONG_SITE_ADMIN_PASSWORD','N');
237+
APEX_INSTANCE_ADMIN.SET_PARAMETER('ACCOUNT_LIFETIME_DAYS',36500);
238+
239+
end;
240+
/
241+
commit;
242+
" | sqlplus sys/oracle@localhost:1521/orcl as sysdba
243+
echo "
244+
column totupapex new_val totupapex
245+
--APEX_180100 check
246+
select username totupapex from all_users where username like 'APEX_0%' or username like 'APEX_1%' or username like 'APEX_2%' order by totupapex asc;
247+
clear column
248+
BEGIN
249+
DBMS_NETWORK_ACL_ADMIN.APPEND_HOST_ACE(
250+
host => '*',
251+
ace => xs"'$'"ace_type(privilege_list => xs"'$'"name_list('connect'),
252+
principal_name => '&totupapex',
253+
principal_type => xs_acl.ptype_db));
254+
END;
255+
/
256+
commit;
257+
"| sqlplus sys/oracle@localhost:1521/orcl as sysdba
194258

195259
else
196260
~oracle/buildTimeReportSkippingFile.sh apex.zip

‎upload/3_7ORDSInstall_inner.sh

+35-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,15 @@
2626

2727

2828
. ~oracle/runTimeStartScript.sh
29+
if test -f /tmp/1/oracle.dbtools.jdbcrest.jar
30+
then
31+
cp /tmp/1/oracle.dbtools.jdbcrest.jar ~/sqlcl/lib
32+
chmod 644 ~/sqlcl/lib/oracle.dbtools.jdbcrest.jar
33+
chown oracle ~/sqlcl/lib/oracle.dbtools.jdbcrest.jar
34+
fi
2935
if test -f /tmp/1/ords.zip
3036
then
31-
if test -f /home/oracle/sqldeveloper/ords
37+
if test -d /home/oracle/sqldeveloper/ords
3238
then
3339
if test -f /tmp/1/apex.zip
3440
then
@@ -81,8 +87,7 @@ then
8187
set timeout 600
8288
spawn java -jar /home/oracle/ords/ords.war install --parameterFile /home/oracle/ords/ords_params_vmconfig.properties simple
8389
84-
expect -regexp "Enter the username with SYSDBA privileges to verify the installation .SYS.." { send "sys\r" }
85-
expect -regexp "Enter the database password for sys." {send "oracle\r"}
90+
expect -regexp "Enter the database password for SYS AS SYSDBA." {send "oracle\r"}
8691
expect -regexp "Confirm password." {send "oracle\r"}
8792
expect -regexp " if using HTTPS .1.." {send "1\r"}
8893
expect -regexp "something the WiLl Never Happen" {send "jingle bella\r"}
@@ -94,8 +99,34 @@ then
9499
echo tags to search stdout 1690 160
95100
cat /tmp/zzz
96101
echo /home/oracle/bin/ords.sh stop
97-
/home/oracle/bin/ords.sh stop
102+
mv /home/oracle/ords/vmconfig/ords/defaults.xml /home/oracle/ords/vmconfig/ords/defaults.xml.SAV
103+
cat /home/oracle/ords/vmconfig/ords/defaults.xml.SAV|sed 'sZ<entry key="db.port">1521</entry>Z<entry key="db.port">1521</entry>\n<entry key="restEnabledSql.active">true</entry>\n<entry key="security.verifySSL">false</entry>Zg'>/home/oracle/ords/vmconfig/ords/defaults.xml
104+
chmod 755 /home/oracle/ords/vmconfig/ords/defaults.xml
105+
/home/oracle/bin/ords.sh stop
98106
rm ~/bin/x.sh /tmp/zzz
107+
cp /tmp/1/runtime9090ORDS.properties ~oracle
108+
cp /tmp/1/uninstall9090ORDS.properties ~oracle
109+
if test -f /tmp/1/demos.zip
110+
then
111+
cp /tmp/1/9090init /tmp/1/9090start /tmp/1/9090stop ~/bin
112+
chmod 755 ~/bin/9090init ~/bin/9090start ~/bin/9090stop
113+
fi
114+
/home/oracle/bin/ords.sh start
115+
cd ~/ords
116+
117+
echo '#!/usr/bin/expect
118+
exp_internal 1
119+
set timeout 1200
120+
spawn $JAVA_HOME/bin/java -jar ords.war user HRREST "SQL Developer"
121+
expect -regexp "Enter a password for user HRREST." { send "oracle\r" }
122+
expect -regexp "Confirm password for user HRREST." {send "oracle\r"}
123+
expect -regexp "Something that will never happen to force keep searching until process end" {send "neverhappen\r"}
124+
interact'| sed 'sZ$JAVA_HOMEZ'"$JAVA_HOME"'Zg' > ~/bin/xp.sh
125+
chmod 755 ~/bin/xp.sh
126+
~/bin/xp.sh
127+
rm ~/bin/xp.sh
128+
cd -
129+
/home/oracle/bin/ords.sh stop
99130
else
100131
~oracle/buildTimeReportSkippingFile.sh ords.zip
101132
fi

‎upload/3_8setupDemos_inner.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ for f in rest_sqldev reset_xmldb reset_soup reset_apex reset_json reset_rest res
170170
do
171171
if test -f "$f"
172172
then
173-
sed -i '1sZ^Zexport LD_LIBRARY_PATH=/u01/app/oracle/product/12.2/db_1/lib\
173+
sed -i '1sZ^Zexport LD_LIBRARY_PATH=/u01/app/oracle/product/version/db_1/lib\
174174
Zg' $f
175175
printf "\necho 'alter user hr identified by oracle account unlock;'|sqlplus system/oracle@localhost:1521/orcl\necho 'create or replace trigger EMPLOYEES_EMPLOYEE_ID_TRG
176176
before insert on employees
@@ -191,7 +191,6 @@ done
191191
# for f in reset_sqldev reset_soup reset_apex; do bash -x ./$f >$f.debuglog 2>&1 ; done
192192
#fi
193193

194-
ed -s ~/Desktop/'Click here to Start.desktop' <<< $',s/Click here to Start/Click here to Start Labs/g\nw'
195194
echo MARK_END 1690 end use git then reset all demos _including apex_.
196195
else
197196
~oracle/buildTimeReportSkippingFile.sh "demos.zip - internal test run,"

‎upload/3topLevel_inner.sh

+77-31
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@
2727

2828
. ~oracle/runTimeStartScript.sh
2929
#set -x
30-
echo 'changes after this one will be for 12.2'
30+
echo 'changes after this one will be for version'
3131
printf '1,$ s/#Storage=auto/Storage=volatile/g\n.\nw\nq'| ed /etc/systemd/journald.conf
32-
chmod 755 /home/oracle
33-
#move symbolic link from under me - work or fail fast
34-
35-
mkdir /u01/userhome
36-
chmod 755 /u01/userhome
37-
38-
cp -Rp /home/* /u01/userhome
39-
chmod 755 /u01/userhome/*
40-
rm -rf /home
41-
42-
ln -s /u01/userhome /home
32+
#moved from here to 1 updateLinux_inner - as all sorts of gnome processes get in the way when making the move
33+
#chmod 755 /home/oracle
34+
##move symbolic link from under me - work or fail fast
35+
#mkdir /u01/userhome
36+
#chmod 755 /u01/userhome
37+
#cp -Rp /home/* /u01/userhome
38+
#chmod 755 /u01/userhome/*
39+
##sometimes fails (10% of builds) if process running
40+
#ps -ef | grep oracle
41+
#rm -rf /home
42+
#ln -s /u01/userhome /home
4343
#just moved stuff around make sure we are in a real directory
4444
cd /tmp
4545

@@ -80,9 +80,10 @@ bash -x /tmp/1/buildTimeRootU01Chown.sh
8080
#install hr minimum scripts - in demos.zip but need to be gauranteed to be there
8181
su oracle -c 'mkdir ~/ReBuildScriptSQLDev_HR && cp /tmp/1/hr_* ~/ReBuildScriptSQLDev_HR'
8282
su oracle -c '/bin/bash -lc /tmp/1/3_2installDatabase.sh'
83-
bash /u01/installervb/orainstRoot.sh
84-
bash /u01/app/oracle/product/12.2/db_1/root.sh
85-
cat /u01/app/oracle/product/12.2/db_1/install/root_vbgeneric_*.log
83+
#bash /u01/installervb/orainstRoot.sh
84+
bash /u01/app/oraInventory/orainstRoot.sh
85+
bash /u01/app/oracle/product/version/db_1/root.sh
86+
#cat /u01/app/oracle/product/12.2/db_1/install/root_vbgeneric_*.log
8687
su oracle -c '/bin/bash -lc /tmp/1/buildTimeCallDBCA.sh'
8788
cp /tmp/1/runTimeOracleOnReboot.sh /etc/init.d/oracle
8889
chmod 755 /etc/init.d/oracle
@@ -103,7 +104,7 @@ su oracle -c '/bin/bash -lc /tmp/1/3_3passwordDoNotExpire.sh'
103104
su oracle -c '/bin/bash -lc /tmp/1/3_5unzipLabDemos.sh'
104105
su oracle -c '/bin/bash -lxc /tmp/1/3_6apexInstall.sh'
105106
su oracle -c '/bin/bash -lxc /tmp/1/3_7ORDSInstall.sh'
106-
su oracle -c '/bin/bash -lxc /tmp/1/buildTimeSetupRestClient.sh'
107+
#do this in database client set up 3_1installDbtoolClientTools_inner.sh su oracle -c '/bin/bash -lxc /tmp/1/buildTimeSetupRestClient.sh'
107108
/etc/init.d/oracle stop
108109

109110
su - oracle -c 'cp /tmp/1/nuketimestamps ~oracle/bin/nuketimestamps'
@@ -201,6 +202,14 @@ echo 'firefox &
201202
sleep 10
202203
kill -15 %1
203204
exit' | bash &
205+
export LD_LIBRARY_PATH=
206+
#cd ~/DESKTOP
207+
#dbus-launch gio set "Rest Client.desktop" "metadata::trusted" yes
208+
#dbus-launch gio set "SQL Developer.desktop" "metadata::trusted" yes
209+
#dbus-launch gio set "Oracle-datamodeler.desktop" "metadata::trusted" yes
210+
#dbus-launch gio set "Click here to Start.desktop" "metadata::trusted" yes
211+
#dbus-launch gio set "sql.desktop" "metadata::trusted" yes
212+
#this stopped working copying it to on gnome login
204213
dbus-launch gsettings set org.gnome.desktop.session idle-delay 0
205214
dbus-launch gsettings set org.gnome.desktop.screensaver lock-enabled false
206215
dbus-launch gsettings set org.gnome.desktop.background picture-uri ''
@@ -210,7 +219,7 @@ chmod 755 /tmp/asoracle
210219
su - oracle -c '/bin/bash -xc /tmp/asoracle'
211220
rm /tmp/asoracle
212221

213-
export ORACLE_HOME=/u01/app/oracle/product/12.2/db_1
222+
export ORACLE_HOME=/u01/app/oracle/product/version/db_1
214223
#force firefox initial state for jsonview. hacky.
215224
echo "bash /tmp/1/buildTimeCheckVersion.sh before_remove
216225
" > /tmp/asoracle
@@ -228,7 +237,7 @@ then
228237
fi
229238

230239
#assumption we are always going to install a 'new' sqldeveloper so remoive as shipped one
231-
rm -rf $ORACLE_HOME/sodapatch $ORACLE_HOME/sqldeveloper $ORACLE_HOME/apexpatch $ORACLE_HOME/assistants /u01/app/OraInventory /u01/app/oracle/product/12.2/db_1/p6880880_121010_Linux-x86-64.zip /u01/stagevb
240+
rm -rf $ORACLE_HOME/sodapatch $ORACLE_HOME/sqldeveloper $ORACLE_HOME/apexpatch $ORACLE_HOME/assistants /u01/app/OraInventory /u01/app/oracle/product/version/db_1/p6880880_121010_Linux-x86-64.zip /u01/stagevb
232241
echo "bash /tmp/1/buildTimeCheckVersion.sh after_remove
233242
" > /tmp/asoracle
234243

@@ -312,18 +321,27 @@ rm -rf $ORACLE_HOME/javavm/jdk/jdk7
312321
rm -rf ~oracle/apex/builder
313322
rm -rf $ORACLE_HOME/.patch_storage
314323
rm -rf $ORACLE_HOME/oc4j
315-
rm -rf $ORACLE_HOME/bin/sql
324+
if test -f /home/oracle/sqlcl/bin/sql
325+
then
326+
rm -rf $ORACLE_HOME/bin/sql
327+
fi
328+
if test -f /home/oracle/sqldeveloper/sqldeveloper.sh
329+
then
330+
rm -rf $ORACLE_HOME/bin/sqldeveloper.sh
331+
fi
316332
rm -rf ~oracle/VBoxGuestAdditions.iso
317333
rm ~oracle/*.debuglog ~oracle/reset_xmldbjson.log
318334
rpm -e gnome-user-docs gnome-getting-started-docs
319335
#turn off gnome tracker in runTimeEnforceMinScreenSize.sh ie rm -rf ~oracle/.cache should be small
320336
yum -y clean all
321337
du -sh /var/tmp/yum-oracle-kPjjzB
322338
rm -rf /var/tmp/yum-oracle-kPjjzB
323-
339+
rm /var/spool/abrt/*/coredump
324340
#bye bye maintainability...
325-
du -sh /u01/app/oracle/product/12.2/db_1/inventory
326-
rm -rf /u01/app/oracle/product/12.2/db_1/inventory/*
341+
du -sh /u01/app/oracle/product/version/db_1/inventory
342+
rm -rf /u01/app/oracle/product/version/db_1/inventory/*
343+
#remove extra 900 meg non essential directories and zips - note static library files not removed for now.
344+
rm -rf $ORACLE_HOME/suptools/* $ORACLE_HOME/OPatch/* 20M $ORACLE_HOME/lib/ra_windows64.zip $ORACLE_HOME/lib/ra_solaris_x64.zip $ORACLE_HOME/lib/ra_aix_ppc64.zip $ORACLE_HOME/lib/ra_zlinux64.zip $ORACLE_HOME/lib/ra_solaris_sparc64.zip $ORACLE_HOME/lib/ra_hpux_ia64.zip $ORACLE_HOME/md/property_graph/pgx/server/pgx-webapp-2.5.1-wls.war $ORACLE_HOME/md/property_graph/pgx/server/pgx-webapp-2.5.1.war
327345
if test "m$BUILD_WEB_PROXY" != "m"
328346
then
329347
printf "2d\nw\nq"|ed /etc/yum.conf
@@ -365,7 +383,42 @@ cd /home/oracle
365383
#export DISPLAY=$OLDDISPLAY
366384
#/usr/bin/vncserver -kill :70
367385
#rm -rf ~/.vnc
368-
386+
echo '
387+
echo do this a second time the first time did not take maybe images etc not in place restclient was OK.
388+
export LD_LIBRARY_PATH=
389+
cd ~/Desktop
390+
echo default zoom level seemed also to be reset around here
391+
dbus-launch gsettings set org.gnome.nautilus.icon-view default-zoom-level small
392+
dbus-launch gio set "Rest Client.desktop" "metadata::trusted" yes
393+
dbus-launch gio set "SQL Developer.desktop" "metadata::trusted" yes
394+
dbus-launch gio set "Oracle-datamodeler.desktop" "metadata::trusted" yes
395+
dbus-launch gio set "Click here to Start.desktop" "metadata::trusted" yes
396+
dbus-launch gio set "sql.desktop" "metadata::trusted" yes
397+
' > /tmp/icons.sh
398+
su - oracle -c '/bin/bash /tmp/icons.sh'
399+
echo "#!/bin/bash
400+
#horrible place to put it 3rd try at setting metadata trusted now on every gnome login
401+
cd ~/Desktop
402+
export LD_LIBRARY_PATH=
403+
gio set 'Rest Client.desktop' 'metadata::trusted' yes
404+
gio set 'SQL Developer.desktop' 'metadata::trusted' yes
405+
gio set 'Oracle-datamodeler.desktop' 'metadata::trusted' yes
406+
gio set 'Click here to Start.desktop' 'metadata::trusted' yes
407+
gio set 'sql.desktop' 'metadata::trusted' yes
408+
gsettings set org.gnome.desktop.session idle-delay 0
409+
gsettings set org.gnome.desktop.screensaver lock-enabled false
410+
gsettings set org.gnome.desktop.background picture-uri ''
411+
gsettings set org.gnome.desktop.background primary-color '#000000'
412+
cd -
413+
#have to put in applications directly or screen wonkey mv ~/Desktop/*.desktop ~/.local/share/applications/
414+
. /home/oracle/runTimeEnforceMinScreenSize.sh
415+
if test -f /home/oracle/runTimeEnforceMinScreenSize.sh.alt
416+
then
417+
mv /home/oracle/runTimeEnforceMinScreenSize.sh.alt /home/oracle/runTimeEnforceMinScreenSize.sh
418+
chmod 755 /home/oracle/runTimeEnforceMinScreenSize.sh
419+
fi">/home/oracle/setsizewrap.sh
420+
chmod 755 /home/oracle/setsizewrap.sh
421+
chown oracle /home/oracle/setsizewrap.sh
369422
echo '#!/bin/bash
370423
mkdir -p ~/.config/autostart
371424
echo "[Desktop Entry]
@@ -377,15 +430,8 @@ Terminal=false
377430
Type=Application
378431
X-GNOME-Autostart-enabled=true"> ~/.config/autostart/800x600.desktop
379432
chmod 755 ~/.config/autostart/800x600.desktop
380-
echo "#!/bin/bash
381-
. /home/oracle/runTimeEnforceMinScreenSize.sh
382-
if test -f /home/oracle/runTimeEnforceMinScreenSize.sh.alt
383-
then
384-
mv /home/oracle/runTimeEnforceMinScreenSize.sh.alt /home/oracle/runTimeEnforceMinScreenSize.sh
385-
chmod 755 /home/oracle/runTimeEnforceMinScreenSize.sh
386-
fi">/home/oracle/setsizewrap.sh
387-
chmod 755 /home/oracle/setsizewrap.sh
388433
cd ~/Desktop
434+
cp readme.txt readmeCopy.txt
389435
history -c
390436
history -w
391437
'> /tmp/asoracle

‎upload/9090start

+18
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,20 @@
11
#!/bin/bash
2+
#
3+
# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
#################################################################################
19+
220
sh /home/oracle/Desktop/Database_Track/ORDS/reset_ords.sh start

‎upload/9090stop

+17
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,19 @@
11
#!/bin/bash
2+
#
3+
# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
#################################################################################
219
sh /home/oracle/Desktop/Database_Track/ORDS/reset_ords.sh stop

‎upload/buildTime32kVarchar2.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ set timeout 1200
5050
spawn $ORACLE_HOME/perl/bin/perl $ORACLE_HOME/rdbms/admin/catcon.pl -u SYS -d $ORACLE_HOME/rdbms/admin -l "/home/oracle/utl32k_cdb_pdbs_output" -b utl32k_cdb_pdbs_output utl32k.sql
5151
expect -regexp "Enter Password.." { send "oracle\r" }
5252
expect -regexp "something the WiLl Never Happen" {send "jingle bella\r"}
53-
interact'| sed 'sZ$ORACLE_HOMEZ'"/u01/app/oracle/product/12.2/db_1"'Zg' > ~/bin/xp.sh
53+
interact'| sed 'sZ$ORACLE_HOMEZ'"/u01/app/oracle/product/version/db_1"'Zg' > ~/bin/xp.sh
5454

5555
chmod 755 ~/bin/xp.sh
5656
~/bin/xp.sh
@@ -76,7 +76,7 @@ set timeout 2000
7676
spawn $ORACLE_HOME/perl/bin/perl $ORACLE_HOME/rdbms/admin/catcon.pl -u SYS -d $ORACLE_HOME/rdbms/admin -l "/home/oracle/utlrp_cdb_pdbs_output" -b utlrp_cdb_pdbs_output utlrp.sql
7777
expect -regexp "Enter Password.." { send "oracle\r" }
7878
expect -regexp "something the WiLl Never Happen" {send "jingle bella\r"}
79-
interact' | sed 'sZ$ORACLE_HOMEZ'"/u01/app/oracle/product/12.2/db_1"'Zg' > ~/bin/xp.sh
79+
interact' | sed 'sZ$ORACLE_HOMEZ'"/u01/app/oracle/product/version/db_1"'Zg' > ~/bin/xp.sh
8080

8181
chmod 755 ~/bin/xp.sh
8282
~/bin/xp.sh

‎upload/buildTimeCallDBCA.sh

+17-12
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,22 @@
2828
#cd /u01
2929
#rm -rf /u01/stagevb
3030
#bash -lc 'netca -silent -responseFile /tmp/1/netca.rsp'
31-
export ORACLE_HOME=/u01/app/oracle/product/12.2/db_1
31+
export ORACLE_HOME=/u01/app/oracle/product/version/db_1
32+
bash -lc 'dbca -silent -createDatabase -responseFile /tmp/1/buildTimeDBCA.rsp; if test "m$?" != "m0"
33+
then
34+
echo error on dbca
35+
tail -100 /u01/app/oracle/cfgtoollogs/dbca/orclcdb/orclcdb.log
36+
fi'
37+
bash -lc 'lsnrctl stop'
3238
#nice to have set up hostname and default database ala XE
3339
mkdir -p $ORACLE_HOME/network/admin
3440
echo 'NAME.DIRECTORY_PATH= {TNSNAMES, EZCONNECT, HOSTNAME}'> $ORACLE_HOME/network/admin/sqlnet.ora
3541
echo 'SID_LIST_LISTENER =
3642
(SID_LIST =
3743
(SID_DESC =
38-
(GLOBAL_DBNAME = orcl12c)
39-
(SID_NAME = orcl12c)
40-
(ORACLE_HOME = /u01/app/oracle/product/12.2/db_1)
44+
(GLOBAL_DBNAME = orclcdb)
45+
(SID_NAME = orclcdb)
46+
(ORACLE_HOME = /u01/app/oracle/product/version/db_1)
4147
)
4248
)
4349
@@ -50,24 +56,23 @@ LISTENER =
5056
)
5157
5258
#HOSTNAME by pluggable not working rstriction or configuration error.
53-
DEFAULT_SERVICE_LISTENER = (orcl12c)
59+
DEFAULT_SERVICE_LISTENER = (orclcdb)
5460
'> $ORACLE_HOME/network/admin/listener.ora
5561

5662

5763

58-
echo 'ORCL12C=localhost:1521/orcl12c'>> /u01/app/oracle/product/12.2/db_1/network/admin/tnsnames.ora
64+
echo 'ORCLCDB=localhost:1521/orclcdb'>> /u01/app/oracle/product/version/db_1/network/admin/tnsnames.ora
5965
echo 'ORCL=
6066
(DESCRIPTION =
6167
(ADDRESS = (PROTOCOL = TCP)(HOST = 0.0.0.0)(PORT = 1521))
6268
(CONNECT_DATA =
6369
(SERVER = DEDICATED)
6470
(SERVICE_NAME = orcl)
6571
)
66-
)'>> /u01/app/oracle/product/12.2/db_1/network/admin/tnsnames.ora
72+
)'>> /u01/app/oracle/product/version/db_1/network/admin/tnsnames.ora
73+
6774

6875
bash -lc 'lsnrctl start'
69-
bash -lc 'dbca -silent -createDatabase -responseFile /tmp/1/buildTimeDBCA.rsp; if test "m$?" != "m0"
70-
then
71-
echo error on dbca
72-
tail -100 /u01/app/oracle/cfgtoollogs/dbca/orcl12c/orcl12c.log
73-
fi'
76+
echo 'export TWO_TASK=;echo alter system register ";" |sqlplus sys/oracle as sysdba' > /tmp/12
77+
chmod 755 /tmp/12
78+
bash -lc '/tmp/12'

‎upload/buildTimeCompressHelper.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ EOF
102102
export TWO_TASK=
103103
sqlplus -s / as sysdba <<EOF
104104
CREATE UNDO TABLESPACE undotbs2
105-
DATAFILE '/u01/app/oracle/oradata/orcl12c/undotbs2.dbf'
105+
DATAFILE '/u01/app/oracle/oradata/ORCLCDB/undotbs2.dbf'
106106
SIZE 50M AUTOEXTEND ON NEXT 50M;
107107
ALTER SYSTEM SET UNDO_TABLESPACE=UNDOTBS2 SCOPE=BOTH;
108108
shutdown immediate;

‎upload/buildTimeCreateLD_LIBRARY_PATHShellWrappers.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
rm -rf ~/LDLIB/
2929
. ~/bin/dbenv
3030
cd $ORACLE_HOME/bin
31-
if ! test -f ~/LDLIB/
31+
if ! test -d ~/LDLIB/
3232
then
3333
mkdir ~/LDLIB/
3434
for f in *; do

‎upload/buildTimeDBCA.rsp

+28-27
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#################################################################################
2323

2424

25+
2526
##############################################################################
2627
## ##
2728
## DBCA response file ##
@@ -53,7 +54,7 @@ responseFileVersion=/oracle/assistants/rspfmt_dbca_response_schema_v12.2.0
5354
# Default value : None
5455
# Mandatory : Yes
5556
#-----------------------------------------------------------------------------
56-
gdbName=orcl12c
57+
gdbName=orclcdb
5758

5859
#-----------------------------------------------------------------------------
5960
# Name : sid
@@ -63,7 +64,7 @@ gdbName=orcl12c
6364
# Default value : <db_name> specified in GDBNAME
6465
# Mandatory : No
6566
#-----------------------------------------------------------------------------
66-
sid=orcl12c
67+
sid=orclcdb
6768

6869
#-----------------------------------------------------------------------------
6970
# Name : databaseConfigType
@@ -79,7 +80,7 @@ databaseConfigType=SI
7980
# Name : RACOneNodeServiceName
8081
# Datatype : String
8182
# Description : Service is required by application to connect to RAC One
82-
# Node Database
83+
# Node Database
8384
# Valid values : Service Name
8485
# Default value : None
8586
# Mandatory : No [required in case DATABASECONFTYPE is set to RACONENODE ]
@@ -90,7 +91,7 @@ RACOneNodeServiceName=
9091
# Name : policyManaged
9192
# Datatype : Boolean
9293
# Description : Set to true if Database is policy managed and
93-
# set to false if Database is admin managed
94+
# set to false if Database is admin managed
9495
# Valid values : TRUE\FALSE
9596
# Default value : FALSE
9697
# Mandatory : No
@@ -102,9 +103,9 @@ policyManaged=false
102103
# Name : createServerPool
103104
# Datatype : Boolean
104105
# Description : Set to true if new server pool need to be created for database
105-
# if this option is specified then the newly created database
106-
# will use this newly created serverpool.
107-
# Multiple serverpoolname can not be specified for database
106+
# if this option is specified then the newly created database
107+
# will use this newly created serverpool.
108+
# Multiple serverpoolname can not be specified for database
108109
# Valid values : TRUE\FALSE
109110
# Default value : FALSE
110111
# Mandatory : No
@@ -115,9 +116,9 @@ createServerPool=false
115116
# Name : serverPoolName
116117
# Datatype : String
117118
# Description : Only one serverpool name need to be specified
118-
# if Create Server Pool option is specified.
119-
# Comma-separated list of Serverpool names if db need to use
120-
# multiple Server pool
119+
# if Create Server Pool option is specified.
120+
# Comma-separated list of Serverpool names if db need to use
121+
# multiple Server pool
121122
# Valid values : ServerPool name
122123

123124
# Default value : None
@@ -140,10 +141,10 @@ cardinality=
140141
# Name : force
141142
# Datatype : Boolean
142143
# Description : Set to true if new server pool need to be created by force
143-
# if this option is specified then the newly created serverpool
144-
# will be assigned server even if no free servers are available.
145-
# This may affect already running database.
146-
# This flag can be specified for Admin managed as well as policy managed db.
144+
# if this option is specified then the newly created serverpool
145+
# will be assigned server even if no free servers are available.
146+
# This may affect already running database.
147+
# This flag can be specified for Admin managed as well as policy managed db.
147148
# Valid values : TRUE\FALSE
148149
# Default value : FALSE
149150
# Mandatory : No
@@ -154,9 +155,9 @@ force=false
154155
# Name : pqPoolName
155156
# Datatype : String
156157
# Description : Only one serverpool name needs to be specified
157-
# if create server pool option is specified.
158-
# Comma-separated list of serverpool names if use
159-
# server pool. This is required to
158+
# if create server pool option is specified.
159+
# Comma-separated list of serverpool names if use
160+
# server pool. This is required to
160161
# create Parallel Query (PQ) database. Applicable to Big Cluster
161162
# Valid values : Parallel Query (PQ) pool name
162163
# Default value : None
@@ -244,7 +245,7 @@ nodelist=
244245
# Default value : None
245246
# Mandatory : Yes
246247
#-----------------------------------------------------------------------------
247-
templateName=/u01/app/oracle/product/12.2/db_1/assistants/dbca/templates/General_Purpose.dbc
248+
templateName=/u01/app/oracle/product/version/db_1/assistants/dbca/templates/General_Purpose.dbc
248249

249250
#-----------------------------------------------------------------------------
250251
# Name : sysPassword
@@ -264,7 +265,7 @@ sysPassword=oracle
264265
# Default value : None
265266
# Mandatory : Yes
266267
#-----------------------------------------------------------------------------
267-
systemPassword=oracle
268+
systemPassword=oracle
268269

269270
#-----------------------------------------------------------------------------
270271
# Name : serviceUserPassword
@@ -305,7 +306,7 @@ emExpressPort=5500
305306
# Default value : FALSE
306307
# Mandatory : No
307308
#-----------------------------------------------------------------------------
308-
runCVUChecks=false
309+
runCVUChecks=FALSE
309310

310311
#-----------------------------------------------------------------------------
311312
# Name : dbsnmpPassword
@@ -524,7 +525,7 @@ dirServiceUserName=
524525
# Name : dirServicePassword
525526
# Datatype : String
526527
# Description : The password of the directory service user.
527-
# You can also specify the password at the command prompt instead of here.
528+
# You can also specify the password at the command prompt instead of here.
528529
# Mandatory : YES, if the value of registerWithDirService is TRUE
529530
#-----------------------------------------------------------------------------
530531
dirServicePassword=
@@ -533,7 +534,7 @@ dirServicePassword=
533534
# Name : walletPassword
534535
# Datatype : String
535536
# Description : The password for wallet to created or modified.
536-
# You can also specify the password at the command prompt instead of here.
537+
# You can also specify the password at the command prompt instead of here.
537538
# Mandatory : YES, if the value of registerWithDirService is TRUE
538539
#-----------------------------------------------------------------------------
539540
walletPassword=
@@ -542,8 +543,8 @@ walletPassword=
542543
# Name : listeners
543544
# Datatype : String
544545
# Description : Specifies list of listeners to register the database with.
545-
# By default the database is configured for all the listeners specified in the
546-
# $ORACLE_HOME/network/admin/listener.ora
546+
# By default the database is configured for all the listeners specified in the
547+
# $ORACLE_HOME/network/admin/listener.ora
547548
# Valid values : The list should be comma separated like "listener1,listener2".
548549
# Mandatory : NO
549550
#-----------------------------------------------------------------------------
@@ -554,7 +555,7 @@ listeners=
554555
# Datatype : String
555556
# Description : Location of the file containing variable value pair
556557
# Valid values : A valid file-system file. The variable value pair format in this file
557-
# is <variable>=<value>. Each pair should be in a new line.
558+
# is <variable>=<value>. Each pair should be in a new line.
558559
# Default value : None
559560
# Mandatory : NO
560561
#-----------------------------------------------------------------------------
@@ -567,7 +568,7 @@ variablesFile=
567568
# Default value : None
568569
# Mandatory : NO
569570
#-----------------------------------------------------------------------------
570-
variables=DB_UNIQUE_NAME=orcl12c,ORACLE_BASE=/u01/app/oracle,PDB_NAME=,DB_NAME=orcl12c,ORACLE_HOME=/u01/app/oracle/product/12.2/db_1,SID=orcl12c
571+
variables=ORACLE_BASE_HOME=/u01/app/oracle/product/version/db_1,DB_UNIQUE_NAME=orclcdb,ORACLE_BASE=/u01/app/oracle,PDB_NAME=,DB_NAME=orclcdb,ORACLE_HOME=/u01/app/oracle/product/version/db_1,SID=orclcdb
571572

572573
#-----------------------------------------------------------------------------
573574
# Name : initParams
@@ -576,7 +577,7 @@ variables=DB_UNIQUE_NAME=orcl12c,ORACLE_BASE=/u01/app/oracle,PDB_NAME=,DB_NAME=o
576577
# Default value : None
577578
# Mandatory : NO
578579
#-----------------------------------------------------------------------------
579-
initParams=undo_tablespace=UNDOTBS1,processes=300,db_recovery_file_dest_size=5GB,nls_language=AMERICAN,pga_aggregate_target=200MB,sga_target=800MB,dispatchers=(PROTOCOL=TCP) (SERVICE=orcl12cXDB),db_recovery_file_dest={ORACLE_BASE}/fast_recovery_area/{DB_UNIQUE_NAME},db_block_size=8192BYTES,diagnostic_dest={ORACLE_BASE},audit_file_dest={ORACLE_BASE}/admin/{DB_UNIQUE_NAME}/adump,nls_territory=AMERICA,compatible=12.2.0,control_files=("{ORACLE_BASE}/oradata/{DB_UNIQUE_NAME}/control01.ctl", "{ORACLE_BASE}/fast_recovery_area/{DB_UNIQUE_NAME}/control02.ctl"),db_name=orcl12c,audit_trail=db,remote_login_passwordfile=EXCLUSIVE,open_cursors=300
580+
initParams=undo_tablespace=UNDOTBS1,sga_target=800MB,db_block_size=8192BYTES,nls_language=AMERICAN,dispatchers=(PROTOCOL=TCP) (SERVICE=orclcdbXDB),diagnostic_dest={ORACLE_BASE},control_files=("{ORACLE_BASE}/oradata/{DB_UNIQUE_NAME}/control01.ctl", "{ORACLE_BASE}/fast_recovery_area/{DB_UNIQUE_NAME}/control02.ctl"),remote_login_passwordfile=EXCLUSIVE,audit_file_dest={ORACLE_BASE}/admin/{DB_UNIQUE_NAME}/adump,processes=300,pga_aggregate_target=200MB,nls_territory=AMERICA,local_listener=LISTENER_ORCLCDB,db_recovery_file_dest_size=12918MB,open_cursors=300,compatible=18.0.0,db_name=orclcdb,db_recovery_file_dest={ORACLE_BASE}/fast_recovery_area/{DB_UNIQUE_NAME},audit_trail=db
580581

581582
#-----------------------------------------------------------------------------
582583
# Name : sampleSchema

‎upload/buildTimeFatReleaseCOPYFORFAT.sh

+18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
#!/bin/bash
2+
#
3+
# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
#################################################################################
19+
220
. /home/oracle/.bashrc
321
newpdbords
422
9090init

‎upload/buildTimeMoveUserFilesInTmp.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,27 @@ export BUILD_HAVEPATCH=TRUE" > /tmp/1/BUILD_CONFIG.sh
3030
export USHOME=/tmp/put_files_here
3131
export BUILDHOME=$USHOME
3232
export EURHOME=$USHOME
33-
export DATABASE1URL=$USHOME/linux*122*_database.zip
33+
export DATABASE1URL=$USHOME/LINUX.X64_*_db_home.zip
3434
export DEMOSURL=$BUILDHOME/demos.zip
3535
export JAVAURL=$EURHOME/jdk-8u*-linux-x64.tar.gz
3636
export SQLDEVURL=$BUILDHOME/sqldeveloper-*-no-jre.zip
37-
export SQLCLURL=$EURHOME/sqlcl-*-no-jre.zip
38-
export APEXURL=$EURHOME/apex_5*.zip
37+
export SQLCLURL=$EURHOME/sqlcl*.zip
38+
export APEXURL=$EURHOME/apex_*.zip
3939
export ORDSURL=$EURHOME/ords*.zip
4040
export MODELLER=$EURHOME/datamodeler-*-no-jre.zip
4141
export MOZILLABLOB=$EURHOME/mozillablob.zip
4242
export RESTCLIENTUI=$EURHOME/restclient*.jar
4343
export STORM=$USHOME/storm.zip
4444
export RESETXMLDBJSON=$USHOME/reset_xmldbjson
4545
export SAMPLESCHEMAS=$USHOME/master.zip
46+
export JDBCREST=$USHOME/oracle.dbtools.jdbcrest*.jar
47+
export WALLET=$USHOME/cwallet.sso
4648
function download() {
4749
#echo OUTPUT $2 SOURCE $1
4850
mv $1 "$2"
4951
if test "m$?" != "m0"
5052
then
51-
if test "m$1" = "mlinux*122*_database.zip"
53+
if test "m$1" = "mLINUX.X64_*_db_home.zip"
5254
then
5355
echo PROGRESS: XXXXXXXXXXXXXX mv for essential "$2" failed XXXXXXXXXXXX
5456
else
@@ -58,8 +60,8 @@ function download() {
5860
fi
5961
}
6062
export -f download
61-
62-
printf "$DATABASE1URL\n/tmp/1/linuxx64_122_database.zip\n$JAVAURL\n/tmp/1/jdk8x64.tar.gz\n$SQLDEVURL\n/tmp/1/sqldev.zip\n$SQLCLURL\n/tmp/1/sqlcl.zip\n$APEXURL\n/tmp/1/apex.zip\n$ORDSURL\n/tmp/1/ords.zip\n$DEMOSURL\n/tmp/1/demos.zip\n$MOZILLABLOB\n/tmp/1/mozillablob.zip\n$MODELLER\n/tmp/1/modeler.zip\n$RESTCLIENTUI\n/tmp/1/restclient.jar\n$STORM\n/tmp/1/storm.zip\n$RESETXMLDBJSON\n/tmp/1/reset_xmldbjson\n$SAMPLESCHEMAS\n/tmp/1/master.zip" | xargs -n2 -P3 bash -c 'download "$0" "$1"'
63+
#linuxx64_122_database.zip
64+
printf "$DATABASE1URL\n/tmp/1/LINUX.X64_180000_db_home.zip\n$JAVAURL\n/tmp/1/jdk8x64.tar.gz\n$SQLDEVURL\n/tmp/1/sqldev.zip\n$SQLCLURL\n/tmp/1/sqlcl.zip\n$APEXURL\n/tmp/1/apex.zip\n$ORDSURL\n/tmp/1/ords.zip\n$DEMOSURL\n/tmp/1/demos.zip\n$MOZILLABLOB\n/tmp/1/mozillablob.zip\n$MODELLER\n/tmp/1/modeler.zip\n$RESTCLIENTUI\n/tmp/1/restclient.jar\n$STORM\n/tmp/1/storm.zip\n$RESETXMLDBJSON\n/tmp/1/reset_xmldbjson\n$SAMPLESCHEMAS\n/tmp/1/master.zip\n$WALLET\n/tmp/1/cwallet.sso" | xargs -n2 -P3 bash -c 'download "$0" "$1"'
6365
if test "m$?" != "m0"
6466
then
6567
echo PROGRESS: XXXXXXXXXXXXXX parallel mv failed XXXXXXXXXXXXXX

‎upload/buildTimeResizeIcon.sh

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ doseveral() {
5858
fi
5959
done
6060
}
61+
#echo 'echo iconsizesetup skupped as no longer on desktop>> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
6162
echo '(gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::icon-scale "5.58333333333"&&gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::nautilus-icon-position "20,222" )>> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
6263
#echo '(echo gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::nautilus-icon-scale "5.58333333333"&&gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::icon-scale "5.58333333333"&&echo gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::nautilus-icon-position "20,222" )>> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
6364
doseveral x 50 7
@@ -69,6 +70,7 @@ export result=`echo "$result" | grep -e " connected [^(]" | sed -e "sX\([A-Z0-9a
6970
echo GREPRESULT="$result" >> ~oracle/setsize.log
7071
echo 'xrandr --output '"$result"' --mode 800x600 >> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
7172
doseveral x 50 7
73+
#echo 'echo size set skipped not on desktop >> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
7274
echo '(gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::icon-scale "5.58333333333"&&gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::nautilus-icon-position "20,222" )>> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
7375
doseveral x 50 7
7476

‎upload/buildTimeSetupRestClient.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ Terminal=false
4343
Icon[en_US]=gnome-panel-launcher
4444
Name[en_US]=Rest Client
4545
Exec=/home/oracle/bin/buildTimeSetupRestClient.sh
46-
Name=Rest Client'> ~/Desktop/'Rest Client.desktop'
47-
chmod 755 ~/Desktop/'Rest Client.desktop'
46+
Name=Rest Client'> /home/oracle/Desktop/'Rest Client.desktop'
47+
chmod 755 /home/oracle/Desktop/'Rest Client.desktop'
48+
export LD_LIBRARY_PATH=
49+
cd ~/Desktop
50+
dbus-launch gio set "Rest Client.desktop" "metadata::trusted" yes
4851
fi

‎upload/buildTimeSoftwareInstall.rsp

+10-131
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
#
2323
#################################################################################
2424

25-
2625
####################################################################
27-
## Copyright(c) Oracle Corporation 1998,2017. All rights reserved.##
26+
## Copyright(c) Oracle Corporation 1998,2018. All rights reserved.##
2827
## ##
2928
## Specify values for the variables listed below to customize ##
3029
## your installation. ##
@@ -43,32 +42,27 @@
4342
#-------------------------------------------------------------------------------
4443
# Do not change the following system generated value.
4544
#-------------------------------------------------------------------------------
46-
oracle.install.responseFileVersion=/oracle/install/rspfmt_dbinstall_response_schema_v12.2.0
45+
oracle.install.responseFileVersion=/oracle/install/rspfmt_dbinstall_response_schema_v18.0.0
4746

4847
#-------------------------------------------------------------------------------
4948
# Specify the installation option.
5049
# It can be one of the following:
5150
# - INSTALL_DB_SWONLY
5251
# - INSTALL_DB_AND_CONFIG
53-
# - UPGRADE_DB
5452
#-------------------------------------------------------------------------------
5553
oracle.install.option=INSTALL_DB_SWONLY
5654

5755
#-------------------------------------------------------------------------------
5856
# Specify the Unix group to be set for the inventory directory.
5957
#-------------------------------------------------------------------------------
60-
UNIX_GROUP_NAME=dba
58+
UNIX_GROUP_NAME=oinstall
6159

6260
#-------------------------------------------------------------------------------
6361
# Specify the location which holds the inventory files.
6462
# This is an optional parameter if installing on
6563
# Windows based Operating System.
6664
#-------------------------------------------------------------------------------
67-
INVENTORY_LOCATION=/u01/installervb
68-
#-------------------------------------------------------------------------------
69-
# Specify the complete path of the Oracle Home.
70-
#-------------------------------------------------------------------------------
71-
ORACLE_HOME=/u01/app/oracle/product/12.2/db_1
65+
INVENTORY_LOCATION=/u01/app/oraInventory
7266

7367
#-------------------------------------------------------------------------------
7468
# Specify the complete path of the Oracle Base.
@@ -137,59 +131,16 @@ oracle.install.db.OSRACDBA_GROUP=dba
137131
# Grid Options #
138132
# #
139133
###############################################################################
140-
#------------------------------------------------------------------------------
141-
# Specify the type of Real Application Cluster Database
142-
#
143-
# - ADMIN_MANAGED: Admin-Managed
144-
# - POLICY_MANAGED: Policy-Managed
145-
#
146-
# If left unspecified, default will be ADMIN_MANAGED
147-
#------------------------------------------------------------------------------
148-
oracle.install.db.rac.configurationType=
149134

150135
#------------------------------------------------------------------------------
151-
# Value is required only if RAC database type is ADMIN_MANAGED
136+
# Value is required only if the specified install option is INSTALL_DB_SWONLY
152137
#
153138
# Specify the cluster node names selected during the installation.
154-
# Leaving it blank will result in install on local server only (Single Instance)
155139
#
156140
# Example : oracle.install.db.CLUSTER_NODES=node1,node2
157141
#------------------------------------------------------------------------------
158142
oracle.install.db.CLUSTER_NODES=
159143

160-
#------------------------------------------------------------------------------
161-
# This variable is used to enable or disable RAC One Node install.
162-
#
163-
# - true : Value of RAC One Node service name is used.
164-
# - false : Value of RAC One Node service name is not used.
165-
#
166-
# If left blank, it will be assumed to be false.
167-
#------------------------------------------------------------------------------
168-
oracle.install.db.isRACOneInstall=false
169-
170-
#------------------------------------------------------------------------------
171-
# Value is required only if oracle.install.db.isRACOneInstall is true.
172-
#
173-
# Specify the name for RAC One Node Service
174-
#------------------------------------------------------------------------------
175-
oracle.install.db.racOneServiceName=
176-
177-
#------------------------------------------------------------------------------
178-
# Value is required only if RAC database type is POLICY_MANAGED
179-
#
180-
# Specify a name for the new Server pool that will be configured
181-
# Example : oracle.install.db.rac.serverpoolName=pool1
182-
#------------------------------------------------------------------------------
183-
oracle.install.db.rac.serverpoolName=
184-
185-
#------------------------------------------------------------------------------
186-
# Value is required only if RAC database type is POLICY_MANAGED
187-
#
188-
# Specify a number as cardinality for the new Server pool that will be configured
189-
# Example : oracle.install.db.rac.serverpoolCardinality=2
190-
#------------------------------------------------------------------------------
191-
oracle.install.db.rac.serverpoolCardinality=0
192-
193144
###############################################################################
194145
# #
195146
# Database Configuration Options #
@@ -268,13 +219,13 @@ oracle.install.db.config.starterdb.installExampleSchemas=false
268219

269220
###############################################################################
270221
# #
271-
# Passwords can be supplied for the following four schemas in the #
272-
# starter database: #
222+
# Passwords can be supplied for the following four schemas in the #
223+
# starter database: #
273224
# SYS #
274225
# SYSTEM #
275226
# DBSNMP (used by Enterprise Manager) #
276227
# #
277-
# Same password can be used for all accounts (not recommended) #
228+
# Same password can be used for all accounts (not recommended) #
278229
# or different passwords for each account can be provided (recommended) #
279230
# #
280231
###############################################################################
@@ -340,8 +291,8 @@ oracle.install.db.config.starterdb.emAdminPassword=
340291

341292
###############################################################################
342293
# #
343-
# SPECIFY RECOVERY OPTIONS #
344-
# ------------------------------------ #
294+
# SPECIFY RECOVERY OPTIONS #
295+
# ------------------------------------ #
345296
# Recovery options for the database can be mentioned using the entries below #
346297
# #
347298
###############################################################################
@@ -388,75 +339,3 @@ oracle.install.db.config.asm.diskGroup=
388339
# Applicable only when oracle.install.db.config.starterdb.storage=ASM_STORAGE
389340
#-------------------------------------------------------------------------------
390341
oracle.install.db.config.asm.ASMSNMPPassword=
391-
392-
#------------------------------------------------------------------------------
393-
# Specify the My Oracle Support Account Username.
394-
#
395-
# Example : MYORACLESUPPORT_USERNAME=abc@oracle.com
396-
#------------------------------------------------------------------------------
397-
MYORACLESUPPORT_USERNAME=
398-
399-
#------------------------------------------------------------------------------
400-
# Specify the My Oracle Support Account Username password.
401-
#
402-
# Example : MYORACLESUPPORT_PASSWORD=password
403-
#------------------------------------------------------------------------------
404-
MYORACLESUPPORT_PASSWORD=
405-
406-
#------------------------------------------------------------------------------
407-
# Specify whether to enable the user to set the password for
408-
# My Oracle Support credentials. The value can be either true or false.
409-
# If left blank it will be assumed to be false.
410-
#
411-
# Example : SECURITY_UPDATES_VIA_MYORACLESUPPORT=true
412-
#------------------------------------------------------------------------------
413-
SECURITY_UPDATES_VIA_MYORACLESUPPORT=false
414-
415-
#------------------------------------------------------------------------------
416-
# Specify whether user doesn't want to configure Security Updates.
417-
# The value for this variable should be true if you don't want to configure
418-
# Security Updates, false otherwise.
419-
#
420-
# The value can be either true or false. If left blank it will be assumed
421-
# to be true.
422-
#
423-
# Example : DECLINE_SECURITY_UPDATES=false
424-
#------------------------------------------------------------------------------
425-
DECLINE_SECURITY_UPDATES=true
426-
427-
#------------------------------------------------------------------------------
428-
# Specify the Proxy server name. Length should be greater than zero.
429-
#
430-
# Example : PROXY_HOST=proxy.domain.com
431-
#------------------------------------------------------------------------------
432-
PROXY_HOST=
433-
434-
#------------------------------------------------------------------------------
435-
# Specify the proxy port number. Should be Numeric and at least 2 chars.
436-
#
437-
# Example : PROXY_PORT=25
438-
#------------------------------------------------------------------------------
439-
PROXY_PORT=
440-
441-
#------------------------------------------------------------------------------
442-
# Specify the proxy user name. Leave PROXY_USER and PROXY_PWD
443-
# blank if your proxy server requires no authentication.
444-
#
445-
# Example : PROXY_USER=username
446-
#------------------------------------------------------------------------------
447-
PROXY_USER=
448-
449-
#------------------------------------------------------------------------------
450-
# Specify the proxy password. Leave PROXY_USER and PROXY_PWD
451-
# blank if your proxy server requires no authentication.
452-
#
453-
# Example : PROXY_PWD=password
454-
#------------------------------------------------------------------------------
455-
PROXY_PWD=
456-
457-
#------------------------------------------------------------------------------
458-
# Specify the Oracle Support Hub URL.
459-
#
460-
# Example : COLLECTOR_SUPPORTHUB_URL=https://orasupporthub.company.com:8080/
461-
#------------------------------------------------------------------------------
462-
COLLECTOR_SUPPORTHUB_URL=

‎upload/createnewpdb

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#set -x
2929
# VM SPECIFIC/ testing only/ not for production use
30-
export BASESEED=/u01/app/oracle/oradata/orcl12c
30+
export BASESEED=/u01/app/oracle/oradata/ORCLCDB
3131
export DEFAULTNEWPDBNAME=ORDS
3232
export CONNECT=/
3333
export TNSNAMESFILE=$ORACLE_HOME/network/admin/tnsnames.ora

‎upload/createnewpdbminhr

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#set -x
2929

3030
# VM SPECIFIC/ testing only/ not for production use
31-
export BASESEED=/u01/app/oracle/oradata/orcl12c
31+
export BASESEED=/u01/app/oracle/oradata/ORCLCDB
3232
export DEFAULTNEWPDBNAME=ORDS
3333
export CONNECT=/
3434
export TNSNAMESFILE=$ORACLE_HOME/network/admin/tnsnames.ora

‎upload/custom_postSetupDemos.sh

+25
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,27 @@
11
#!/bin/bash
2+
#
3+
# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
#################################################################################
19+
20+
if test -f /tmp/1/loadCoffeeShopApplication.sh
21+
then
222
su oracle -c "bash -x /tmp/1/loadCoffeeShopApplication.sh"
23+
fi
24+
if test -f /tmp/1/buildTimeFatRelease.sh
25+
then
26+
su - oracle -c "bash -x /tmp/1/buildTimeFatRelease.sh"
27+
fi

‎upload/loadCoffeeShopApplication.sh

+61-12
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,78 @@
11
#!/bin/bash
2+
#
3+
# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
#################################################################################
19+
220
echo 'export PATH=/home/oracle/Desktop/Database_Track/coffeeshop:$PATH'>> /home/oracle/.bashrc
321
. /home/oracle/.bashrc
422
. /tmp/1/BUILD_CONFIG.sh
523
export http_proxy=$BUILD_WEB_PROXY
624
export https_proxy=$BUILD_WEB_PROXY
725
if test -f /tmp/1/coffeeshopApp.zip
826
then
9-
mv /tmp/1/coffeeshopApp.zip /home/oracle
10-
#Put unzip at the top - wait at end of newpdbords will wait for both import and unzip
11-
mv /home/oracle/bin/newpdbords /home/oracle/bin/newpdbords.x
12-
#put on top - unzip
13-
(echo '#!/bin/bash
14-
if test -d /home/oracle/Desktop/Database_Track/coffeeshop
27+
echo "mkdir -p /u01/userhome/oracle/sqldeveloper/ords/ords_config/ords/standalone/doc_root
28+
if ! test -L /u01/userhome/oracle/sqldeveloper/ords/ords_config/ords/standalone/doc_root/coffeeshop-map
1529
then
16-
echo coffeeshopApp already unzipped
17-
else
30+
ln -s /home/oracle/Desktop/Database_Track/coffeeshop/coffeeshop-target-web /u01/userhome/oracle/sqldeveloper/ords/ords_config/ords/standalone/doc_root/coffeeshop-map
31+
fi
32+
if ! test -L /u01/userhome/oracle/sqldeveloper/ords/ords_config/ords/standalone/doc_root/coffeeshop-start
33+
then
34+
ln -s /home/oracle/Desktop/Database_Track/coffeeshop/coffeeshop-start-web /u01/userhome/oracle/sqldeveloper/ords/ords_config/ords/standalone/doc_root/coffeeshop-start
35+
fi
36+
mkdir -p /u01/userhome/oracle/sqldeveloper/ords/hol-config/ords/standalone/doc_root
37+
if ! test -L /u01/userhome/oracle/sqldeveloper/ords/hol-config/ords/standalone/doc_root/coffeeshop-map
38+
then
39+
ln -s /home/oracle/Desktop/Database_Track/coffeeshop/coffeeshop-target-web /u01/userhome/oracle/sqldeveloper/ords/hol-config/ords/standalone/doc_root/coffeeshop-map
40+
fi
41+
if ! test -L /u01/userhome/oracle/sqldeveloper/ords/hol-config/ords/standalone/doc_root/coffeeshop-start
42+
then
43+
ln -s /home/oracle/Desktop/Database_Track/coffeeshop/coffeeshop-start-web /u01/userhome/oracle/sqldeveloper/ords/hol-config/ords/standalone/doc_root/coffeeshop-start
44+
fi
45+
" > /home/oracle/bin/coffeeshop_install
46+
echo '#!/bin/bash
47+
rm -rf /home/oracle/Desktop/Database_Track/coffeeshop
1848
(mkdir /home/oracle/Desktop/Database_Track/coffeeshop
19-
mv ~/coffeeshopApp.zip /home/oracle/Desktop/Database_Track/coffeeshop
49+
cp ~/coffeeshopApp.zip /home/oracle/Desktop/Database_Track/coffeeshop
2050
cd /home/oracle/Desktop/Database_Track/coffeeshop
2151
echo unzipping coffeeshopApp
2252
unzip coffeeshopApp.zip > coffeeshopApp.zip.log$$ 2>&1
53+
rm coffeeshopApp.zip
2354
mv Workshop_Source_Only/* Workshop_Source_Only/.DS_Store .
24-
chmod 755 install.sh) &
25-
echo if unzip successful /home/oracle/Desktop/Database_Track/coffeeshop/coffeeshopApp.zip can be removed
26-
fi' ; cat /home/oracle/bin/newpdbords.x) > /home/oracle/bin/newpdbords
55+
chmod 755 install.sh
56+
#have a way to do install later $1 = nothing - do install.sh noinstall = dont run install.sh
57+
if test "m$1" = m
58+
then
59+
#drop existing user if it exists
60+
echo "--do not want any coffeeshop user sessions
61+
alter pluggable database ords close immediate;
62+
alter pluggable database ords open;
63+
drop user COFFEESHOP cascade;
64+
exit"|sqlplus SYS/oracle@ORDS as sysdba > ./dropusersqlplusout$$ 2>&1
65+
#bring it back to initial ie _schema loaded if coffeeshop zip in buid state
66+
./install.sh > install.sh$$ 2>&1
67+
fi)
68+
' > /home/oracle/bin/coffeeshop_uninstall_install
69+
mv /tmp/1/coffeeshopApp.zip /home/oracle
70+
#Put unzip at the top - wait at end of newpdbords will wait for both import and unzip
71+
mv /home/oracle/bin/newpdbords /home/oracle/bin/newpdbords.x
72+
#put on top - unzip
73+
(echo '#!/bin/bash
74+
(bash /home/oracle/bin/coffeeshop_uninstall_install noinstall 2>&1) &
75+
' ; cat /home/oracle/bin/newpdbords.x) > /home/oracle/bin/newpdbords
2776
rm /home/oracle/bin/newpdbords.x
2877
#put on bottom wait for unzip
2978
echo 'wait

‎upload/runTimeEnforceMinScreenSize.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ doseveral() {
5858
fi
5959
done
6060
}
61-
echo 'echo gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::nautilus-icon-position "469,10" >> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
61+
echo 'echo skipped >> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
62+
#echo 'echo gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::nautilus-icon-position "469,10" >> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
6263
doseveral x 50 7
6364
echo xrandr > ~/repeat.setsize
6465
doseveral x 500 7
@@ -67,7 +68,8 @@ export result=`echo "$result" | grep -e " connected [^(]" | sed -e "sX\([A-Z0-9a
6768
echo GREPRESULT="$result" >> ~oracle/setsize.log
6869
echo 'xrandr --output '"$result"' --mode 800x600 >> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
6970
doseveral x 50 7
70-
echo 'echo gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::nautilus-icon-position "469,10" >> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
71+
echo 'echo skipped >> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
72+
#echo 'echo gvfs-set-attribute ~/Desktop/"Click here to Start.desktop" metadata::nautilus-icon-position "469,10" >> ~oracle/setsize.log 2>&1' > ~/repeat.setsize
7173
doseveral x 50 7
7274

7375
if test -f ~/runTimeEnforceMinScreenSize.sh.redoicon
@@ -84,8 +86,15 @@ echo '#!/bin/bash
8486
if test -f ~/Desktop/readme.txt
8587
then
8688
cat ~/Desktop/readme.txt
89+
if test -f ~/ords/ords.war
90+
then
91+
if test -f ~/sqlcl/lib/jdbcrest.jar
92+
then
93+
echo 'try JDBC REST driver: sql HRREST/oracle@http://localhost:8080/ords/hrrest/'
94+
fi
95+
fi
8796
else
88-
echo No default readme.txt - minium install is Oracle linux 7.3 and Oracle Database 12.2
97+
echo No default readme.txt - minium install is Oracle linux 7.3 and Oracle Database 18.3
8998
fi
9099
91100
cd ~

‎upload/runTimeOracleOnReboot.sh

+14-7
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030

3131
#
3232
export ORACLE_BASE=/u01/app/oracle
33-
export ORACLE_HOME=$ORACLE_BASE/product/12.2/db_1
33+
export ORACLE_HOME=$ORACLE_BASE/product/version/db_1
3434
export ORACLE_HOME_LISTENER=$ORACLE_HOME
3535
export LD_LIBRARY_PATH=$ORACLE_HOME/lib
3636
#export JAVA_HOME=$ORACLE_HOME/jdk
3737
export PATH=$PATH:$ORACLE_HOME/bin:$JAVA_HOME/bin
38-
export ORACLE_SID=orcl12c
38+
export ORACLE_SID=orclcdb
3939
#export ORACLE_TRACE=Y
4040

4141
export PATH=$JAVA_HOME/bin:$ORACLE_HOME/bin:$PATH
@@ -58,27 +58,34 @@ case "$1" in
5858
if test -f /home/oracle/bin/ords.sh
5959
then
6060
su oracle -c "/home/oracle/bin/ords.sh start /home/oracle/ords/ords.war"
61+
nohup su - oracle -c "/home/oracle/bin/9090start >> /tmp/9090startlog 2>&1" &
6162
fi
6263
;;
6364
stop)
64-
su oracle -c "$ORACLE_HOME/bin/dbshut $ORACLE_HOME"
65-
su oracle -c "$ORACLE_HOME/bin/lsnrctl stop"
6665
if test -f /home/oracle/bin/ords.sh
6766
then
6867
su oracle -c "/home/oracle/bin/ords.sh stop /home/oracle/ords/ords.war"
68+
nohup su - oracle -c "/home/oracle/bin/9090stop >> /tmp/9090stoplog 2>&1" &
6969
fi
70+
su oracle -c "$ORACLE_HOME/bin/dbshut $ORACLE_HOME"
71+
su oracle -c "$ORACLE_HOME/bin/lsnrctl stop"
7072
;;
7173
restart|reload)
74+
if test -f /home/oracle/bin/ords.sh
75+
then
76+
su oracle -c "/home/oracle/bin/ords.sh stop /home/oracle/ords/ords.war"
77+
nohup su - oracle -c "/home/oracle/bin/9090stop >> /tmp/9090stoplog 2>&1" &
78+
fi
7279
su oracle -c "$ORACLE_HOME/bin/dbshut $ORACLE_HOME"
7380
su oracle -c "$ORACLE_HOME/bin/lsnrctl stop"
74-
su oracle -c "/home/oracle/bin/ords.sh stop /home/oracle/ords/ords.war"
75-
su oracle -c "$ORACLE_HOME/bin/lsnrctl start"
81+
su oracle -c "$ORACLE_HOME/bin/lsnrctl start"
7682
su oracle -c "$ORACLE_HOME/bin/dbstart $ORACLE_HOME"
7783
su oracle -c "echo alter pluggable database all open';'|$ORACLE_HOME/bin/sqlplus / as sysdba"
7884
if test -f /home/oracle/bin/ords.sh
7985
then
8086
su oracle -c "/home/oracle/bin/ords.sh start /home/oracle/ords/ords.war"
81-
fi
87+
nohup su - oracle -c "/home/oracle/bin/9090start >> /tmp/9090startlog 2>&1" &
88+
fi
8289
;;
8390
status)
8491
$ORACLE_HOME/bin/lsnrctl status

‎upload/runTimeParametersForORDS.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ schema.tablespace.default=SYSAUX
3232
schema.tablespace.temp=TEMP
3333
standalone.http.port=8080
3434
standalone.mode=true
35-
standalone.static.images=/home/oracle/apex/images
35+
standalone.static.images=/u01/userhome/oracle/apex/images
3636
user.apex.listener.password=oracle
3737
user.apex.restpublic.password=oracle
3838
user.public.password=oracle

‎upload/uploaddemos

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#set -x
2929
# VM SPECIFIC/ testing only/ not for production use
3030
export TWO_TASK=
31-
export BASESEED=/u01/app/oracle/oradata/orcl12c
31+
export BASESEED=/u01/app/oracle/oradata/ORCLCDB
3232
export DEFAULTNEWPDBNAME=ORCL
3333
export CONNECT=/
3434
export TNSNAMESFILE=$ORACLE_HOME/network/admin/tnsnames.ora

0 commit comments

Comments
 (0)
Please sign in to comment.