Browse Source

[oozie] Adding a Bundle example to the New Editor

Romain Rigaux 10 years ago
parent
commit
3992bf3

+ 0 - 0
apps/oozie/examples/bundles/copy-files/empty


File diff suppressed because it is too large
+ 0 - 0
apps/oozie/src/oozie/fixtures/initial_oozie_examples.json


+ 5 - 2
apps/oozie/src/oozie/models2.py

@@ -1871,7 +1871,7 @@ class Bundle(Job):
               'deployment_dir': '',
               'schema_version': 'uri:oozie:bundle:0.2',
               'kickoff': datetime.today(),
-              'parameters': [{'name': 'oozie.use.system.libpath', 'value': True}]
+              'parameters': [{'name': 'oozie.use.system.libpath', 'value': 'true'}]
           }
       }
 
@@ -1956,7 +1956,10 @@ class Bundle(Job):
     for param in find_json_parameters([self.data['properties']]):
       params.add(param)
 
-    return dict([(param, '') for param in list(params)])
+    # Remove the ones filled up by bundle
+    removable_names = [p['name']  for coord in self.data['coordinators'] for p in coord['properties']]
+
+    return dict([(param, '') for param in list(params) if param not in removable_names])
 
   def get_absolute_url(self):
     return reverse('oozie:edit_bundle') + '?bundle=%s' % self.id

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/gen/bundle.xml.mako

@@ -28,7 +28,7 @@
     % for p in bundle.data['properties']['parameters']:
     <property>
         <name>${ p['name'] }</name>
-        <value>${ json.dumps(p['value']) }</value>
+        <value>${ p['value'] }</value>
     </property>
     % endfor
   </parameters>

+ 2 - 0
desktop/core/src/desktop/models.py

@@ -337,6 +337,8 @@ class DocumentManager(models.Manager):
               extra = 'workflow2'
             elif job.type == 'oozie-coordinator2':
               extra = 'coordinator2'
+            elif job.type == 'oozie-bundle2':
+              extra = 'bundle2'
             else:
               extra = ''
             doc = Document.objects.link(job, owner=job.owner, name=job.name, description=job.description, extra=extra)

Some files were not shown because too many files changed in this diff