Author: tucu
Date: Fri Apr 27 23:12:54 2012
New Revision: 1331629
URL: http://svn.apache.org/viewvc?rev=1331629&view=rev
Log:
OOZIE-817 Fix the unreasonable definition of the schema to fs action (yians via
tucu)
Modified:
incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.1.xsd
incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.5.xsd
incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.xsd
incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.3.xsd
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
incubator/oozie/trunk/core/src/test/resources/wf-schema-valid.xml
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.1.xsd
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.1.xsd?rev=1331629&r1=1331628&r2=1331629&view=diff
==============================================================================
--- incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.1.xsd
(original)
+++ incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.1.xsd Fri
Apr 27 23:12:54 2012
@@ -183,12 +183,12 @@
</xs:complexType>
<xs:complexType name="FS">
- <xs:sequence>
- <xs:element name="delete" type="workflow:DELETE" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="mkdir" type="workflow:MKDIR" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="move" type="workflow:MOVE" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="chmod" type="workflow:CHMOD" minOccurs="0"
maxOccurs="unbounded"/>
- </xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="delete" type="workflow:DELETE"/>
+ <xs:element name="mkdir" type="workflow:MKDIR"/>
+ <xs:element name="move" type="workflow:MOVE"/>
+ <xs:element name="chmod" type="workflow:CHMOD"/>
+ </xs:choice>
</xs:complexType>
<xs:complexType name="HTTP">
Modified:
incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.5.xsd
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.5.xsd?rev=1331629&r1=1331628&r2=1331629&view=diff
==============================================================================
--- incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.5.xsd
(original)
+++ incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.5.xsd
Fri Apr 27 23:12:54 2012
@@ -175,12 +175,12 @@
</xs:complexType>
<xs:complexType name="FS">
- <xs:sequence>
- <xs:element name="delete" type="workflow:DELETE" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="mkdir" type="workflow:MKDIR" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="move" type="workflow:MOVE" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="chmod" type="workflow:CHMOD" minOccurs="0"
maxOccurs="unbounded"/>
- </xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="delete" type="workflow:DELETE"/>
+ <xs:element name="mkdir" type="workflow:MKDIR"/>
+ <xs:element name="move" type="workflow:MOVE"/>
+ <xs:element name="chmod" type="workflow:CHMOD"/>
+ </xs:choice>
</xs:complexType>
<xs:complexType name="JAVA">
Modified: incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.xsd
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.xsd?rev=1331629&r1=1331628&r2=1331629&view=diff
==============================================================================
--- incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.xsd
(original)
+++ incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.2.xsd Fri
Apr 27 23:12:54 2012
@@ -173,12 +173,12 @@
</xs:complexType>
<xs:complexType name="FS">
- <xs:sequence>
- <xs:element name="delete" type="workflow:DELETE" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="mkdir" type="workflow:MKDIR" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="move" type="workflow:MOVE" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="chmod" type="workflow:CHMOD" minOccurs="0"
maxOccurs="unbounded"/>
- </xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="delete" type="workflow:DELETE"/>
+ <xs:element name="mkdir" type="workflow:MKDIR"/>
+ <xs:element name="move" type="workflow:MOVE"/>
+ <xs:element name="chmod" type="workflow:CHMOD"/>
+ </xs:choice>
</xs:complexType>
<xs:complexType name="JAVA">
Modified: incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.3.xsd
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.3.xsd?rev=1331629&r1=1331628&r2=1331629&view=diff
==============================================================================
--- incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.3.xsd
(original)
+++ incubator/oozie/trunk/client/src/main/resources/oozie-workflow-0.3.xsd Fri
Apr 27 23:12:54 2012
@@ -177,12 +177,12 @@
</xs:complexType>
<xs:complexType name="FS">
- <xs:sequence>
- <xs:element name="delete" type="workflow:DELETE" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="mkdir" type="workflow:MKDIR" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="move" type="workflow:MOVE" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="chmod" type="workflow:CHMOD" minOccurs="0"
maxOccurs="unbounded"/>
- </xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="delete" type="workflow:DELETE"/>
+ <xs:element name="mkdir" type="workflow:MKDIR"/>
+ <xs:element name="move" type="workflow:MOVE"/>
+ <xs:element name="chmod" type="workflow:CHMOD"/>
+ </xs:choice>
</xs:complexType>
<xs:complexType name="JAVA">
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java?rev=1331629&r1=1331628&r2=1331629&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
Fri Apr 27 23:12:54 2012
@@ -284,7 +284,11 @@ public class TestLiteWorkflowAppService
assertEquals("b", app.getNode("e").getTransitions().get(1));
assertTrue(app.getNode("e").getConf().startsWith("<pig"));
- assertEquals("z", app.getNode("f").getTransitions().get(0));
+ assertEquals("g", app.getNode("f").getTransitions().get(0));
+
+ assertEquals("z", app.getNode("g").getTransitions().get(0));
+ assertEquals("b", app.getNode("g").getTransitions().get(1));
+ assertTrue(app.getNode("g").getConf().startsWith("<fs"));
assertNotNull(app.getNode("z"));
}
Modified: incubator/oozie/trunk/core/src/test/resources/wf-schema-valid.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/resources/wf-schema-valid.xml?rev=1331629&r1=1331628&r2=1331629&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/resources/wf-schema-valid.xml (original)
+++ incubator/oozie/trunk/core/src/test/resources/wf-schema-valid.xml Fri Apr
27 23:12:54 2012
@@ -90,7 +90,20 @@
<error to="b"/>
</action>
- <join name="f" to="z"/>
+ <join name="f" to="g"/>
+
+ <action name="g">
+ <fs>
+ <mkdir path='/tmp'/>
+ <chmod path='/tmp' permissions='-rwxrw-rw-' dir-files='false'/>
+ <move source='/tmp' target='/tmp2'/>
+ <delete path='/tmp2'/>
+ <mkdir path='/tmp3'/>
+ <delete path='/tmp3'/>
+ </fs>
+ <ok to="z"/>
+ <error to="b"/>
+ </action>
<end name="z"/>
</workflow-app>
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1331629&r1=1331628&r2=1331629&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Fri Apr 27 23:12:54 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-817 Fix the unreasonable definition of the schema to fs action (yians
via tucu)
OOZIE-820 OOZIE-820 Shell action to support env-var value with = sign (mona
via tucu)
OOZIE-813 Sub-workflow child job does not get group name even if parent
carries.(Mona via Mohammad)
OOZIE-791 coord job status not updated to done_with_error after kill(Virag via
Mohammad)
