Search code, repositories, users, issues, pull requests...

Copy link

Member

@jshum2479 jshum2479 commented Aug 31, 2022

This PR ccovers

Remove he use of getDatabaseDefaults when creating JRF domain
Deprecate the user of several atp.* and ssl.* fields in RCUDbInfo
Added documentation how to support multi data source, AGL in sparse model
Refactoring

jshum2479 added 27 commits

June 27, 2022 18:10


 wdt-636 Remove the use of getDatabaseDefaults during JRF domain creat...

c07bf69

...ion, unify the logic for atp, ssl and regular oracle db for rcu datasources connection parameters setup.


 minor refactoring

10d333b


 no more need to update password from getDatabaseDefaults - operator m...

27d9863

...ii use case since we are populated the password from the model or cli


 temporary

bc2d476


 testing for MDS

15a5fd0


 ATP refactor 1

09c1278


 ATP refactoring 2

2ed5464


 add AGL

eccf748


 refactoring

70bbd14


 Move RCUDbInfo to under resources section and rename as RCUConfiguration

f7a728d


 refactor to use RCUConfiguraion

cc1f9c7


 Fix wlst path issue

e777b16


 refactoring

6cf2d07


 correct NPE in rcudbinfo_helper

7f57a71


 refactor

575bd2f

bug

31a4563


 cleanup

4b69dcf


 remove RCUConfiguration

874c54b


 fix keystores password encrypted property for datasource

3acd76f


 fix atp wallet extraction

a6faf02


 Remove new sections, user can use sparse model in regular resources/J...

0b62b8a

...DBCSystemResource section for more flexibility and robustness


 Merge branch 'main' into wdt-636-mds

a5b7d30


 doc update

71bfa54


 doc update

7e3c5ba


 doc change

f396102


 cleanup

0bebcf2

@oracle-contributor-agreement


 doc update

5bf9506

@jshum2479 jshum2479 added the work in progress label

Aug 31, 2022

@jshum2479 jshum2479 requested review from robertpatrick and rosemarymarano

August 31, 2022 15:48

@jshum2479 jshum2479 requested review from CarolynRountree, ddsharpe and rakillen

August 31, 2022 15:48

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Required label

Aug 31, 2022

Copy link

oracle-contributor-agreement bot commented Aug 31, 2022

Thank you for your pull request and welcome to our community! To contribute, please sign the Oracle Contributor Agreement (OCA).
The following contributors of this PR have not signed the OCA:

ganeshs@cagbu-phx-491.snphxprshared1.gbucdsint02phx.oraclevcn.com (@ganesh.subramanya@oracle.com)

To sign the OCA, please create an Oracle account and sign the OCA in Oracle's Contributor Agreement Application.

When singing the OCA, please provide your GitHub username. After signing the OCA and getting an OCA approval from Oracle, this PR will be automatically updated.

rosemarymarano

rosemarymarano reviewed

Sep 6, 2022

Copy link

Contributor

@rosemarymarano rosemarymarano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Edits

documentation/2.0/content/rcuinfo.md Outdated

During creating or updating a domain, there is new section `RCUDbInfo` in the model, under the `domainInfo` section, for specifying RCU database connection information without using the command-line arguments `-rcu_db` and `-rcu_prefix`. Use this to support a database where the connection string is more complex and requires extra options.

When creating a JRF domain, you can provide all the RCU connection information in a section `RCUDbInfo` under the `domainInfo` section in the model.

It provides you with more flexibility over the basic command line arguments of

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

command line -> command-line

documentation/2.0/content/rcuinfo.md Outdated

By default, the JRF domain template data source only has the default information such as URL and schema with the default prefix `DEV`. During domain creation,

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only has -> has only

documentation/2.0/content/rcuinfo.md Outdated

By default, the JRF domain template data source only has the default information such as URL and schema with the default prefix `DEV`. During domain creation,

WDT will use the information you provided in the command line or in the `RCUDbinfo` section to override the default values from the template so that it can connect to the database you specified.

For some advanced use case, such as using Oracle Active Grid Link data source or Multi data sources, you can provide a sparse model of the above data sources in a separate model file

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

advanced use case -> advanced use cases
using Oracle -> using an Oracle
Active Grid Link -> Active GridLink data source
Multi data sources -> Multi Data Sources
of the above data sources -> of the data sources

documentation/2.0/content/rcuinfo.md Outdated

WDT will use the information you provided in the command line or in the `RCUDbinfo` section to override the default values from the template so that it can connect to the database you specified.

For some advanced use case, such as using Oracle Active Grid Link data source or Multi data sources, you can provide a sparse model of the above data sources in a separate model file

during domain creation. See [Advance use cases](#advanced-jrf-database-use-cases)

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Period at the end of the sentence.

documentation/2.0/content/rcuinfo.md Outdated

### Access a database using a wallet

When accessing a database using a wallet, you need to obtain the wallet from your DBA and information about the database:

When accessing a database such as ATP or SSL using a wallet, you need to obtain the wallet from your DBA and information about the database:

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

database such as ATP or SSL -> database, such as ATP or SSL, (two commas needed)

documentation/2.0/content/rcuinfo.md Outdated

#### Multi Data Sources

If your database does not support high availability natively such as RAC or AGL, then WebLogic provides a Multi Data Source option, which basically the main data source is a logical data source that

contains multiple physical data sources. In order to create a spare model, you can for each data source

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can for each data source -> for each data source, you can:

documentation/2.0/content/rcuinfo.md Outdated

contains multiple physical data sources. In order to create a spare model, you can for each data source

1. Update the templated data source `URL`, `EncryptedPassword`, and 'user' property value. In the `URL` part, you can specify one of the accessible physical database URL.

2. Duplicate each datasource two times

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Period at the end of the sentence

documentation/2.0/content/rcuinfo.md Outdated

1. Update the templated data source `URL`, `EncryptedPassword`, and 'user' property value. In the `URL` part, you can specify one of the accessible physical database URL.

2. Duplicate each datasource two times

3. Change the duplicated data source name, `JNDIName` by appending `-1`, `-2` etc. The `-1`, `-2` data sources are the physical data source, you will need to update their `URL` too.

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etc -> , and such.
data source, you will -> data sources; (semi-colon) you will

documentation/2.0/content/rcuinfo.md Outdated

2. Duplicate each datasource two times

3. Change the duplicated data source name, `JNDIName` by appending `-1`, `-2` etc. The `-1`, `-2` data sources are the physical data source, you will need to update their `URL` too.

For example (note: details replaced by `....` for easier reading),

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reading), -> reading): (colon)

documentation/2.0/content/rcuinfo.md Outdated

....

```

You can run WDT tool `modelHelp.sh -oracle_home <oracle home> resources:/JDBCSystemResource/JdbcResource/JDBCDataSourceParams` for the complete list

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-write: For the complete list of fields, run the WDT command, modelHelp.sh -oracle_home <oracle home> resources:/JDBCSystemResource/JdbcResource/JDBCOracleParmas.


 doc update

4df94a1

rosemarymarano

rosemarymarano approved these changes

Sep 14, 2022

Copy link

Contributor

@rosemarymarano rosemarymarano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor fixes otherwise ok.

documentation/2.0/content/rcuinfo.md

For the complete list of fields, run the WDT command,

```shell

modelHelp.sh -oracle_home <oracle home> resources:/JDBCSystemResource/JdbcResource/JDBCOracleParams

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Preceded commands with a dollar sign ($)
$ modelHelp.sh

documentation/2.0/content/rcuinfo.md

For the complete list of fields, run the WDT command,

```shell

modelHelp.sh -oracle_home <oracle home> resources:/JDBCSystemResource/JdbcResource/JDBCOracleParams

Copy link

Contributor

@rosemarymarano rosemarymarano Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$ modelHelp.sh


 Merge branch 'main' into wdt-636-mds

7a79fe8

robertpatrick

robertpatrick approved these changes

CarolynRountree

CarolynRountree approved these changes

rakillen

rakillen approved these changes

ddsharpe

ddsharpe approved these changes

jshum2479 added 4 commits

September 16, 2022 11:13


 Fix aliases failure, remove obsolete code

0cf0fa3


 remove obsolete comment

2b7c9f2


 correct obsolete import

38ab081

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 8 Code Smells


 clean up

cc2a882

@sonarqubecloud

Copy link

sonarqubecloud bot commented Sep 16, 2022

Kudos, SonarCloud Quality Gate passed! Quality Gate passed

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@robertpatrick robertpatrick merged commit 324753e into main