knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dillido...@apache.org
Subject git commit: KNOX-238 : comment out optional shiro attributes in topology template files
Date Thu, 02 Jan 2014 22:04:27 GMT
Updated Branches:
  refs/heads/master 539b13f8b -> eaf6a0806


KNOX-238 : comment out optional shiro attributes in topology template files


Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/eaf6a080
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/eaf6a080
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/eaf6a080

Branch: refs/heads/master
Commit: eaf6a08069e0caa2d9efca1b9489fef5d00a44f0
Parents: 539b13f
Author: Dilli Dorai Arumugam <darumugam@hortonworks.com>
Authored: Thu Jan 2 14:02:39 2014 -0800
Committer: Dilli Dorai Arumugam <darumugam@hortonworks.com>
Committed: Thu Jan 2 14:02:39 2014 -0800

----------------------------------------------------------------------
 .../home/templates/sandbox.knoxrealm.xml        | 14 ++++++----
 .../home/templates/sandbox.knoxrealm1.xml       | 27 ++++++++++++------
 .../home/templates/sandbox.knoxrealm2.xml       | 29 ++++++++++++++------
 .../home/templates/sandbox.knoxrealmdg.xml      |  2 +-
 4 files changed, 50 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/eaf6a080/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 f05fe31..50451c0 100644
--- a/gateway-release/home/templates/sandbox.knoxrealm.xml
+++ b/gateway-release/home/templates/sandbox.knoxrealm.xml
@@ -23,15 +23,17 @@
             <role>authentication</role>
             <name>ShiroProvider</name>
             <enabled>true</enabled>
+            <!-- 
+            session timeout in minutes,  this is really idle timeout,
+            defaults to 30mins, if the property value is not defined,, 
+            current client authentication would expire if client idles contiuosly for more
than this value
+            -->
+            <!-- defaults to: 30 minutes
             <param>
-                <!-- 
-                session timeout in minutes,  this is really idle timeout,
-                defaults to 30mins, if the property value is not defined,, 
-                current client authentication would expire if client idles contiuosly for
more than this value
-                -->
                 <name>sessionTimeout</name>
                 <value>30</value>
             </param>
+            -->
 
             <!--
               Use KnoxLdapRealm for authentication, no ldap groups looked up
@@ -48,10 +50,12 @@
               <name>main.ldapRealm.contextFactory</name>
               <value>$ldapGroupContextFactory</value>
             </param>
+            <!-- defaults to: simple
             <param>
               <name>main.ldapRealm.contextFactory.authenticationMechanism</name>
               <value>simple</value>
             </param>
+            -->
             <param>
               <name>main.ldapRealm.contextFactory.url</name>
               <value>ldap://localhost:33389</value>

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/eaf6a080/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 645e36f..51fb555 100644
--- a/gateway-release/home/templates/sandbox.knoxrealm1.xml
+++ b/gateway-release/home/templates/sandbox.knoxrealm1.xml
@@ -23,15 +23,17 @@
             <role>authentication</role>
             <name>ShiroProvider</name>
             <enabled>true</enabled>
+            <!-- 
+            session timeout in minutes,  this is really idle timeout,
+            defaults to 30mins, if the property value is not defined,, 
+            current client authentication would expire if client idles contiuosly for more
than this value
+            -->
+            <!-- defaults to: 30 minutes
             <param>
-                <!-- 
-                session timeout in minutes,  this is really idle timeout,
-                defaults to 30mins, if the property value is not defined,, 
-                current client authentication would expire if client idles contiuosly for
more than this value
-                -->
                 <name>sessionTimeout</name>
                 <value>30</value>
             </param>
+            -->
 
             <!--
               Use single KnoxLdapRealm to do authentication and ldap group look up
@@ -48,10 +50,12 @@
               <name>main.ldapRealm.contextFactory</name>
               <value>$ldapGroupContextFactory</value>
             </param>
+            <!-- defaults to: simple
             <param>
               <name>main.ldapRealm.contextFactory.authenticationMechanism</name>
               <value>simple</value>
             </param>
+            -->
             <param>
               <name>main.ldapRealm.contextFactory.url</name>
               <value>ldap://localhost:33389</value>
@@ -63,26 +67,33 @@
 
             <param>
               <name>main.ldapRealm.authorizationEnabled</name>
+              <!-- defaults to: false -->
               <value>true</value>
             </param>
+            <!-- defaults to: simple
             <param>
               <name>main.ldapRealm.contextFactory.systemAuthenticationMechanism</name>
               <value>simple</value>
             </param>
+            -->
             <param>
               <name>main.ldapRealm.searchBase</name>
               <value>ou=groups,dc=hadoop,dc=apache,dc=org</value>
             </param>
+            <!-- defaults to: groupOfNames
             <param>
               <name>main.ldapRealm.groupObjectClass</name>
-              <value>groupofnames</value>
+              <value>groupOfNames</value>
             </param>
+            -->
+            <!-- defaults to: member
             <param>
-              <name>main.ldapRealm.uniqueMemberAttribute</name>
+              <name>main.ldapRealm.memberAttribute</name>
               <value>member</value>
             </param>
+            -->
             <param>
-              <name>main.ldapRealm.uniqueMemberAttributeValueTemplate</name>
+              <name>main.ldapRealm.memberAttributeValueTemplate</name>
               <value>cn={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>
             <param>

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/eaf6a080/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 6db35ef..448691f 100644
--- a/gateway-release/home/templates/sandbox.knoxrealm2.xml
+++ b/gateway-release/home/templates/sandbox.knoxrealm2.xml
@@ -23,15 +23,17 @@
             <role>authentication</role>
             <name>ShiroProvider</name>
             <enabled>true</enabled>
+            <!-- 
+            session timeout in minutes,  this is really idle timeout,
+            defaults to 30mins, if the property value is not defined,, 
+            current client authentication would expire if client idles contiuosly for more
than this value
+            -->
+            <!-- defaults to: 30 minutes
             <param>
-                <!-- 
-                session timeout in minutes,  this is really idle timeout,
-                defaults to 30mins, if the property value is not defined,, 
-                current client authentication would expire if client idles contiuosly for
more than this value
-                -->
                 <name>sessionTimeout</name>
                 <value>30</value>
             </param>
+            -->
 
             <!--
               Use one KnoxLdapRealm for authentication and another KnoxLdapRealm for ldap
group look up
@@ -48,10 +50,12 @@
               <name>main.ldapRealm.contextFactory</name>
               <value>$ldapContextFactory</value>
             </param>
+            <!-- defaults to: simple
             <param>
               <name>main.ldapRealm.contextFactory.authenticationMechanism</name>
               <value>simple</value>
             </param>
+            -->
             <param>
               <name>main.ldapRealm.contextFactory.url</name>
               <value>ldap://localhost:33389</value>
@@ -77,10 +81,12 @@
               <name>main.ldapGroupRealm.contextFactory</name>
               <value>$ldapGroupContextFactory</value>
             </param>
+            <!-- defaults to: simple
             <param>
               <name>main.ldapGroupRealm.contextFactory.authenticationMechanism</name>
               <value>simple</value>
             </param>
+            -->
             <param>
               <name>main.ldapGroupRealm.contextFactory.url</name>
               <value>ldap://localhost:33389</value>
@@ -91,26 +97,33 @@
             </param>
             <param>
               <name>main.ldapGroupRealm.authorizationEnabled</name>
+              <!-- defaults to: false -->
               <value>true</value>
             </param>
+            <!-- defaults to: simple 
             <param>
               <name>main.ldapGroupRealm.contextFactory.systemAuthenticationMechanism</name>
               <value>simple</value>
             </param>
+            -->
             <param>
               <name>main.ldapGroupRealm.searchBase</name>
               <value>ou=groups,dc=hadoop,dc=apache,dc=org</value>
             </param>
+            <!-- defaults to: groupOfNames
             <param>
               <name>main.ldapGroupRealm.groupObjectClass</name>
-              <value>groupofnames</value>
+              <value>groupOfNames</value>
             </param>
+            -->
+            <!-- defaults to: member
             <param>
-              <name>main.ldapGroupRealm.uniqueMemberAttribute</name>
+              <name>main.ldapGroupRealm.memberAttribute</name>
               <value>member</value>
             </param>
+            -->
             <param>
-              <name>main.ldapGroupRealm.uniqueMemberAttributeValueTemplate</name>
+              <name>main.ldapGroupRealm.memberAttributeValueTemplate</name>
               <value>cn={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>
             <param>

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/eaf6a080/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 e6469b3..5123877 100755
--- a/gateway-release/home/templates/sandbox.knoxrealmdg.xml
+++ b/gateway-release/home/templates/sandbox.knoxrealmdg.xml
@@ -28,7 +28,7 @@
             defaults to 30mins, if the property value is not defined,, 
             current client authentication would expire if client idles contiuosly for more
than this value
             -->
-            <!--
+            <!-- defaults to: 30 minutes
             <param>
                 <name>sessionTimeout</name>
                 <value>30</value>


Mime
View raw message