Romain Rigaux 12 жил өмнө
parent
commit
767bcf9eb0

+ 2 - 2
apps/oozie/src/oozie/conf.py

@@ -53,14 +53,14 @@ SHARE_JOBS = Config(
   key='share_jobs',
   default=True,
   type=coerce_bool,
-  help=_t('Share workflows and coordinators information with all users. If set to false, '
+  help=_t('Share workflows, coordinators and bundles information with all users. If set to false, '
          'they will be visible only to the owner and administrators.'))
 
 OOZIE_JOBS_COUNT = Config(
   key='oozie_jobs_count',
   default=100,
   type=int,
-  help=_t('Maximum number of Oozie workflows or coodinators to retrieve in one API call.'))
+  help=_t('Maximum number of Oozie workflows or coodinators or bundles to retrieve in one API call.'))
 
 
 def config_validator(user):

+ 1 - 1
apps/oozie/src/oozie/models.py

@@ -1263,7 +1263,7 @@ class Coordinator(Job):
                                  help_text=_t('The materialization or creation throttle value for its coordinator actions. '
                                               'How many maximum coordinator actions are allowed to be in WAITING state concurrently.'))
   job_properties = models.TextField(default='[]', verbose_name=_t('Workflow properties'),
-                                    help_text=_t('Configuration properties to transmit to the workflow (e.g. limit=100, username=${coord:user()})'))
+                                    help_text=_t('Configuration properties to transmit to the workflow, e.g. limit=100, and EL functions, e.g. username=${coord:user()}'))
 
   objects = TrashManager()
 

+ 1 - 1
apps/oozie/src/oozie/templates/editor/coordinator_properties.mako

@@ -37,7 +37,7 @@
         <tbody data-bind="foreach: ${ element }">
           <tr>
             <td><input type="text" class="required" data-bind="value: name, uniqueName: false" /></td>
-            <td><input type="text" class="required" data-bind="value: value, uniqueName: false" /></td>
+            <td><input type="text" class="required input-xxlarge" data-bind="value: value, uniqueName: false" /></td>
             <td><a class="btn btn-small" href="#" data-bind="click: $root.remove_${ element }">${ _('Delete') }</a></td>
           </tr>
         </tbody>

+ 4 - 4
apps/oozie/src/oozie/templates/editor/edit_coordinator.mako

@@ -256,16 +256,16 @@ ${ layout.menubar(section='coordinators') }
             <div class="alert alert-info"><h3>${ _('Advanced settings') }</h3></div>
             ${ properties.print_key_value(coordinator_form['parameters'], 'parameters') }
             ${ properties.print_key_value(coordinator_form['job_properties'], 'job_properties') }
-            ${ utils.render_field_no_popover(coordinator_form['timeout']) }
+            ${ utils.render_field(coordinator_form['timeout']) }
             <div class="row-fluid">
               <div class="span6">
-                ${ utils.render_field_no_popover(coordinator_form['concurrency']) }
+                ${ utils.render_field(coordinator_form['concurrency']) }
               </div>
               <div class="span6">
-                ${ utils.render_field_no_popover(coordinator_form['throttle']) }
+                ${ utils.render_field(coordinator_form['throttle']) }
               </div>
             </div>
-            ${ utils.render_field_no_popover(coordinator_form['execution']) }
+            ${ utils.render_field(coordinator_form['execution']) }
             ${ coordinator_form['schema_version'] | n,unicode }
           </div>
 

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_bundles.mako

@@ -1,4 +1,4 @@
-s## Licensed to Cloudera, Inc. under one
+## Licensed to Cloudera, Inc. under one
 ## or more contributor license agreements.  See the NOTICE file
 ## distributed with this work for additional information
 ## regarding copyright ownership.  Cloudera, Inc. licenses this file

+ 2 - 0
apps/pig/src/pig/tests.py

@@ -132,7 +132,9 @@ class TestWithHadoop(OozieBase):
 
   def setUp(self):
     super(TestWithHadoop, self).setUp()
+    self.c = make_logged_in_client(is_superuser=False)
     grant_access("test", "test", "pig")
+    self.user = User.objects.get(username='test')
     self.c.post(reverse('pig:install_examples'))
 
   def test_create_workflow(self):

+ 1 - 1
desktop/conf.dist/hue.ini

@@ -179,7 +179,7 @@
     ## port=
     ## user=
     ## password=
-    ## name=
+    ## name=desktop/desktop.db
 
 
   # Configuration options for connecting to an external SMTP server

+ 1 - 1
desktop/conf/pseudo-distributed.ini.tmpl

@@ -185,7 +185,7 @@
     ## port=
     ## user=
     ## password=
-    ## name=
+    ## name=desktop/desktop.db
 
 
   # Configuration options for connecting to an external SMTP server

+ 1 - 1
desktop/core/src/desktop/settings.py

@@ -286,4 +286,4 @@ os.environ['KRB5CCNAME'] = desktop.conf.KERBEROS.CCACHE_PATH.get()
 
 #######
 if desktop.conf.AUTH.USER_GROUP_MEMBERSHIP_SYNCHRONIZATION_BACKEND.get():
-  MIDDLEWARE_CLASSES.append('desktop.middleware.UserGroupSynchronizationMiddleware')
+  MIDDLEWARE_CLASSES.append('desktop.middleware.UserGroupSynchronizationMiddleware')

+ 33 - 10
dist/README

@@ -1,17 +1,33 @@
+=========================================
+          Hue - Hadoop UI
+=========================================
+
 Instructions to install the tarball release of Hue are available
-in the manual from the website where you downloaded Hue.
+in the manual from http://gethue.com.
 
 If you're impatient, these are the key steps.  Please check the full manual
 for more details.
 
-## Install
-$ PREFIX=/usr/share make install
-$ sudo chmod 4750 $PREFIX/hue/apps/shell/src/shell/build/setui
-$ sudo chown root:$USER $PREFIX/hue/apps/shell/src/shell/build/setui
 
-## Install plug-ins
-$ cd /usr/lib/hadoop-0.20-mapreduce/lib
-$ ln -s /usr/share/hue/desktop/libs/hadoop/java-lib/hue*jar
+Install
+-------
+## Install in any directory, e.g. /home/hue, /usr/share, /home/my_user
+PREFIX=/usr/share make install
+
+
+## If you don't have the permissions, you will need to 'sudo' the command and
+## make sure that the 'hue' user has write access to the 'logs' directory and 'desktop/desktop.db'.
+
+## Run!
+$ /usr/share/hue/build/env/bin/supervisor
+
+
+Configure Hadoop
+----------------
+
+## Install JobTracker plug-in
+cd /usr/lib/hadoop-0.20-mapreduce/lib
+ln -s /usr/share/hue/desktop/libs/hadoop/java-lib/hue*jar
 
 ## Configure Hadoop
 Edit hdfs-site.xml:
@@ -30,5 +46,12 @@ Edit mapred-site.xml:
   </description>
 </property>
 
-## Run!
-$ /usr/share/hue/build/env/bin/supervisor
+
+Problems?
+---------
+
+Search or ask questions on the forum and http://groups.google.com/a/cloudera.org/group/hue-user
+
+Some packages might be required during the 'make install': https://github.com/cloudera/hue#development-prerequisites)
+
+Download a pre-built packaged version of Hue on http://gethue.com