Wdt 604 clean up models for parser changes (#1081)

* start cleanup of yaml

* Clean up yaml for new parser

* revert model-help changes

Author: CarolynRountree

documentation/2.0/content/concepts/archive.md

@@ -25,7 +25,7 @@ appDeployments:
     Application:
         simpleear :
             SourcePath: wlsdeploy/applications/simpleear.ear
-            Target: 'my-cluster'
+            Target: my-cluster
             ModuleType: ear
 ```
 

documentation/2.0/content/concepts/model.md

@@ -66,7 +66,7 @@ resources:
                     JNDIName: jdbc/generic1
                 JDBCDriverParams:
                     DriverName: oracle.jdbc.OracleDriver
-                    URL: 'jdbc:oracle:thin:@//@@PROP:dbcs1.url@@'
+                    URL: jdbc:oracle:thin:@//@@PROP:dbcs1.url@@
                     PasswordEncrypted: '@@PROP:dbcs1.password@@'
                     Properties:
                         user:
@@ -195,10 +195,10 @@ When modeling configuration attributes that can have multiple values, the WebLog
 resources:
     JDBCSystemResource:
         MyStringDataSource:
-            Target: 'AdminServer,mycluster'
+            Target: AdminServer,mycluster
             JdbcResource:
                 JDBCDataSourceParams:
-                    JNDIName: 'jdbc/generic1, jdbc/special1'
+                    JNDIName: jdbc/generic1, jdbc/special1
                 ...
         MyListDataSource:
             Target: [ AdminServer, mycluster ]
@@ -231,21 +231,15 @@ With WebLogic Deploy Tooling, you can specify named items in the model to be del
 
 In this example, the managed server ```obsoleteServer``` will be deleted, and ```newServer``` will be created:
 
+Note that the exclamation point, along with the name, should be inside quotation marks:
+
 ```yaml
     Server:
-        !obsoleteServer:
+        '!obsoleteServer':
         newServer:
             ListenAddress: 127.0.0.1
             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
@@ -269,8 +263,8 @@ In addition to deleting named mbeans, you can remove items from a list. Most pra
 ```yaml
   JMSSystemResource:
       BPMJMSModule:
-          Target: soa_cluster,!AdminServer
-
+          Target: soa_cluster,'!AdminServer'
+              
 ```
 In this example, the BPMJMSModule has the AdminServer target removed from the target list.
 
@@ -287,7 +281,7 @@ topology:
     Server:
         m1:
             ListenPort: 7000
-            Notes: "Server 1"
+            Notes: Server 1
         m2:
             ListenPort: 9000
 ```
@@ -325,7 +319,7 @@ topology:
     Server:
         m1:
             ListenPort: 7000
-            Notes: "Server 1"
+            Notes: Server 1
         m2:
             ListenPort: 9000
 ```
@@ -341,7 +335,7 @@ topology:
     Server:
         m1:
             ListenPort: 7000
-            Notes: "Server 1"
+            Notes: Server 1
 ```
 
 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:
@@ -356,13 +350,13 @@ topology:
     Server:
         m1:
             ListenPort: 7000
-            Notes: "Server 1"
+            Notes: Server 1
 ```
 The resulting model would be:
 ```yaml
 topology:
     Server:
         m1:
             ListenPort: 7000
-            Notes: "Server 1"
+            Notes: Server 1
 ```

documentation/2.0/content/rcuinfo.md

@@ -39,14 +39,14 @@ domainInfo:
         rcu_schema_password : <rcu schema password, will be prompted if not specified>
         rcu_admin_password : <database admin password is required only when you specify -run_rcu flag, will be prompted
          if not specified>
-        rcu_db_conn_string : 'dbhost:1521/pdborcl'
+        rcu_db_conn_string : dbhost:1521/pdborcl
 ```        
 RCU `-variables` option of the repository creation utility can now be included in the `RCUDbInfo` section with the key `rcu_variables`:
 
 ```yaml
 domainInfo:
     RCUDbInfo:
-        rcu_variables : 'xxxx'
+        rcu_variables : xxxx
 ```    
 
 **Note: Prior to release 0.23, the `useATP` flag only accepts values of 0, 1, 'true' or 'false'.**
@@ -60,6 +60,6 @@ Include your XML files in your archive file using location `wlsdeploy/rcu/config
 ```yaml
 domainInfo:
     RCUDbInfo:
-        compInfoXMLLocation: 'wlsdeploy/rcu/config/MyComponentInfo.xml'
-        storageXMLLocation: 'wlsdeploy/rcu/config/MyStorage.xml'
+        compInfoXMLLocation: wlsdeploy/rcu/config/MyComponentInfo.xml
+        storageXMLLocation: wlsdeploy/rcu/config/MyStorage.xml
 ```

documentation/2.0/content/samples/adminserver-model.md

@@ -24,7 +24,7 @@ description: "Configure the Administration Server using a domain model."
          AdminServer:
              ListenPort: 9071
              RestartDelaySeconds: 10
-             ListenAddress: 'my-host-1'
+             ListenAddress: my-host-1
              Log:
                  FileCount: 9
                  LogFileSeverity: Info
@@ -44,12 +44,12 @@ description: "Configure the Administration Server using a domain model."
 
  ```yaml
  topology:
-     AdminServerName: 'my-admin-server'
+     AdminServerName: my-admin-server
      Server:
          'my-admin-server':
              ListenPort: 9071
              RestartDelaySeconds: 10
-             ListenAddress: 'my-host-1'
+             ListenAddress: my-host-1
              Log:
                  FileCount: 9
                  LogFileSeverity: Info

documentation/2.0/content/samples/cluster-model.md

@@ -11,10 +11,10 @@ This WDT domain model sample has a typical configuration for a configured cluste
 ```yaml
 topology:
     Cluster:
-        'cluster-1':
+        cluster-1:
             ClientCertProxyEnabled: true
             AutoMigrationTableName: MIGRATION_1
-            DataSourceForAutomaticMigration: 'jdbc-1'
+            DataSourceForAutomaticMigration: jdbc-1
             ClusterMessagingMode: unicast
             FrontendHost: frontend.com
             FrontendHTTPPort: 9001
@@ -24,16 +24,16 @@ topology:
             WeblogicPluginEnabled: true
 
     Server:
-        'server-1':
-            Cluster: 'cluster-1'  # this server belongs to cluster-1
+        server-1:
+            Cluster: cluster-1  # this server belongs to cluster-1
             ListenAddress: 127.0.0.1
             ListenPort: 8001
-            Machine: 'machine-1'
+            Machine: machine-1
             Log:
                 DomainLogBroadcastSeverity: Error
                 FileCount: 7
                 FileMinSize: 5000
-                FileName: 'logs/AdminServer.log'
+                FileName: logs/AdminServer.log
                 LogFileSeverity: Info
                 MemoryBufferSeverity: Notice
                 NumberOfFilesLimited: true
@@ -43,8 +43,8 @@ topology:
                 Enabled: true
                 ListenPort: 8002
             ServerStart:
-                Arguments: '-Dosgi=true -Dtangosol.coherence.management=all'
-                ClassPath: '/foo/bar,wlsdeploy/classpathLibraries/mylib.jar'
+                Arguments: -Dosgi=true -Dtangosol.coherence.management=all
+                ClassPath: /foo/bar,wlsdeploy/classpathLibraries/mylib.jar
 ```
 There are additional sub-folders and attributes available for more configuration options. These can be determined using the [Model Help Tool]({{< relref "/userguide/tools/model_help.md" >}}). For example, this command will list the attributes and sub-folders for the `Server` folder:
 ```bash

documentation/2.0/content/samples/jdbc-model.md

@@ -11,8 +11,8 @@ This WDT domain model sample section has a typical configuration for a JDBC data
 ```yaml
 resources:
     JDBCSystemResource:
-        'datasource-1':
-            Target: 'AdminServer,cluster-1'
+        datasource-1:
+            Target: AdminServer,cluster-1
             JdbcResource:
                 DatasourceType: GENERIC
                 JDBCConnectionPoolParams:
@@ -25,7 +25,7 @@ resources:
                 JDBCDriverParams:
                     DriverName: oracle.jdbc.OracleDriver
                     PasswordEncrypted: '@@PROP:jdbc.password@@'
-                    URL: 'jdbc:oracle:thin:@//localhost:1521/myDB'
+                    URL: jdbc:oracle:thin:@//localhost:1521/myDB
                     Properties:
                         user:
                             Value: scott

documentation/2.0/content/samples/odl-model.md

@@ -15,41 +15,41 @@ This example shows how some common configuration elements can be represented in
 resources:
     ODLConfiguration:
         config1:
-            Servers: "m1, m2"
+            Servers: m1, m2
             AddJvmNumber: true
             HandlerDefaults:
                 abc: r123
                 xyz: k890
             Handler:
-                'my-handler':
-                    Class: 'com.my.MyHandler'
-                    Level: 'TRACE:32'
-                    ErrorManager: 'com.my.MyErrorManager'
-                    Filter: 'com.my.MyFilter'
-                    Formatter: 'com.my.MyFormatter'
-                    Encoding: 'UTF-8'
+                my-handler:
+                    Class: com.my.MyHandler
+                    Level: TRACE:32
+                    ErrorManager: com.my.MyErrorManager
+                    Filter: com.my.MyFilter
+                    Formatter: com.my.MyFormatter
+                    Encoding: UTF-8
                     Properties:
-                        'path': '/home/me/mypath"
-                'quicktrace-handler':
-                    Filter: 'oracle:dfw:incident:IncidentDetectionLogFilter'
+                        path: /home/me/mypath
+                quicktrace-handler:
+                    Filter: oracle:dfw:incident:IncidentDetectionLogFilter
                     Properties:
                         path: '${domain.home}/servers/${weblogic.Name}/logs/${weblogic.Name}-myhistory.log'
-                        useSourceClassandMethod: 'true'
+                        useSourceClassandMethod: true
             Logger:
-                'my-logger':
-                    Level: 'NOTIFICATION:1'
+                my-logger:
+                    Level: NOTIFICATION:1
                     UseParentHandlers: true
-                    Filter: 'oracle:dfw:incident:IncidentDetectionLogFilter'
-                    Handlers: 'richard-handler,owsm-message-handler'
-                'oracle.sysman':
+                    Filter: oracle:dfw:incident:IncidentDetectionLogFilter
+                    Handlers: richard-handler,owsm-message-handler
+                oracle.sysman:
                     Handlers: [
-                        'my-handler',
-                        'owsm-message-handler'
+                        my-handler,
+                        owsm-message-handler
                     ]
         config2:
-            Servers: 'AdminServer'
+            Servers: AdminServer
             HandlerDefaults:
-                path: '/home/me/otherpath'
+                path: /home/me/otherpath
                 maxFileSize: 5242880
 ```
 

documentation/2.0/content/samples/ohs-model.md

@@ -33,17 +33,17 @@ Configuring OHS typically involves adding two top-level folders to the `resource
 ```yaml
 resources:
     SystemComponent:
-        'my-ohs':
-            ComponentType: 'OHS'
-            Machine: 'my-machine'
+        my-ohs:
+            ComponentType: OHS
+            Machine: my-machine
     OHS:
-        'my-ohs':
-            AdminHost: '127.0.0.1'
-            AdminPort: '9324'
-            ListenAddress: '127.0.0.1'
-            ListenPort: '7323'
-            SSLListenPort: '4323'
-            ServerName: 'http://localhost:7323'
+        my-ohs:
+            AdminHost: 127.0.0.1
+            AdminPort: 9324
+            ListenAddress: 127.0.0.1
+            ListenPort: 7323
+            SSLListenPort: 4323
+            ServerName: http://localhost:7323
 ```
 Each name under the `OHS` folder must match a name under the `SystemComponent` folder in the model, or the name of a `SystemComponent` element that has been previously created. In this example, the name `my-ohs` is in both places.
 

documentation/2.0/content/samples/pwcredentialmap-model.md

@@ -34,7 +34,7 @@ domainInfo:
                RemotePort: 7030
                Path: /app/sell
                Method: GET
-               User: 'user1,user2'
+               User: user1,user2
                RemoteUser: remoteUser2
                RemotePassword: '@@PROP:remote2.pwd@@'
 ```

documentation/2.0/content/samples/securityproviders-model.md

@@ -130,10 +130,10 @@ For the MBean jar, WebLogic allows you to define an alternate directory other th
 
  ```yaml
          CredentialMapper:
-             'Sample CredentialMapper':
-                 'examples.security.providers.SampleCredentialMapper':
-                     UserNameMapperClassName: 'examples.security.providers.CredentialMapperProviderImpl'
-                     CredentialMappingDeploymentEnabled: true:
+             Sample CredentialMapper:
+                 examples.security.providers.SampleCredentialMapper:
+                     UserNameMapperClassName: examples.security.providers.CredentialMapperProviderImpl
+                     CredentialMappingDeploymentEnabled: true
  ```
 
  #### Known limitations