knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject git commit: KNOX-437: KnoxLdapContextFactory should be configured by default in all topology files
Date Fri, 03 Oct 2014 02:22:22 GMT
Repository: knox
Updated Branches:
  refs/heads/master 17ec36714 -> 974312ead


KNOX-437: KnoxLdapContextFactory should be configured by default in all topology files


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

Branch: refs/heads/master
Commit: 974312ead08db421ce2df614419c3d83e4c61be5
Parents: 17ec367
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Thu Oct 2 22:22:16 2014 -0400
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Thu Oct 2 22:22:16 2014 -0400

----------------------------------------------------------------------
 build.xml                                                    | 8 ++++++++
 gateway-release/home/conf/topologies/admin.xml               | 8 ++++++++
 gateway-release/home/conf/topologies/sandbox.xml             | 8 ++++++++
 gateway-release/home/samples/sandbox-with-knox-inside.xml    | 8 ++++++++
 gateway-release/home/templates/ad.xml                        | 8 ++++++++
 gateway-release/home/templates/sample.xml                    | 8 ++++++++
 gateway-release/home/templates/sandbox-1-3.xml               | 8 ++++++++
 .../gateway/GatewayAdminTopologyFuncTest/test-cluster.xml    | 8 ++++++++
 hsso-release/home/templates/topology.xml                     | 8 ++++++++
 9 files changed, 72 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/974312ea/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c81532d..35d9d55 100644
--- a/build.xml
+++ b/build.xml
@@ -82,6 +82,14 @@
         </exec>
     </target>
 
+    <target name="build-notest" depends="_init" description="Build the product without
running tests.">
+        <exec executable="${mvn.cmd}">
+            <arg value="-DskipTests"/>
+            <arg value="clean"/>
+            <arg value="install"/>
+        </exec>
+    </target>
+
     <target name="verify" depends="package" description="Perform the verification build."/>
     <target name="package" depends="_init" description="Build and package the product
(aka verify).">
         <exec executable="${mvn.cmd}">

http://git-wip-us.apache.org/repos/asf/knox/blob/974312ea/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 e844fc7..2f3d9a9 100644
--- a/gateway-release/home/conf/topologies/admin.xml
+++ b/gateway-release/home/conf/topologies/admin.xml
@@ -37,6 +37,14 @@
                 <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
             </param>
             <param>
+                <name>main.ldapContextFactory</name>
+                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value>
+            </param>
+            <param>
+                <name>main.ldapRealm.contextFactory</name>
+                <value>$ldapContextFactory</value>
+            </param>
+            <param>
                 <name>main.ldapRealm.userDnTemplate</name>
                 <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>

http://git-wip-us.apache.org/repos/asf/knox/blob/974312ea/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 c1a399a..2aaaf10 100644
--- a/gateway-release/home/conf/topologies/sandbox.xml
+++ b/gateway-release/home/conf/topologies/sandbox.xml
@@ -37,6 +37,14 @@
                 <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
             </param>
             <param>
+                <name>main.ldapContextFactory</name>
+                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value>
+            </param>
+            <param>
+                <name>main.ldapRealm.contextFactory</name>
+                <value>$ldapContextFactory</value>
+            </param>
+            <param>
                 <name>main.ldapRealm.userDnTemplate</name>
                 <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>

http://git-wip-us.apache.org/repos/asf/knox/blob/974312ea/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 efcd2be..9c92ead 100644
--- a/gateway-release/home/samples/sandbox-with-knox-inside.xml
+++ b/gateway-release/home/samples/sandbox-with-knox-inside.xml
@@ -27,6 +27,14 @@
                 <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
             </param>
             <param>
+                <name>main.ldapContextFactory</name>
+                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value>
+            </param>
+            <param>
+                <name>main.ldapRealm.contextFactory</name>
+                <value>$ldapContextFactory</value>
+            </param>
+            <param>
                 <name>main.ldapRealm.userDnTemplate</name>
                 <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>

http://git-wip-us.apache.org/repos/asf/knox/blob/974312ea/gateway-release/home/templates/ad.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/ad.xml b/gateway-release/home/templates/ad.xml
index 589293d..8586a61 100644
--- a/gateway-release/home/templates/ad.xml
+++ b/gateway-release/home/templates/ad.xml
@@ -37,6 +37,14 @@
                 <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
             </param>
             <param>
+                <name>main.ldapContextFactory</name>
+                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value>
+            </param>
+            <param>
+                <name>main.ldapRealm.contextFactory</name>
+                <value>$ldapContextFactory</value>
+            </param>
+            <param>
                 <name>main.ldapRealm.userDnTemplate</name>
                 <!-- If your AD is configured to authenticate based on just the cn and
password and does not require user DN, 
                     you do not have to specify value for  main.ldapRealm.userDnTemplate.
-->

http://git-wip-us.apache.org/repos/asf/knox/blob/974312ea/gateway-release/home/templates/sample.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/sample.xml b/gateway-release/home/templates/sample.xml
index 78dfe30..2544e85 100644
--- a/gateway-release/home/templates/sample.xml
+++ b/gateway-release/home/templates/sample.xml
@@ -28,6 +28,14 @@
                 <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
             </param>
             <param>
+                <name>main.ldapContextFactory</name>
+                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value>
+            </param>
+            <param>
+                <name>main.ldapRealm.contextFactory</name>
+                <value>$ldapContextFactory</value>
+            </param>
+            <param>
                 <name>main.ldapRealm.userDnTemplate</name>
                 <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>

http://git-wip-us.apache.org/repos/asf/knox/blob/974312ea/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 c676813..d3f7090 100644
--- a/gateway-release/home/templates/sandbox-1-3.xml
+++ b/gateway-release/home/templates/sandbox-1-3.xml
@@ -28,6 +28,14 @@
                 <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
             </param>
             <param>
+                <name>main.ldapContextFactory</name>
+                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value>
+            </param>
+            <param>
+                <name>main.ldapRealm.contextFactory</name>
+                <value>$ldapContextFactory</value>
+            </param>
+            <param>
                 <name>main.ldapRealm.userDnTemplate</name>
                 <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>

http://git-wip-us.apache.org/repos/asf/knox/blob/974312ea/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 d3ca42d..23de346 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
@@ -36,6 +36,14 @@ or more contributor license agreements.  See the NOTICE file
                 <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
             </param>
             <param>
+                <name>main.ldapContextFactory</name>
+                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value>
+            </param>
+            <param>
+                <name>main.ldapRealm.contextFactory</name>
+                <value>$ldapContextFactory</value>
+            </param>
+            <param>
                 <name>main.ldapRealm.userDnTemplate</name>
                 <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>

http://git-wip-us.apache.org/repos/asf/knox/blob/974312ea/hsso-release/home/templates/topology.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/templates/topology.xml b/hsso-release/home/templates/topology.xml
index d99a347..06f3ae6 100644
--- a/hsso-release/home/templates/topology.xml
+++ b/hsso-release/home/templates/topology.xml
@@ -27,6 +27,14 @@
                 <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
             </param>
             <param>
+                <name>main.ldapContextFactory</name>
+                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value>
+            </param>
+            <param>
+                <name>main.ldapRealm.contextFactory</name>
+                <value>$ldapContextFactory</value>
+            </param>
+            <param>
                 <name>main.ldapRealm.userDnTemplate</name>
                 <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>


Mime
View raw message