Skip to content

Commit 666fd3c

Browse files
rakillenjshum2479
authored andcommitted
Wdt 341 remove debug (#388)
* JIRA WDT-341 - Update README files for multiple model support * JIRA WDT-341 - Remove debug
1 parent 54d716d commit 666fd3c

File tree

6 files changed

+25
-4
lines changed

6 files changed

+25
-4
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,14 @@ In the example above, the `Target` attribute is specified three different ways,
218218

219219
One of the primary goals of the WebLogic Deploy Tooling is to support a sparse model where the user can specify just the configuration needed for a particular situation. What this implies varies somewhat between the tools but, in general, this implies that the tools are using an additive model. That is, the tools add to what is already there in the existing domain or domain templates (when creating a new domain) rather than making the domain conform exactly to the specified model. Where it makes sense, a similar, additive approach is taken when setting the value of multi-valued attributes. For example, if the model specified the cluster `mycluster` as the target for an artifact, the tooling will add `mycluster` to any existing list of targets for the artifact. While the development team has tried to mark attributes that do not make sense to merge accordingly in our knowledge base, this behavior can be disabled on an attribute-by-attribute basis, by adding an additional annotation in the knowledge base data files. The development team is already thinking about how to handle situations that require a non-additive, converge-to-the-model approach, and how that might be supported, but this still remains a wish list item. Users with these requirements should raise an issue for this support.
220220

221+
### Using Multiple Models
222+
223+
The Create Domain, Update Domain, Deploy Applications, and Validate Model tools allow the specification of multiple models on the command line. For example:
224+
225+
weblogic-deploy\bin\createDomain.cmd -model_file modelOne,modelTwo,modelThree ...
226+
227+
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.
228+
221229
## Downloading and Installing the Software
222230

223231
The Oracle WebLogic Server Deploy Tooling project repository is located at [`https://github.com/oracle/weblogic-deploy-tooling`](https://github.com/oracle/weblogic-deploy-tooling). Binary distributions of the `weblogic-deploy.zip` installer can be downloaded from the [GitHub Releases page](https://github.com/oracle/weblogic-deploy-tooling/releases). To install the software, simply unzip the `weblogic-deploy.zip` installer on a machine that has the desired versions of WebLogic Server installed. After being unzipped, the software is ready to use, just set the `JAVA_HOME` environment variable to point to a Java 7 or higher JDK and the shell scripts are ready to run.

core/src/main/python/wlsdeploy/util/cla_helper.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from wlsdeploy.util import cla_utils
1313
from wlsdeploy.util.cla_utils import CommandLineArgUtil
1414
from wlsdeploy.util.model_translator import FileToPython
15-
from wlsdeploy.yaml.yaml_translator import PythonToYaml
1615

1716
import oracle.weblogic.deploy.util.PyOrderedDict as OrderedDict
1817

@@ -130,8 +129,6 @@ def merge_model_files(model_file_value):
130129
model = FileToPython(model_file, True).parse()
131130
_merge_dictionaries(merged_model, model)
132131

133-
PythonToYaml(merged_model).write_to_yaml_file("C:/tmp/mergedModel.yaml")
134-
135132
return merged_model
136133

137134

site/create.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@ It is also possible to specify the connection information in the model instead o
2323

2424
To create more complex domains, it may be necessary to create a custom domain type. This is useful for cases where the domain has custom templates, or templates for other Oracle products. For more information, refer to [Domain Type Definitions](type_def.md).
2525

26-
One last note is that if the model or variables file contains encrypted passwords, add the `-use_encryption` flag to the command line to tell the Create Domain Tool that encryption is being used and to prompt for the encryption passphrase. As with the database passwords, the tool can also read the passphrase from standard input (for example, `stdin`) to allow the tool to run without any user input.
26+
### Using an Encrypted Model
27+
28+
If the model or variables file contains encrypted passwords, add the `-use_encryption` flag to the command line to tell the Create Domain Tool that encryption is being used and to prompt for the encryption passphrase. As with the database passwords, the tool can also read the passphrase from standard input (for example, `stdin`) to allow the tool to run without any user input.
29+
30+
### Using Multiple Models
31+
32+
The Create Domain Tool supports the use of multiple models, as described in [Using Multiple Models](../README.md#using-multiple-models).

site/deploy.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ When running the tool in WLST online mode, the deploy operation may require serv
2929
- `102` - The servers impacted by the deploy operation need to be restarted, in a rolling fashion, starting with the Administration Server, if applicable.
3030
- `103` - The entire domain needs to be restarted.
3131

32+
### Using Multiple Models
33+
34+
The Deploy Applications Tool supports the use of multiple models, as described in [Using Multiple Models](../README.md#using-multiple-models).

site/update.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ When running the tool in WLST online mode, the update operation may require serv
2323
- `101` - The domain needs to be restarted and the Update Domain Tool needs to be re-invoked with the same arguments.
2424
- `102` - The servers impacted by the update operation need to be restarted, in a rolling fashion, starting with the Administration Server, if applicable.
2525
- `103` - The entire domain needs to be restarted.
26+
27+
### Using Multiple Models
28+
29+
The Update Domain Tool supports the use of multiple models, as described in [Using Multiple Models](../README.md#using-multiple-models).

site/validate.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,6 @@ Results in output similar to that shown below, if the `simpleear.ear` file is no
100100
Errors: 1
101101
Message: Model location appDeployments:/Application/simpleear/SourcePath references file wlsdeploy/applications/simpleear.ear that is not found in the archive file D:/demo/InvalidDemoDomain.zip
102102

103+
### Using Multiple Models
104+
105+
The Validate Model Tool supports the use of multiple models, as described in [Using Multiple Models](../README.md#using-multiple-models).

0 commit comments

Comments
 (0)