From d07a06f4509398b82d9ff98afaa447e6677171f6 Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Tue, 9 Jul 2019 15:53:14 -0500 Subject: [PATCH 1/3] change wording for multiple model readme section and add example --- README.md | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8dc2b8d1db..6f50525bed 100644 --- a/README.md +++ b/README.md @@ -224,7 +224,34 @@ The Create Domain, Update Domain, Deploy Applications, and Validate Model Tools weblogic-deploy\bin\createDomain.cmd -model_file modelOne,modelTwo,modelThree ... -In this case, the models are merged into a single model before being applied. Each successive model is layered onto the previous ones, so any existing values from the previous models are overwritten. The resulting model is then verified before being applied. +In this case, the models are merged into a single model before being applied. Each successive model is added to the previous model. In cases where entities exist in both models, the attributes are combined and attribute values from successive models prevail. The resulting model is then verified before being applied. +For example, if Model 1 looks like: +```yaml +topology: + Server: + m1: + ListenPort: 7000 + m2: + ListenPort: 9000 +``` +and Model 2 looks like: +```yaml +topology: + Server: + m1: + ListenPort: 8000 + ListenAddress: myhostname +``` +The resulting model would be: +```yaml +topology: + Server: + m1: + ListenPort: 8000 + ListenAddress: myhostname + m2: + ListenPort: 9000 +``` ## Downloading and Installing the Software From 3da9ddb5838038b92163457ee9d2851c3d6e32d3 Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Tue, 9 Jul 2019 15:58:00 -0500 Subject: [PATCH 2/3] added another example use case (adding server) --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f50525bed..a0be27ddde 100644 --- a/README.md +++ b/README.md @@ -241,8 +241,10 @@ topology: m1: ListenPort: 8000 ListenAddress: myhostname + m3: + ListenPort: 10000 ``` -The resulting model would be: +The attributes for server m1 are merged, server m2 is left unchanged, and server m3 is added. The resulting model would be: ```yaml topology: Server: @@ -251,6 +253,8 @@ topology: ListenAddress: myhostname m2: ListenPort: 9000 + m3: + ListenPort: 10000 ``` ## Downloading and Installing the Software From dfb165f0abd52fdbf8ecaed4db8724d33a6633ae Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Tue, 9 Jul 2019 16:04:05 -0500 Subject: [PATCH 3/3] added attribute to example that did not change --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a0be27ddde..9a25cded2a 100644 --- a/README.md +++ b/README.md @@ -231,6 +231,7 @@ topology: Server: m1: ListenPort: 7000 + Notes: "Server 1" m2: ListenPort: 9000 ``` @@ -239,8 +240,8 @@ and Model 2 looks like: topology: Server: m1: - ListenPort: 8000 ListenAddress: myhostname + ListenPort: 8000 m3: ListenPort: 10000 ``` @@ -249,8 +250,9 @@ The attributes for server m1 are merged, server m2 is left unchanged, and server topology: Server: m1: - ListenPort: 8000 ListenAddress: myhostname + ListenPort: 8000 + Notes: "Server 1" m2: ListenPort: 9000 m3: