Repository: knox Updated Branches: refs/heads/master a61ce32d0 -> 088781433
KNOX-426 change assertion provider name to Default Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/08878143 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/08878143 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/08878143 Branch: refs/heads/master Commit: 088781433b7fa29548bdc394e946e4a5c7427801 Parents: a61ce32 Author: Larry McCay <lmc...@hortonworks.com> Authored: Tue Sep 16 19:48:53 2014 -0400 Committer: Larry McCay <lmc...@hortonworks.com> Committed: Tue Sep 16 19:49:35 2014 -0400 ---------------------------------------------------------------------- gateway-release/home/conf/topologies/admin.xml | 2 +- gateway-release/home/conf/topologies/sandbox.xml | 2 +- gateway-release/home/samples/sandbox-with-knox-inside.xml | 2 +- gateway-release/home/templates/ad.xml | 2 +- gateway-release/home/templates/dynamicgroup.xml | 2 +- gateway-release/home/templates/hada.xml | 2 +- gateway-release/home/templates/hadas.xml | 2 +- gateway-release/home/templates/preauth.xml | 2 +- gateway-release/home/templates/preauth127sla.xml | 2 +- gateway-release/home/templates/preauth254sla.xml | 2 +- gateway-release/home/templates/sample.xml | 2 +- gateway-release/home/templates/sandbox-1-3.xml | 2 +- gateway-release/home/templates/sandbox.knoxrealm.xml | 2 +- gateway-release/home/templates/sandbox.knoxrealm1.xml | 2 +- gateway-release/home/templates/sandbox.knoxrealm2.xml | 2 +- gateway-release/home/templates/sandbox.knoxrealmdg.xml | 2 +- gateway-release/home/templates/staticgroup.xml | 2 +- .../hadoop/gateway/topology/xml/TopologyRulesModuleTest.java | 4 ++-- .../gateway/topology/xml/simple-topology-ambari-format.conf | 6 +++--- .../gateway/topology/xml/simple-topology-knox-format.xml | 2 +- .../java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java | 2 +- .../apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java | 6 +++--- .../java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java | 2 +- .../java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java | 2 +- .../apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java | 2 +- .../org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java | 2 +- .../org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java | 2 +- .../java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java | 2 +- .../test/java/org/apache/hadoop/gateway/Knox242FuncTest.java | 2 +- .../test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java | 2 +- .../hadoop/gateway/deploy/DeploymentFactoryFuncTest.java | 2 +- .../gateway/GatewayAdminTopologyFuncTest/test-cluster.xml | 2 +- hsso-release/home/deployments/sample.xml | 2 +- hsso-release/home/templates/topology.xml | 2 +- 34 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/conf/topologies/admin.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/conf/topologies/admin.xml b/gateway-release/home/conf/topologies/admin.xml index b024c42..e844fc7 100644 --- a/gateway-release/home/conf/topologies/admin.xml +++ b/gateway-release/home/conf/topologies/admin.xml @@ -66,7 +66,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> </provider> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/conf/topologies/sandbox.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/conf/topologies/sandbox.xml b/gateway-release/home/conf/topologies/sandbox.xml index 155dc7d..c1a399a 100644 --- a/gateway-release/home/conf/topologies/sandbox.xml +++ b/gateway-release/home/conf/topologies/sandbox.xml @@ -56,7 +56,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> </provider> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/samples/sandbox-with-knox-inside.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/samples/sandbox-with-knox-inside.xml b/gateway-release/home/samples/sandbox-with-knox-inside.xml index 6e5879a..efcd2be 100644 --- a/gateway-release/home/samples/sandbox-with-knox-inside.xml +++ b/gateway-release/home/samples/sandbox-with-knox-inside.xml @@ -45,7 +45,7 @@ </provider> <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> </provider> <provider> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/ad.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/ad.xml b/gateway-release/home/templates/ad.xml index 8790275..589293d 100644 --- a/gateway-release/home/templates/ad.xml +++ b/gateway-release/home/templates/ad.xml @@ -60,7 +60,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> </provider> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/dynamicgroup.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/dynamicgroup.xml b/gateway-release/home/templates/dynamicgroup.xml index f22242a..f2efc59 100644 --- a/gateway-release/home/templates/dynamicgroup.xml +++ b/gateway-release/home/templates/dynamicgroup.xml @@ -120,7 +120,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> <param> <name>group.principal.mapping</name> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/hada.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/hada.xml b/gateway-release/home/templates/hada.xml index 1f7246d..bf30c41 100755 --- a/gateway-release/home/templates/hada.xml +++ b/gateway-release/home/templates/hada.xml @@ -57,7 +57,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> <!-- param> <name>principal.mapping</name> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/hadas.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/hadas.xml b/gateway-release/home/templates/hadas.xml index 1813b83..980c31c 100755 --- a/gateway-release/home/templates/hadas.xml +++ b/gateway-release/home/templates/hadas.xml @@ -69,7 +69,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> <!-- param> <name>principal.mapping</name> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/preauth.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/preauth.xml b/gateway-release/home/templates/preauth.xml index 10611ee..2c9446f 100644 --- a/gateway-release/home/templates/preauth.xml +++ b/gateway-release/home/templates/preauth.xml @@ -36,7 +36,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> </provider> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/preauth127sla.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/preauth127sla.xml b/gateway-release/home/templates/preauth127sla.xml index 1d030d6..2a8cc42 100644 --- a/gateway-release/home/templates/preauth127sla.xml +++ b/gateway-release/home/templates/preauth127sla.xml @@ -39,7 +39,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> </provider> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/preauth254sla.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/preauth254sla.xml b/gateway-release/home/templates/preauth254sla.xml index f4ed898..e665a27 100644 --- a/gateway-release/home/templates/preauth254sla.xml +++ b/gateway-release/home/templates/preauth254sla.xml @@ -39,7 +39,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> </provider> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/sample.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/sample.xml b/gateway-release/home/templates/sample.xml index 47add45..78dfe30 100644 --- a/gateway-release/home/templates/sample.xml +++ b/gateway-release/home/templates/sample.xml @@ -47,7 +47,7 @@ <provider> <role>identity-assertion</role> <enabled>true</enabled> - <name>Pseudo</name> + <name>Default</name> </provider> <!-- http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/sandbox-1-3.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/sandbox-1-3.xml b/gateway-release/home/templates/sandbox-1-3.xml index 97d0123..c676813 100644 --- a/gateway-release/home/templates/sandbox-1-3.xml +++ b/gateway-release/home/templates/sandbox-1-3.xml @@ -54,7 +54,7 @@ <provider> <role>identity-assertion</role> <enabled>true</enabled> - <name>Pseudo</name> + <name>Default</name> <param><name>principal.mapping</name><value>guest=hue</value></param> </provider> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/sandbox.knoxrealm.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/sandbox.knoxrealm.xml b/gateway-release/home/templates/sandbox.knoxrealm.xml index 50451c0..ab1d387 100644 --- a/gateway-release/home/templates/sandbox.knoxrealm.xml +++ b/gateway-release/home/templates/sandbox.knoxrealm.xml @@ -74,7 +74,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> </provider> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/sandbox.knoxrealm1.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/sandbox.knoxrealm1.xml b/gateway-release/home/templates/sandbox.knoxrealm1.xml index 19bc0b6..43f5fd9 100644 --- a/gateway-release/home/templates/sandbox.knoxrealm1.xml +++ b/gateway-release/home/templates/sandbox.knoxrealm1.xml @@ -114,7 +114,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> <param> <name>group.principal.mapping</name> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/sandbox.knoxrealm2.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/sandbox.knoxrealm2.xml b/gateway-release/home/templates/sandbox.knoxrealm2.xml index 95c1e3b..80e1b3c 100644 --- a/gateway-release/home/templates/sandbox.knoxrealm2.xml +++ b/gateway-release/home/templates/sandbox.knoxrealm2.xml @@ -149,7 +149,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> <param> <name>group.principal.mapping</name> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/sandbox.knoxrealmdg.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/sandbox.knoxrealmdg.xml b/gateway-release/home/templates/sandbox.knoxrealmdg.xml index 5123877..d4cb903 100755 --- a/gateway-release/home/templates/sandbox.knoxrealmdg.xml +++ b/gateway-release/home/templates/sandbox.knoxrealmdg.xml @@ -112,7 +112,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> <param> <name>group.principal.mapping</name> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-release/home/templates/staticgroup.xml ---------------------------------------------------------------------- diff --git a/gateway-release/home/templates/staticgroup.xml b/gateway-release/home/templates/staticgroup.xml index 2866b11..40ebbbd 100644 --- a/gateway-release/home/templates/staticgroup.xml +++ b/gateway-release/home/templates/staticgroup.xml @@ -125,7 +125,7 @@ <provider> <role>identity-assertion</role> - <name>Pseudo</name> + <name>Default</name> <enabled>true</enabled> <param> <name>group.principal.mapping</name> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-server/src/test/java/org/apache/hadoop/gateway/topology/xml/TopologyRulesModuleTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/hadoop/gateway/topology/xml/TopologyRulesModuleTest.java b/gateway-server/src/test/java/org/apache/hadoop/gateway/topology/xml/TopologyRulesModuleTest.java index a164aeb..06b5b2a 100644 --- a/gateway-server/src/test/java/org/apache/hadoop/gateway/topology/xml/TopologyRulesModuleTest.java +++ b/gateway-server/src/test/java/org/apache/hadoop/gateway/topology/xml/TopologyRulesModuleTest.java @@ -173,11 +173,11 @@ public class TopologyRulesModuleTest { assertThat( authenticationProvider.getParams().size(), is( 5 ) ); assertThat( authenticationProvider.getParams().get("main.ldapRealm.contextFactory.url"), is( "ldap://localhost:33389" ) ); - Provider identityAssertionProvider = topology.getProvider( "identity-assertion", "Pseudo" ); + Provider identityAssertionProvider = topology.getProvider( "identity-assertion", "Default" ); assertThat( identityAssertionProvider, notNullValue() ); assertThat( identityAssertionProvider.isEnabled(), is( false ) ); assertThat( identityAssertionProvider.getRole(), is( "identity-assertion" ) ); - assertThat( identityAssertionProvider.getName(), is( "Pseudo" ) ); + assertThat( identityAssertionProvider.getName(), is( "Default" ) ); assertThat( identityAssertionProvider.getParams().size(), is( 2 ) ); assertThat( identityAssertionProvider.getParams().get("name"), is( "user.name" ) ); } http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-ambari-format.conf ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-ambari-format.conf b/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-ambari-format.conf index 5df5aaa..849e1b6 100644 --- a/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-ambari-format.conf +++ b/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-ambari-format.conf @@ -45,15 +45,15 @@ <value>authcBasic</value> </property> <property> - <name>topology.gateway.provider.identity-assertion.Pseudo.enabled</name> + <name>topology.gateway.provider.identity-assertion.Default.enabled</name> <value>false</value> </property> <property> - <name>topology.gateway.provider.identity-assertion.Pseudo.param.name</name> + <name>topology.gateway.provider.identity-assertion.Default.param.name</name> <value>user.name</value> </property> <property> - <name>topology.gateway.provider.identity-assertion.Pseudo.param.principal.mapping</name> + <name>topology.gateway.provider.identity-assertion.Default.param.principal.mapping</name> <value>hdfs=lmccay;kminder=admin</value> </property> <property> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-knox-format.xml ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-knox-format.xml b/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-knox-format.xml index f325e11..46175d1 100644 --- a/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-knox-format.xml +++ b/gateway-server/src/test/resources/org/apache/hadoop/gateway/topology/xml/simple-topology-knox-format.xml @@ -49,7 +49,7 @@ <provider> <role>identity-assertion</role> <enabled>true</enabled> - <name>Pseudo</name> + <name>Default</name> <param> <name>name</name> <value>user.name</value> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java index 44a8847..efd02a2 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java @@ -151,7 +151,7 @@ public class GatewayAdminFuncTest { .addTag( "provider" ) .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .addTag( "provider" ) .gotoRoot() .addTag( "service" ) http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java index 35f3a8a..ff32a74 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java @@ -180,7 +180,7 @@ public class GatewayAdminTopologyFuncTest { .addTag( "provider" ) .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .addTag( "provider" ) .addTag( "role" ).addText( "authorization" ) .addTag( "enabled" ).addText( "true" ) @@ -230,7 +230,7 @@ public class GatewayAdminTopologyFuncTest { .addTag("provider") .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .addTag( "provider" ) .gotoRoot() .addTag( "service" ) @@ -446,7 +446,7 @@ public class GatewayAdminTopologyFuncTest { } Provider identityProvider = new Provider(); - identityProvider.setName("Pseudo"); + identityProvider.setName("Default"); identityProvider.setRole("identity-assertion"); identityProvider.setEnabled(true); http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java index 63b174c..c639a43 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java @@ -196,7 +196,7 @@ public class GatewayBasicFuncTest { .addTag( "provider" ) .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .addTag( "provider" ) .addTag( "role" ).addText( "authorization" ) .addTag( "enabled" ).addText( "true" ) http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java index ece095d..3535f43 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java @@ -163,7 +163,7 @@ public class GatewayDeployFuncTest { .addTag( "provider" ) .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .addTag( "provider" ) .gotoRoot() .addTag( "service" ) http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java index f9e37e5..6d7302a 100755 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java @@ -252,7 +252,7 @@ public class GatewayLdapDynamicGroupFuncTest { .gotoParent().gotoParent().addTag( "provider" ) .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .gotoRoot() .addTag( "service" ) http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java index 67d9f70..4446635 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java @@ -252,7 +252,7 @@ public class GatewayLdapGroupFuncTest { .gotoParent().gotoParent().addTag( "provider" ) .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .gotoRoot() .addTag( "service" ) http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java index 29ee982..5a40d77 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java @@ -155,7 +155,7 @@ public class GatewayLocalServiceFuncTest { .addTag( "provider" ) .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .addTag( "provider" ) .gotoRoot() .addTag( "service" ) http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java index 27304e0..21c088c 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java @@ -153,7 +153,7 @@ public class GatewaySampleFuncTest { .addTag( "provider" ) .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .addTag( "provider" ) .gotoRoot() .addTag( "service" ) http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java index 56f5b4f..c881687 100755 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java @@ -245,7 +245,7 @@ public class Knox242FuncTest { .gotoParent().gotoParent().addTag( "provider" ) .addTag( "role" ).addText( "identity-assertion" ) .addTag( "enabled" ).addText( "true" ) - .addTag( "name" ).addText( "Pseudo" ).gotoParent() + .addTag( "name" ).addText( "Default" ).gotoParent() .gotoRoot() .addTag( "service" ) http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java index 332fa80..6acc422 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java @@ -131,7 +131,7 @@ public class WebHdfsHaFuncTest { .addTag("provider") .addTag("role").addText("identity-assertion") .addTag("enabled").addText("true") - .addTag("name").addText("Pseudo").gotoParent() + .addTag("name").addText("Default").gotoParent() .addTag("provider") .addTag("role").addText("authorization") .addTag("enabled").addText("true") http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java index dbfa48d..3c6d8cf 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java @@ -203,7 +203,7 @@ public class DeploymentFactoryFuncTest { topology.addProvider( provider ); Provider asserter = new Provider(); asserter.setRole( "identity-assertion" ); - asserter.setName("Pseudo"); + asserter.setName("Default"); asserter.setEnabled( true ); topology.addProvider( asserter ); Provider authorizer = new Provider(); http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest/test-cluster.xml ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest/test-cluster.xml b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest/test-cluster.xml index 9d6299a..d3ca42d 100644 --- a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest/test-cluster.xml +++ b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest/test-cluster.xml @@ -55,7 +55,7 @@ or more contributor license agreements. See the NOTICE file <provider> <role>identity-assertion</role> <enabled>true</enabled> - <name>Pseudo</name> + <name>Default</name> </provider> <provider> <role>authorization</role> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/hsso-release/home/deployments/sample.xml ---------------------------------------------------------------------- diff --git a/hsso-release/home/deployments/sample.xml b/hsso-release/home/deployments/sample.xml index 645a6e3..474a45c 100644 --- a/hsso-release/home/deployments/sample.xml +++ b/hsso-release/home/deployments/sample.xml @@ -26,7 +26,7 @@ <provider> <role>identity-assertion</role> <enabled>true</enabled> - <name>Pseudo</name> + <name>Default</name> </provider> </gateway> http://git-wip-us.apache.org/repos/asf/knox/blob/08878143/hsso-release/home/templates/topology.xml ---------------------------------------------------------------------- diff --git a/hsso-release/home/templates/topology.xml b/hsso-release/home/templates/topology.xml index 251265d..d99a347 100644 --- a/hsso-release/home/templates/topology.xml +++ b/hsso-release/home/templates/topology.xml @@ -46,7 +46,7 @@ <provider> <role>identity-assertion</role> <enabled>true</enabled> - <name>Pseudo</name> + <name>Default</name> </provider> </gateway>