Merge branch 'master' into WDT-Support-for-1411

Author: CarolynRountree

Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
             alwaysPull true
             reuseNode true
             image 'phx.ocir.io/weblogick8s/wdt/jenkinsslave:wls12213'
-            args '--user jenkins:oracle'
+            args '-u jenkins -v /var/run/docker.sock:/var/run/docker.sock'
         }
     }
 
@@ -26,9 +26,9 @@ pipeline {
                 '''
             }
         }
-        stage ('Test') {
+        stage ('Verify') {
             steps {
-                sh 'mvn -Dunit-test-wlst-dir=${WLST_DIR}  test'
+                sh 'mvn -Dunit-test-wlst-dir=${WLST_DIR} -Dmw_home=${ORACLE_HOME} verify'
             }
             post {
                 always {

LICENSE.txt

@@ -1,7 +1,6 @@
-Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
-Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 
-The Universal Permissive License (UPL), Version 1.0
+Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 Subject to the condition set forth below, permission is hereby granted to any
 person obtaining a copy of this software, associated documentation and/or data
@@ -11,28 +10,29 @@ licensable by each licensor hereunder covering either (i) the unmodified
 Software as contributed to or provided by such licensor, or (ii) the Larger
 Works (as defined below), to deal in both
 
-    (a) the Software, and
-    (b) any piece of software and/or hardware listed in the lrgrwrks.txt file
-        if one is included with the Software (each a “Larger Work” to which
-        the Software is contributed by such licensors), without restriction,
-        including without limitation the rights to copy, create derivative
-        works of, display, perform, and distribute the Software and make,
-        use, sell, offer for sale, import, export, have made, and have sold
-        the Software and the Larger Work(s), and to sublicense the foregoing
-        rights on either these or other terms.
+(a) the Software, and
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+one is included with the Software (each a "Larger Work" to which the Software
+is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make,
+use, sell, offer for sale, import, export, have made, and have sold the
+Software and the Larger Work(s), and to sublicense the foregoing rights on
+either these or other terms.
 
 This license is subject to the following condition:
 The above copyright notice and either this complete permission notice or at
-a minimum a reference to the UPL must be included in all copies or substantial
-portions of the Software.
+a minimum a reference to the UPL must be included in all copies or
+substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 ===== The Antlr4 License Statement =====
 

README.md

@@ -16,6 +16,7 @@ Many organizations are using WebLogic Server, with or without other Oracle Fusio
     - [Model Names](#model-names)
     - [Model Semantics](#model-semantics)
     - [Declaring Named MBeans to Delete](#declaring-named-mbeans-to-delete)
+    - [Using Multiple Models](#using-multiple-models)
     - [Administration Server Configuration](site/admin_server.md)
     - [Model Security](site/security.md)
       - [Modeling Security Providers](site/security_providers.md)
@@ -236,6 +237,13 @@ In this example, the managed server ```obsoleteServer``` will be deleted, and ``
             ListenPort: 9005
 ```
 
+If the name of the item requires quotation marks, the exclamation point should be inside the quotation marks:
+
+```yaml
+    Server:
+        '!obsolete-server':
+```
+
 This feature can also remove items that were created by WebLogic Server templates. For example, the base template creates a default security realm called ```myrealm```.  If a user chooses to declare a custom realm, ```myrealm``` is no longer needed.  In this example, ```myrealm``` will be deleted, and the custom realm ```newrealm``` will be created, and declared as the default realm:
 
 ```yaml
@@ -293,6 +301,54 @@ topology:
             ListenPort: 10000  
 ```
 
+If variable properties are used in element names, such as ```@@PROP:my-server@@```, the names in both models will be resolved and matching elements will be merged.
+
+#### Multiple Models and Delete Notation
+
+A named element using [delete notation](#declaring-named-mbeans-to-delete) will completely replace an element with a matching name and no delete notation in a previous model. For example, if Model 1 looks like:
+```yaml
+topology:
+    Server:
+        m1:
+            ListenPort: 7000 
+            Notes: "Server 1"
+```
+and Model 2 looks like:
+```yaml
+topology:
+    Server:
+        !m1:
+```
+The resulting model would be:
+```yaml
+topology:
+    Server:
+        !m1:
+```
+
+Similarly, an element without delete notation will completely replace an element with a matching name that has delete notation in a previous model. For example, if Model 1 looks like:
+```yaml
+topology:
+    Server:
+        !m1:
+```
+and Model 2 looks like:
+```yaml
+topology:
+    Server:
+        m1:
+            ListenPort: 7000 
+            Notes: "Server 1"
+```
+The resulting model would be:
+```yaml
+topology:
+    Server:
+        m1:
+            ListenPort: 7000 
+            Notes: "Server 1"
+```
+
 ## 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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
     The Universal Permissive License (UPL), Version 1.0
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

core/src/main/antlr4/oracle/weblogic/deploy/json/JSON.g4

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
  * The Universal Permissive License (UPL), Version 1.0
  *
  * Credits:

core/src/main/antlr4/oracle/weblogic/deploy/yaml/Yaml.g4

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
  * The Universal Permissive License (UPL), Version 1.0
  */
 grammar Yaml;

core/src/main/java/oracle/weblogic/deploy/aliases/AliasException.java

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
- * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.aliases;
 

core/src/main/java/oracle/weblogic/deploy/aliases/TypeUtils.java

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
- * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.aliases;
 

core/src/main/java/oracle/weblogic/deploy/aliases/VersionException.java

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
- * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.aliases;
 

core/src/main/java/oracle/weblogic/deploy/aliases/VersionUtils.java

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
- * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.aliases;