Merge branch 'master' into wdt_issue_246

Author: ddsharpe

README.md

@@ -218,6 +218,14 @@ In the example above, the `Target` attribute is specified three different ways,
 
 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.
 
+### Using Multiple Models
+
+The Create Domain, Update Domain, Deploy Applications, and Validate Model tools allow the specification of multiple models on the command line. For example:
+
+    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.
+
 ## Downloading and Installing the Software
 
 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/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <artifactId>weblogic-deploy</artifactId>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

@@ -3,6 +3,8 @@
 The Universal Permissive License (UPL), Version 1.0
 """
 import javaos as os
+from java.util import Properties
+from java.io import FileOutputStream
 from oracle.weblogic.deploy.create import RCURunner
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import ADMIN_PASSWORD
@@ -80,6 +82,8 @@
 from wlsdeploy.tool.util.topology_helper import TopologyHelper
 from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import model as model_helper
+import weblogic.security.internal.SerializedSystemIni as SerializedSystemIni
+import weblogic.security.internal.encryption.ClearOrEncryptedService as ClearOrEncryptedService
 
 
 class DomainCreator(Creator):
@@ -161,6 +165,7 @@ def create(self):
         self.__fail_mt_1221_domain_creation()
         self.__create_domain()
         self.__deploy()
+        self.__create_boot_dot_properties()
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
@@ -302,7 +307,6 @@ def __fail_mt_1221_domain_creation(self):
                 (not dictionary_utils.is_empty_dictionary_element(resources_dict, RESOURCE_GROUP_TEMPLATE)) or \
                 (not dictionary_utils.is_empty_dictionary_element(resources_dict, RESOURCE_GROUP)) or \
                 (not dictionary_utils.is_empty_dictionary_element(resources_dict, PARTITION)):
-
             ex = exception_helper.create_create_exception('WLSDPLY-12202', self.wls_helper.wl_version)
             self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex
@@ -1093,3 +1097,34 @@ def _configure_security_configuration(self):
         self.security_provider_creator.create_security_configuration(security_config_location)
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
+
+    def __create_boot_dot_properties(self):
+        _method_name = '__create_boot_dot_properties'
+        self.logger.entering(class_name=self.__class_name, method_name=_method_name)
+        systemIni = SerializedSystemIni.getEncryptionService(self._domain_home)
+        encryptionService = ClearOrEncryptedService(systemIni)
+        admin_password = self._domain_info[ADMIN_PASSWORD]
+        admin_username = self.wls_helper.get_default_admin_username()
+        if ADMIN_USERNAME in self._domain_info:
+            admin_username = self._domain_info[ADMIN_USERNAME]
+
+        server_nodes = dictionary_utils.get_dictionary_element(self._topology, SERVER)
+        servers = [self._admin_server_name]
+
+        for model_name in server_nodes:
+            name = self.wlst_helper.get_quoted_name_for_wlst(model_name)
+            servers.append(name)
+
+        for server in servers:
+            properties = Properties()
+            properties.put("username", encryptionService.encrypt(admin_username))
+            properties.put("password", encryptionService.encrypt(admin_password))
+            file_directory = self._domain_home + "/servers/" + server + "/security"
+            file_location = file_directory + "/boot.properties"
+            if not os.path.exists(file_directory):
+                os.makedirs(file_directory)
+            ostream = FileOutputStream(file_location)
+            properties.store(ostream, None)
+            ostream.close()
+        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
+        return

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

@@ -12,7 +12,6 @@
 from wlsdeploy.util import cla_utils
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model_translator import FileToPython
-from wlsdeploy.yaml.yaml_translator import PythonToYaml
 
 import oracle.weblogic.deploy.util.PyOrderedDict as OrderedDict
 
@@ -130,8 +129,6 @@ def merge_model_files(model_file_value):
         model = FileToPython(model_file, True).parse()
         _merge_dictionaries(merged_model, model)
 
-    PythonToYaml(merged_model).write_to_yaml_file("C:/tmp/mergedModel.yaml")
-
     return merged_model
 
 

installer/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
         <artifactId>weblogic-deploy</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.oracle.weblogic.lifecycle</groupId>
     <artifactId>weblogic-deploy</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Oracle WebLogic Server Deploy Tooling</name>

site/create.md

@@ -23,4 +23,10 @@ It is also possible to specify the connection information in the model instead o
 
 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).
 
-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.
+### Using an Encrypted Model
+
+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.
+
+### Using Multiple Models
+
+The Create Domain Tool supports the use of multiple models, as described in [Using Multiple Models](../README.md#using-multiple-models).

site/deploy.md

@@ -29,3 +29,6 @@ When running the tool in WLST online mode, the deploy operation may require serv
 - `102` - The servers impacted by the deploy operation need to be restarted, in a rolling fashion, starting with the Administration Server, if applicable.
 - `103` - The entire domain needs to be restarted.
 
+### Using Multiple Models
+
+The Deploy Applications Tool supports the use of multiple models, as described in [Using Multiple Models](../README.md#using-multiple-models).

site/update.md

@@ -23,3 +23,7 @@ When running the tool in WLST online mode, the update operation may require serv
 - `101` - The domain needs to be restarted and the Update Domain Tool needs to be re-invoked with the same arguments.
 - `102` - The servers impacted by the update operation need to be restarted, in a rolling fashion, starting with the Administration Server, if applicable.
 - `103` - The entire domain needs to be restarted.
+
+### Using Multiple Models
+
+The Update Domain Tool supports the use of multiple models, as described in [Using Multiple Models](../README.md#using-multiple-models).

site/validate.md

@@ -100,3 +100,6 @@ Results in output similar to that shown below, if the `simpleear.ear` file is no
       Errors: 1
         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
 
+### Using Multiple Models
+
+The Validate Model Tool supports the use of multiple models, as described in [Using Multiple Models](../README.md#using-multiple-models).