Skip to content

Commit c3357c4

Browse files
hazzikhazzik
committed
Put Oracle Managed libraries to a separate folder & update to 12.1.0.2.1
1 parent 8986710 commit c3357c4

24 files changed

+17006
-245
lines changed

‎lib/teamcity/oracle-managed/NHibernate.Test.last-results.xml

Lines changed: 16692 additions & 0 deletions
Large diffs are not rendered by default.

‎lib/teamcity/oracle/managed/common/Oracle.ManagedDataAccess.Catalog.xml renamed to ‎lib/teamcity/oracle-managed/common/Oracle.ManagedDataAccess.Catalog.xml

File renamed without changes.

‎lib/teamcity/oracle/managed/common/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd renamed to ‎lib/teamcity/oracle-managed/common/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd

File renamed without changes.

‎lib/teamcity/oracle-managed/common/Oracle.ManagedDataAccess.dll

3.75 MB
Binary file not shown.

‎lib/teamcity/oracle-managed/x64/OraProvCfg.exe

79.5 KB
Binary file not shown.

‎lib/teamcity/oracle-managed/x64/Oracle.ManagedDataAccessDTC.dll

68.5 KB
Binary file not shown.

‎lib/teamcity/oracle-managed/x64/Oracle.ManagedDataAccessIOP.dll

236 KB
Binary file not shown.

‎lib/teamcity/oracle-managed/x64/configure.bat

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
@ECHO OFF
2+
REM
3+
REM configure.bat
4+
REM
5+
REM This .bat file configures ODP.NET, Managed Driver
6+
REM
7+
8+
if /i {%1} == {-h} goto :Usage
9+
if /i {%1} == {-help} goto :Usage
10+
11+
REM configure machine wide or not - default is true
12+
set MACHINE_WIDE_CONFIGURATION=true
13+
if /i {%1} == {false} set MACHINE_WIDE_CONFIGURATION=false
14+
15+
if {%MACHINE_WIDE_CONFIGURATION%} == {true} (
16+
17+
REM Configure machine.config for ODP.NET, Managed Driver's configuration file section handler and client factory
18+
echo.
19+
echo OraProvCfg /action:config /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll" /set:settings\TNS_ADMIN:"%~dp0..\..\..\network\admin"
20+
OraProvCfg /action:config /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll" /set:settings\TNS_ADMIN:"%~dp0..\..\..\network\admin"
21+
22+
REM Place the ODP.NET, Managed Driver assemblies into the GAC
23+
echo.
24+
echo OraProvCfg /action:gac /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
25+
OraProvCfg /action:gac /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
26+
27+
REM Place the ODP.NET, Managed Policy assembly into the GAC
28+
echo.
29+
echo OraProvCfg /action:gac /providerpath:"%~dp0..\PublisherPolicy\4\Policy.4.121.Oracle.ManagedDataAccess.dll"
30+
OraProvCfg /action:gac /providerpath:"%~dp0..\PublisherPolicy\4\Policy.4.121.Oracle.ManagedDataAccess.dll"
31+
32+
) else (
33+
34+
REM For local installs, unconfig odpm
35+
REM Unconfigure machine.config for ODP.NET, Managed Driver's configuration file section handler and client factory
36+
echo.
37+
echo OraProvCfg /action:unconfig /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
38+
OraProvCfg /action:unconfig /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
39+
40+
REM Remove the ODP.NET, Managed Driver assemblies from the GAC
41+
echo.
42+
echo OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccess, Version=4.121.2.0"
43+
OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccess, Version=4.121.2.0"
44+
45+
REM Remove the ODP.NET, Managed Policy assembly from the GAC
46+
echo.
47+
echo OraProvCfg /action:ungac /providerpath:"Policy.4.121.Oracle.ManagedDataAccess, Version=4.121.2.0"
48+
OraProvCfg /action:ungac /providerpath:"Policy.4.121.Oracle.ManagedDataAccess, Version=4.121.2.0"
49+
50+
REM Remove the ODP.NET, Managed DTC assembly from the GAC
51+
echo.
52+
echo OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccessDTC, Version=4.121.2.0"
53+
OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccessDTC, Version=4.121.2.0"
54+
)
55+
56+
57+
REM Add a registry entry for enabling event logs
58+
echo.
59+
echo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\EventLog\Application\Oracle Data Provider for .NET, Managed Driver" /v EventMessageFile /t REG_EXPAND_SZ /d %SystemRoot%\Microsoft.NET\Framework64\v4.0.30319\EventLogMessages.dll /f
60+
reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\EventLog\Application\Oracle Data Provider for .NET, Managed Driver" /v EventMessageFile /t REG_EXPAND_SZ /d %SystemRoot%\Microsoft.NET\Framework64\v4.0.30319\EventLogMessages.dll /f
61+
62+
REM Delete the old registry entry to add managed assembly in the Add Reference Dialog box in VS.NET
63+
echo.
64+
echo reg query HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\odp.net.managed\
65+
reg query HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\odp.net.managed\ 1>NUL 2>NUL
66+
if %ERRORLEVEL% EQU 0 (
67+
echo reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\odp.net.managed" /f
68+
reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\odp.net.managed" /f 1>NUL 2>NUL
69+
)
70+
71+
REM Create a registry entry to add managed assembly in the Add Reference Dialog box in VS.NET
72+
echo.
73+
echo reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\Oracle.ManagedDataAccess" /ve /t REG_SZ /d %~dp0..\common /f
74+
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\Oracle.ManagedDataAccess" /ve /t REG_SZ /d %~dp0..\common /f
75+
echo.
76+
echo reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\Oracle.ManagedDataAccess.EntityFramework6" /ve /t REG_SZ /d %~dp0..\common\EF6 /f
77+
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\Oracle.ManagedDataAccess.EntityFramework6" /ve /t REG_SZ /d %~dp0..\common\EF6 /f
78+
79+
goto :EOF
80+
81+
:Usage
82+
echo.
83+
echo Usage:
84+
echo configure.bat [machine_wide_configuration]
85+
echo.
86+
echo Example:
87+
echo configure.bat (configure ODP.NET, Managed Driver at a machine wide level)
88+
echo configure.bat false (do not configure ODP.NET, Managed Driver at a machine wide level)
89+
echo.
90+
echo NOTE: By default, machine_wide_configuration=true.
91+
goto :EOF

‎lib/teamcity/oracle-managed/x64/unconfigure.bat

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
@ECHO OFF
2+
REM
3+
REM unconfigure.bat
4+
REM
5+
REM This .bat file unconfigures ODP.NET, Managed Driver
6+
REM
7+
8+
if /i {%1} == {-h} goto :Usage
9+
if /i {%1} == {-help} goto :Usage
10+
11+
REM unconfigure machine wide or not - default is true
12+
set MACHINE_WIDE_UNCONFIGURATION=true
13+
if /i {%1} == {false} set MACHINE_WIDE_UNCONFIGURATION=false
14+
15+
if {%MACHINE_WIDE_UNCONFIGURATION%} == {true} (
16+
17+
REM Unconfigure machine.config for ODP.NET, Managed Driver's configuration file section handler and client factory
18+
echo.
19+
echo OraProvCfg /action:unconfig /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
20+
OraProvCfg /action:unconfig /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
21+
22+
REM Remove the ODP.NET, Managed Driver assemblies from the GAC
23+
echo.
24+
echo OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccess, Version=4.121.2.0"
25+
OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccess, Version=4.121.2.0"
26+
27+
REM Remove the ODP.NET, Managed Policy assembly from the GAC
28+
echo.
29+
echo OraProvCfg /action:ungac /providerpath:"Policy.4.121.Oracle.ManagedDataAccess, Version=4.121.2.0"
30+
OraProvCfg /action:ungac /providerpath:"Policy.4.121.Oracle.ManagedDataAccess, Version=4.121.2.0"
31+
)
32+
33+
REM Remove the registry entry for enabling event logs
34+
echo.
35+
echo reg delete "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\eventlog\Application\Oracle Data Provider for .NET, Managed Driver" /f
36+
reg delete "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\eventlog\Application\Oracle Data Provider for .NET, Managed Driver" /f
37+
38+
39+
REM Delete the registry entry to remove managed assembly in the Add Reference Dialog box in VS.NET
40+
echo.
41+
echo reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\Oracle.ManagedDataAccess" /f
42+
reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\Oracle.ManagedDataAccess" /f
43+
echo.
44+
echo reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\Oracle.ManagedDataAccess.EntityFramework6" /f
45+
reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\Oracle.ManagedDataAccess.EntityFramework6" /f
46+
47+
goto :EOF
48+
49+
:Usage
50+
echo.
51+
echo Usage:
52+
echo unconfigure.bat [machine_wide_unconfiguration]
53+
echo.
54+
echo Example:
55+
echo unconfigure.bat (unconfigure ODP.NET, Managed Driver which was configured at a machine wide level)
56+
echo unconfigure.bat false (unconfigure ODP.NET, Managed Driver which was not configured at a machine wide level)
57+
echo.
58+
echo NOTE: By default, machine_wide_unconfiguration=true.
59+
goto :EOF

‎lib/teamcity/oracle-managed/x86/OraProvCfg.exe

80 KB
Binary file not shown.

0 commit comments

Comments
 (0)