svn commit: r1160099 - in /oodt/trunk/balance/lib/pear: Core/Application.class.php Providers/Auth/ Providers/Authentication/ Providers/Authentication/LDAPAuthenticationProvider.class.php package.xml

[ah...@apache.org]

Author: ahart
Date: Mon Aug 22 03:28:05 2011
New Revision: 1160099

URL: http://svn.apache.org/viewvc?rev=1160099&view=rev
Log:
resolve OODT-299 by applying patch contributed by s.khudikyan

Added:
    oodt/trunk/balance/lib/pear/Providers/Authentication/
      - copied from r1160095, oodt/trunk/balance/lib/pear/Providers/Auth/
Removed:
    oodt/trunk/balance/lib/pear/Providers/Auth/
Modified:
    oodt/trunk/balance/lib/pear/Core/Application.class.php
    oodt/trunk/balance/lib/pear/Providers/Authentication/LDAPAuthenticationProvider.class.php
    oodt/trunk/balance/lib/pear/package.xml

Modified: oodt/trunk/balance/lib/pear/Core/Application.class.php
URL: http://svn.apache.org/viewvc/oodt/trunk/balance/lib/pear/Core/Application.class.php?rev=1160099&r1=1160098&r2=1160099&view=diff
==============================================================================
--- oodt/trunk/balance/lib/pear/Core/Application.class.php (original)
+++ oodt/trunk/balance/lib/pear/Core/Application.class.php Mon Aug 22 03:28:05 2011
@@ -33,7 +33,7 @@ class Org_Apache_Oodt_Balance_Core_Appli
 	
 	public $subrequest;
 	
-	public $authProviderInstance = null;
+	public $authenticationProviderInstance = null;
 	
 	public $authorizationProviderInstance = null;
 	
@@ -68,7 +68,7 @@ class Org_Apache_Oodt_Balance_Core_Appli
 	
 	public function getResponse() {
 		
-		$this->setAuthProviderInstance();
+		$this->setAuthenticationProviderInstance();
 		$this->setAuthorizationProviderInstance();
 		
 		// Interpret the request uri of the current request
@@ -123,19 +123,19 @@ class Org_Apache_Oodt_Balance_Core_Appli
 		return false;
 	}
 	
-	public function getAuthProvider() {
-		return $this->authProviderInstance;
+	public function getAuthenticationProvider() {
+		return $this->authenticationProviderInstance;
 	}
 	
-	public function setAuthProviderInstance() {
+	public function setAuthenticationProviderInstance() {
 		
 		// Check if the user wants authentication for application 
-		if ( $this->settings['auth_class_path'] != null &&
-			 $this->settings['auth_class']      != null   ) {
+		if ( $this->settings['authentication_class_path'] != null &&
+			 $this->settings['authentication_class']      != null   ) {
 			 	
-			 	require_once $this->settings['auth_class_path'];
-				$authProvider 		  		= $this->settings['auth_class'];
-				$this->authProviderInstance = new $authProvider();
+			 	require_once $this->settings['authentication_class_path'];
+				$authProvider = $this->settings['authentication_class'];
+				$this->authenticationProviderInstance = new $authProvider();
 		}
 	}
 	
@@ -145,7 +145,7 @@ class Org_Apache_Oodt_Balance_Core_Appli
 	
 	public function setAuthorizationProviderInstance() {
 		
-		// Check if the user wants authentication for application 
+		// Check if the user wants authorization for application 
 		if ( $this->settings['authorization_class_path'] != null &&
 			 $this->settings['authorization_class']      != null   ) {
 			 	

Modified: oodt/trunk/balance/lib/pear/Providers/Authentication/LDAPAuthenticationProvider.class.php
URL: http://svn.apache.org/viewvc/oodt/trunk/balance/lib/pear/Providers/Authentication/LDAPAuthenticationProvider.class.php?rev=1160099&r1=1160095&r2=1160099&view=diff
==============================================================================
--- oodt/trunk/balance/lib/pear/Providers/Authentication/LDAPAuthenticationProvider.class.php (original)
+++ oodt/trunk/balance/lib/pear/Providers/Authentication/LDAPAuthenticationProvider.class.php Mon Aug 22 03:28:05 2011
@@ -80,8 +80,8 @@ class Org_Apache_Oodt_Balance_Providers_
 	}
 	
 	public function changePassword( $newPassword ) {
-		if ( App::Get()->settings['auth_encryption_method'] ) {
-			return parent::changePassword( $newPassword, App::Get()->settings['auth_encryption_method'] );
+		if ( App::Get()->settings['authentication_encryption_method'] ) {
+			return parent::changePassword( $newPassword, App::Get()->settings['authentication_encryption_method'] );
 		}
 		return parent::changePassword( $newPassword );
 	}

Modified: oodt/trunk/balance/lib/pear/package.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/balance/lib/pear/package.xml?rev=1160099&r1=1160098&r2=1160099&view=diff
==============================================================================
--- oodt/trunk/balance/lib/pear/package.xml (original)
+++ oodt/trunk/balance/lib/pear/package.xml Mon Aug 22 03:28:05 2011
@@ -75,7 +75,7 @@
         <file name="IApplicationWidget.php" role="php"/>
       </dir>
       <dir name="Providers">
-        <dir name="Auth">
+        <dir name="Authentication">
           <file name="LDAPAuthenticationProvider.class.php" role="php"/>
         </dir>
         <dir name="Authorization">