Index: services.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/services/services.module,v
retrieving revision 1.8.2.88.2.19
diff -u -p -r1.8.2.88.2.19 services.module
--- services.module	21 May 2010 05:06:58 -0000	1.8.2.88.2.19
+++ services.module	24 Jun 2010 06:44:11 -0000
@@ -378,7 +378,16 @@ function services_auth_invoke_custom($mo
 function services_method_call($method_name, $args = array(), $browsing = FALSE) {
   // Allow external modules to log the results of this service call
   module_invoke_all('services_method_call', $method_name, $args, $browsing);
-
+  
+  // If we're dealing with a resource, we need to convert it.
+  if(isset($method_name['resource_type'])) {
+    module_load_include('inc', 'services', 
+	'services.resource-translation');
+    
+    $method_name = _services_resource_controller_as_service(
+    $method_name['resource_name'], $method_name['resource_type'] , 
+    $method_name, $method_name['file']);
+  }
   if (is_array($method_name) && isset($method_name['callback'])) {
     $method = $method_name;
   }
Index: auth/services_keyauth/services_keyauth.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/services/auth/services_keyauth/Attic/services_keyauth.inc,v
retrieving revision 1.1.2.8.2.16
diff -u -p -r1.1.2.8.2.16 services_keyauth.inc
--- auth/services_keyauth/services_keyauth.inc	21 May 2010 04:47:19 -0000	1.1.2.8.2.16
+++ auth/services_keyauth/services_keyauth.inc	24 Jun 2010 06:44:11 -0000
@@ -69,18 +69,21 @@ function _services_keyauth_alter_methods
     'name' => 'sessid',
     'type' => 'string',
     'description' => t('A valid sessid.'),
+    'source' => array('param' => 'sessid'),
   );
 
   $arg_domain_time_stamp = array(
     'name' => 'domain_time_stamp',
     'type' => 'string',
     'description' => t('Time stamp used to hash key.'),
+    'source' => array('param' => 'domain_time_stamp'),
   );
 
   $arg_nonce = array(
     'name' => 'nonce',
     'type' => 'string',
     'description' => t('One time use nonce also used hash key.'),
+    'source' => array('param' => 'nonce'),
   );
 
   // domain arg
@@ -88,13 +91,15 @@ function _services_keyauth_alter_methods
     'name' => 'domain_name',
     'type' => 'string',
     'description' => t('A valid domain for the API key.'),
+    'source' => array('param' => 'domain_name'),
   );
 
   // api_key arg
   $arg_api_key = array(
     'name' => 'hash',
     'type' => 'string',
     'description' => t('An SHA-256 hash of the timestamp, domain, nonce, and method name delimited by semicolons and using the remote API key as the shared key.'),
+    'source' => array('param' => 'hash'),
   );
 
   foreach ($methods as $key => &$method) {
