AMBARI-2588. oozie.service.ActionService.executor.ext.classes needs proper formatting. (yusaku)

ambari-server/src/main/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/oozie-site.xml

@@ -153,13 +153,7 @@
     </property>
     <property>
       <name>oozie.authentication.kerberos.name.rules</name>
-      <value>
-        RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
-        RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
-        RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-        RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-        DEFAULT
-        </value>
+      <value>DEFAULT</value>
       <description>The mapping from kerberos principal names to local OS user names.</description>
     </property>
     <property>
@@ -176,13 +170,11 @@
     </property>
     <property>
         <name>oozie.service.ActionService.executor.ext.classes</name>
-        <value>
-            org.apache.oozie.action.email.EmailActionExecutor,
-            org.apache.oozie.action.hadoop.HiveActionExecutor,
-            org.apache.oozie.action.hadoop.ShellActionExecutor,
-            org.apache.oozie.action.hadoop.SqoopActionExecutor,
-            org.apache.oozie.action.hadoop.DistcpActionExecutor
-        </value>
+        <value>org.apache.oozie.action.email.EmailActionExecutor,
+org.apache.oozie.action.hadoop.HiveActionExecutor,
+org.apache.oozie.action.hadoop.ShellActionExecutor,
+org.apache.oozie.action.hadoop.SqoopActionExecutor,
+org.apache.oozie.action.hadoop.DistcpActionExecutor</value>
     </property>
 
     <property>

ambari-server/src/main/resources/stacks/HDP/1.3.1/services/OOZIE/configuration/oozie-site.xml

@@ -153,13 +153,7 @@
     </property>
     <property>
       <name>oozie.authentication.kerberos.name.rules</name>
-      <value>
-        RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
-        RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
-        RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-        RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-        DEFAULT
-        </value>
+      <value>DEFAULT</value>
       <description>The mapping from kerberos principal names to local OS user names.</description>
     </property>
     <property>
@@ -176,13 +170,11 @@
     </property>
     <property>
         <name>oozie.service.ActionService.executor.ext.classes</name>
-        <value>
-            org.apache.oozie.action.email.EmailActionExecutor,
-            org.apache.oozie.action.hadoop.HiveActionExecutor,
-            org.apache.oozie.action.hadoop.ShellActionExecutor,
-            org.apache.oozie.action.hadoop.SqoopActionExecutor,
-            org.apache.oozie.action.hadoop.DistcpActionExecutor
-        </value>
+        <value>org.apache.oozie.action.email.EmailActionExecutor,
+org.apache.oozie.action.hadoop.HiveActionExecutor,
+org.apache.oozie.action.hadoop.ShellActionExecutor,
+org.apache.oozie.action.hadoop.SqoopActionExecutor,
+org.apache.oozie.action.hadoop.DistcpActionExecutor</value>
     </property>
 
     <property>

ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/OOZIE/configuration/oozie-site.xml

@@ -153,13 +153,7 @@
     </property>
     <property>
       <name>oozie.authentication.kerberos.name.rules</name>
-      <value>
-        RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
-        RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
-        RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-        RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-        DEFAULT
-        </value>
+      <value>DEFAULT</value>
       <description>The mapping from kerberos principal names to local OS user names.</description>
     </property>
     <property>
@@ -176,13 +170,11 @@
     </property>
     <property>
         <name>oozie.service.ActionService.executor.ext.classes</name>
-        <value>
-            org.apache.oozie.action.email.EmailActionExecutor,
-            org.apache.oozie.action.hadoop.HiveActionExecutor,
-            org.apache.oozie.action.hadoop.ShellActionExecutor,
-            org.apache.oozie.action.hadoop.SqoopActionExecutor,
-            org.apache.oozie.action.hadoop.DistcpActionExecutor
-        </value>
+        <value>org.apache.oozie.action.email.EmailActionExecutor,
+org.apache.oozie.action.hadoop.HiveActionExecutor,
+org.apache.oozie.action.hadoop.ShellActionExecutor,
+org.apache.oozie.action.hadoop.SqoopActionExecutor,
+org.apache.oozie.action.hadoop.DistcpActionExecutor</value>
     </property>
 
     <property>

ambari-server/src/main/resources/stacks/HDPLocal/1.3.1/services/OOZIE/configuration/oozie-site.xml

@@ -153,13 +153,7 @@
     </property>
     <property>
       <name>oozie.authentication.kerberos.name.rules</name>
-      <value>
-        RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
-        RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
-        RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-        RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-        DEFAULT
-        </value>
+      <value>DEFAULT</value>
       <description>The mapping from kerberos principal names to local OS user names.</description>
     </property>
     <property>
@@ -176,13 +170,11 @@
     </property>
     <property>
         <name>oozie.service.ActionService.executor.ext.classes</name>
-        <value>
-            org.apache.oozie.action.email.EmailActionExecutor,
-            org.apache.oozie.action.hadoop.HiveActionExecutor,
-            org.apache.oozie.action.hadoop.ShellActionExecutor,
-            org.apache.oozie.action.hadoop.SqoopActionExecutor,
-            org.apache.oozie.action.hadoop.DistcpActionExecutor
-        </value>
+        <value>org.apache.oozie.action.email.EmailActionExecutor,
+org.apache.oozie.action.hadoop.HiveActionExecutor,
+org.apache.oozie.action.hadoop.ShellActionExecutor,
+org.apache.oozie.action.hadoop.SqoopActionExecutor,
+org.apache.oozie.action.hadoop.DistcpActionExecutor</value>
     </property>
 
     <property>

ambari-web/app/assets/data/configurations/cluster_level_configs.json

@@ -199,7 +199,7 @@
         "oozie.base.url" : "http://dev.hortonworks.com:11000/oozie",
         "oozie.service.JPAService.jdbc.username" : "sa",
         "oozie.service.CallableQueueService.queue.size" : "1000",
-        "oozie.authentication.kerberos.name.rules" : "\n        RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/\n        RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/\n        RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n        RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n        DEFAULT\n        ",
+        "oozie.authentication.kerberos.name.rules" : "RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/\nRULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/\nRULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\nRULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\nDEFAULT",
         "oozie.service.HadoopAccessorService.nameNode.whitelist" : " ",
         "oozie.service.SchemaService.wf.ext.schemas" : "shell-action-0.1.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,sqoop-action-0.2.xsd,ssh-action-0.1.xsd,distcp-action-0.1.xsd",
         "oozie.service.WorkflowAppService.system.libpath" : "/user/${user.name}/share/lib",
@@ -211,7 +211,7 @@
         "oozie.service.JPAService.jdbc.url" : "jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true",
         "oozie.service.JPAService.jdbc.driver" : "org.apache.derby.jdbc.EmbeddedDriver",
         "oozie.service.HadoopAccessorService.hadoop.configurations" : "*=/etc/hadoop/conf",
-        "oozie.service.ActionService.executor.ext.classes" : "\n            org.apache.oozie.action.email.EmailActionExecutor,\n            org.apache.oozie.action.hadoop.HiveActionExecutor,\n            org.apache.oozie.action.hadoop.ShellActionExecutor,\n            org.apache.oozie.action.hadoop.SqoopActionExecutor,\n            org.apache.oozie.action.hadoop.DistcpActionExecutor\n        "
+        "oozie.service.ActionService.executor.ext.classes" : "org.apache.oozie.action.email.EmailActionExecutor,\norg.apache.oozie.action.hadoop.HiveActionExecutor,\norg.apache.oozie.action.hadoop.ShellActionExecutor,\norg.apache.oozie.action.hadoop.SqoopActionExecutor,\norg.apache.oozie.action.hadoop.DistcpActionExecutor"
       }
     },
     {

ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/OOZIE.json

@@ -17,7 +17,7 @@
       "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/OOZIE/configurations/oozie.authentication.kerberos.name.rules",
       "StackConfigurations" : {
         "property_description" : "The mapping from kerberos principal names to local OS user names.",
-        "property_value" : "\n        RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/\n        RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/\n        RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n        RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n        DEFAULT\n        ",
+        "property_value" : "RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/\nRULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/\nRULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\nRULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\nDEFAULT",
         "stack_version" : "1.3.0",
         "property_name" : "oozie.authentication.kerberos.name.rules",
         "filename" : "oozie-site.xml",
@@ -161,7 +161,7 @@
       "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/OOZIE/configurations/oozie.service.ActionService.executor.ext.classes",
       "StackConfigurations" : {
         "property_description" : null,
-        "property_value" : "\n            org.apache.oozie.action.email.EmailActionExecutor,\n            org.apache.oozie.action.hadoop.HiveActionExecutor,\n            org.apache.oozie.action.hadoop.ShellActionExecutor,\n            org.apache.oozie.action.hadoop.SqoopActionExecutor,\n            org.apache.oozie.action.hadoop.DistcpActionExecutor\n        ",
+        "property_value" : "org.apache.oozie.action.email.EmailActionExecutor,\norg.apache.oozie.action.hadoop.HiveActionExecutor,\norg.apache.oozie.action.hadoop.ShellActionExecutor,\norg.apache.oozie.action.hadoop.SqoopActionExecutor,\norg.apache.oozie.action.hadoop.DistcpActionExecutor",
         "stack_version" : "1.3.0",
         "property_name" : "oozie.service.ActionService.executor.ext.classes",
         "filename" : "oozie-site.xml",

ambari-web/app/utils/config.js

@@ -299,7 +299,7 @@ App.config = Em.Object.create({
            * (/^\s+$/.test(_config.value)) { _config.isRequired = false; }
            */
           _config.isRequired = true;
-          _config.displayType = 'advanced';
+          _config.displayType = stringUtils.isSingleLine(_config.value) ? 'advanced' : 'multiLine';
           serviceConfigs.push(_config);
         }
       }