svn commit: r1497882 - in /oozie/trunk: docs/src/site/twiki/DG_UnifiedCredentialsModule.twiki release-log.txt

[rk...@apache.org]

Author: rkanter
Date: Fri Jun 28 18:57:03 2013
New Revision: 1497882

URL: http://svn.apache.org/r1497882
Log:
OOZIE-1427 Update CredentialsModule docs to mention Hive (rkanter)

Modified:
    oozie/trunk/docs/src/site/twiki/DG_UnifiedCredentialsModule.twiki
    oozie/trunk/release-log.txt

Modified: oozie/trunk/docs/src/site/twiki/DG_UnifiedCredentialsModule.twiki
URL: http://svn.apache.org/viewvc/oozie/trunk/docs/src/site/twiki/DG_UnifiedCredentialsModule.twiki?rev=1497882&r1=1497881&r2=1497882&view=diff
==============================================================================
--- oozie/trunk/docs/src/site/twiki/DG_UnifiedCredentialsModule.twiki (original)
+++ oozie/trunk/docs/src/site/twiki/DG_UnifiedCredentialsModule.twiki Fri Jun 28 18:57:03 2013
@@ -86,24 +86,28 @@ User has to add following configuration 
    </workflow-app>
 </verbatim>
 
----++ Changes in oozie-default.xml
+---++ Using the Unified Credentials Module
 
-If User wants to plugin the new Authentication module for their needs, they have to specify that in oozie-default.xml under the following property oozie.credentials.credentialclasses ABC=oorg.apache.oozie.action.hadoop.InsertTestToken
+If User wants to plugin the new Authentication module for their needs, they have to specify that in oozie-site.xml under the
+following property oozie.credentials.credentialclasses with a value of (for example)
+ABC=org.apache.oozie.action.hadoop.InsertTestToken
 
----++ Sample Insert Token class implementation
+<verbatim>
+   <property>
+      <name>oozie.credentials.credentialclasses</name>
+      <value>ABC=org.apache.oozie.action.hadoop.InsertTestToken</value>
+   </property>
+</verbatim>
+
+---+++ Sample Insert Token class implementation
 
 This is the sample class how users can write their Token class
 
 <verbatim>
-public class InsertTestToken extends Credentials{
-
+public class InsertTestToken extends Credentials {
+.
 public InsertTestToken() {
   }
-
-/* (non-Javadoc)
- * @see org.apache.oozie.action.hadoop.Credentials#addtoJobConf(org.apache.hadoop.mapred.JobConf, 
-              org.apache.oozie.action.hadoop.CredentialsProperties, org.apache.oozie.action.ActionExecutor.Context)
- */
 @Override
 public void addtoJobConf(JobConf jobconf, CredentialsProperties props, Context context) throws Exception {
     try {
@@ -119,6 +123,58 @@ public void addtoJobConf(JobConf jobconf
 }
 </verbatim>
 
+This could then be used in a workflow as follows:
+
+<verbatim>
+   <workflow-app xmlns='uri:oozie:workflow:0.1' name='pig-wf'>
+      ...
+      <credentials>
+	    <credential name='myauth' type='ABC'>
+	      <property>
+	        <name>property.for.my.auth</name>
+	        <value>some_value</value>
+	      </property>
+	    </credential>
+	  </credentials>
+	  ...
+      <action name='pig' cred='myauth'>
+        <pig>
+          <job-tracker>JT</job-tracker>
+          <name-node>NN</name-node>
+          ...
+        </pig>
+      </action>
+      ...
+   </workflow-app>
+</verbatim>
+
+---++ Built-in Credentials Implementations
+
+Oozie currently comes with two Credentials implementations:
+
+   1. HCatalog and Hive Metastore: =org.apache.oozie.action.hadoop.HCatCredentials=
+   1. HBase: =org.apache.oozie.action.hadoop.HBaseCredentials=
+
+HCatCredentials requires these two properties:
+
+   1. =hcat.metastore.principal=
+   1. =hcat.metastore.uri=
+
+*Note:* The HCatalog Metastore and Hive Metastore are one and the same and so the "hcat" type credential can also be used with the
+Hive action to talk to a secure Hive Metastore.
+
+To use either of these implementations, they must be set in the oozie.credentials.credentialclasses property as described previously
+
+<verbatim>
+   <property>
+      <name>oozie.credentials.credentialclasses</name>
+      <value>
+         hcat=org.apache.oozie.action.hadoop.HCatCredentials,
+         hive=org.apache.oozie.action.hadoop.HbaseCredentials
+      </value>
+   </property>
+</verbatim>
+
 [[index][::Go back to Oozie Documentation Index::]]
 
 </noautolink>
\ No newline at end of file

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1497882&r1=1497881&r2=1497882&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Jun 28 18:57:03 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1427 Update CredentialsModule docs to mention Hive (rkanter)
 OOZIE-1429 Fix bugs in SLA UI (rohini)
 OOZIE-1423 Coordinator job change command not removing SLA Registration bean (mona)
 OOZIE-1424 Improve SLA reliability on restart, fix bugs related to SLA and event generation (virag)