You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2012/08/14 23:07:43 UTC
svn commit: r1373103 - in /incubator/oozie/trunk:
client/src/main/resources/oozie-workflow-0.4.xsd
docs/src/site/twiki/WorkflowFunctionalSpec.twiki release-log.txt
Author: tucu
Date: Tue Aug 14 21:07:43 2012
New Revision: 1373103
URL: http://svn.apache.org/viewvc?rev=1373103&view=rev
Log:
OOZIE-954 Global section xsd should allow job-xml elements and update documentation (rkanter via tucu)
Modified:
incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.4.xsd
incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.4.xsd
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.4.xsd?rev=1373103&r1=1373102&r2=1373103&view=diff
==============================================================================
--- incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.4.xsd (original)
+++ incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.4.xsd Tue Aug 14 21:07:43 2012
@@ -64,6 +64,7 @@
<xs:sequence>
<xs:element name="job-tracker" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="name-node" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="job-xml" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="configuration" type="workflow:CONFIGURATION" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
Modified: incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki?rev=1373103&r1=1373102&r2=1373103&view=diff
==============================================================================
--- incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki (original)
+++ incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki Tue Aug 14 21:07:43 2012
@@ -2252,7 +2252,7 @@ Examples of User-Retry in a workflow aci
---++ 19 Global Configurations
Oozie allows a global section to reduce the redundant job-tracker and name-node declarations for each action. The user can define
-a =global= section in the beginning of the workflow.xml . The global section may contain the configuration, job-tracker, or
+a =global= section in the beginning of the workflow.xml . The global section may contain the job-xml, configuration, job-tracker, or
name-node that the user would like to set for every action. If a user then redefines one of these in a specific action node,
Oozie will update use the specific declaration instead of the global one for that action.
@@ -2263,6 +2263,7 @@ Example of a global element:
<global>
<job-tracker>${job-tracker}</job-tracker>
<name-node>${namd-node}</name-node>
+ <job-xml>job1.xml</job-xml>
<configuration>
<property>
<name>mapred.job.queue.name</name>
@@ -2295,6 +2296,7 @@ Example of a global element:
<xs:complexType name="WORKFLOW-APP">
<xs:sequence>
<xs:element name="parameters" type="workflow:PARAMETERS" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="global" type="workflow:GLOBAL" minOccurs="0" maxOccurs="1"/>
<xs:element name="credentials" type="workflow:CREDENTIALS" minOccurs="0" maxOccurs="1"/>
<xs:element name="start" type="workflow:START" minOccurs="1" maxOccurs="1"/>
<xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -2324,6 +2326,15 @@ Example of a global element:
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="GLOBAL">
+ <xs:sequence>
+ <xs:element name="job-tracker" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="name-node" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="job-xml" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="configuration" type="workflow:CONFIGURATION" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
<xs:complexType name="START">
<xs:attribute name="to" type="workflow:IDENTIFIER" use="required"/>
</xs:complexType>
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1373103&r1=1373102&r2=1373103&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Tue Aug 14 21:07:43 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.0 release (trunk - unreleased)
+OOZIE-954 Global section xsd should allow job-xml elements and update documentation (rkanter via tucu)
OOZIE-951 Global section should make JT and NN optional (bcry via tucu)
OOZIE-948 Add support for Oozie coordinator to work in an UTC offset (tucu)
OOZIE-926 handling of global configuration is not correct (bcyr via tucu)