Author: tucu
Date: Sat Nov 17 22:12:31 2012
New Revision: 1410798
URL: http://svn.apache.org/viewvc?rev=1410798&view=rev
Log:
Reverting workflowgenerator (OOZIE-944, OOZIE- 976, OOZIE-1007) from 3.3
branch. (tucu)
Removed:
oozie/branches/branch-3.3/workflowgenerator/
Modified:
oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml
oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml
oozie/branches/branch-3.3/distro/pom.xml
oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh
oozie/branches/branch-3.3/pom.xml
oozie/branches/branch-3.3/release-log.txt
oozie/branches/branch-3.3/src/main/assemblies/distro.xml
Modified: oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml?rev=1410798&r1=1410797&r2=1410798&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml (original)
+++ oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml Sat Nov 17
22:12:31 2012
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<<<<<<< HEAD
+=======
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,6 +18,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+>>>>>>> 028ab12... OOZIE-1013 Build failing as the license header comment is
appearing before xml declaration in some files (virag)
<workflow-app xmlns="uri:oozie:workflow:0.2" name="sm3-segment-3908-251483">
<start to="or_0_1"/>
<kill name="kill">
Modified: oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml?rev=1410798&r1=1410797&r2=1410798&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml
(original)
+++ oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml Sat
Nov 17 22:12:31 2012
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<<<<<<< HEAD
+=======
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,6 +18,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+>>>>>>> 028ab12... OOZIE-1013 Build failing as the license header comment is
appearing before xml declaration in some files (virag)
<workflow-app xmlns="uri:oozie:workflow:0.2" name="sm3-segment-3908-251483">
<start to="or_0_1"/>
<kill name="kill">
Modified: oozie/branches/branch-3.3/distro/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/distro/pom.xml?rev=1410798&r1=1410797&r2=1410798&view=diff
==============================================================================
--- oozie/branches/branch-3.3/distro/pom.xml (original)
+++ oozie/branches/branch-3.3/distro/pom.xml Sat Nov 17 22:12:31 2012
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -123,22 +123,5 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>wfgen</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.oozie</groupId>
- <artifactId>oozie-workflowgenerator</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>war</type>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
Modified: oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh?rev=1410798&r1=1410797&r2=1410798&view=diff
==============================================================================
--- oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh (original)
+++ oozie/branches/branch-3.3/distro/src/main/bin/oozie-setup.sh Sat Nov 17
22:12:31 2012
@@ -7,9 +7,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -138,14 +138,7 @@ if [ -d "${libext}" ]; then
if [ -f "${libext}/ext-2.2.zip" ]; then
extjsHome=${libext}/ext-2.2.zip
addExtjs=true
- fi
-# find war files (e.g., workflowgenerator) under /libext and deploy
- if [ `ls ${libext} | grep \.war\$ | wc -c` != 0 ]; then
- for i in "${libext}/"*.war; do
- echo "INFO: Deploying extention: $i"
- cp $i ${CATALINA_BASE}/webapps/
- done
- fi
+ fi
fi
if [ "${addExtjs}" == "" ]; then
Modified: oozie/branches/branch-3.3/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/pom.xml?rev=1410798&r1=1410797&r2=1410798&view=diff
==============================================================================
--- oozie/branches/branch-3.3/pom.xml (original)
+++ oozie/branches/branch-3.3/pom.xml Sat Nov 17 22:12:31 2012
@@ -69,7 +69,7 @@
<hadoop.version>1.0.1</hadoop.version>
<hadooplib.version>${hadoop.version}.oozie-${project.version}</hadooplib.version>
-
+
<clover.license>/home/jenkins/tools/clover/latest/lib/clover.license</clover.license>
<!--
This is required while we support a a pre 0.23 version of Hadoop which
does not have
@@ -878,13 +878,10 @@
</properties>
</profile>
<profile>
- <id>wfgen</id>
+ <id>testPatchCompile</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <modules>
- <module>workflowgenerator</module>
- </modules>
<build>
<plugins>
<plugin>
@@ -904,4 +901,5 @@
</build>
</profile>
</profiles>
+
</project>
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1410798&r1=1410797&r2=1410798&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Sat Nov 17 22:12:31 2012
@@ -6,7 +6,6 @@ OOZIE-1060 bump hadoop 2.X version to 2.
OOZIE-959 Use API from OOZIE-906 in console (Ashish via Mohammad)
OOZIE-1027 Command line mr does not support NN/JT parameters properly (Mona
via Mohammad)
OOZIE-1020 BulkJPAExecutor handling date-time value incorrectly.(Mona via
Mohammad)
-OOZIE-976 add workflowgenerator into distro tarball (egashira via tucu)
OOZIE-993 Hadoop 23 doesn't accept user defined jobtracker (virag)
OOZIE-1013 Build failing as the license header comment is appearing before xml
declaration in some files (virag)
OOZIE-1007 Add license headers to all files don't have them (egashira via
tucu)
@@ -22,7 +21,6 @@ OOZIE-971 TestRecoveryService failing ve
OOZIE-966 Fix formatting in CLI output when GMT-#### and GMT-##:## formatted
timezones are used (rkanter via tucu)
OOZIE-960 TestStatusTransitService failing intermittently (virag)
OOZIE-968 source oozie environment from conf in oozie db setup script (svenkat
via virag)
-OOZIE-944 Implement Workflow Generator UI Tool (egashira via virag)
OOZIE-961 Load Hbase credentials in Oozie (virag)
OOZIE-963 Add new EL function to replace all instances of a sub-string with
another one (kamrul via virag)
OOZIE-969 Unit tests in TestStatusTransitService failing due to change in
CoordKillX (mona via virag)
Modified: oozie/branches/branch-3.3/src/main/assemblies/distro.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/src/main/assemblies/distro.xml?rev=1410798&r1=1410797&r2=1410798&view=diff
==============================================================================
--- oozie/branches/branch-3.3/src/main/assemblies/distro.xml (original)
+++ oozie/branches/branch-3.3/src/main/assemblies/distro.xml Sat Nov 17
22:12:31 2012
@@ -99,15 +99,6 @@
</includes>
<fileMode>0555</fileMode>
</fileSet>
- <fileSet>
- <directory>${basedir}/../workflowgenerator/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>oozie-wfgen.war</include>
- </includes>
- <fileMode>0555</fileMode>
- </fileSet>
-
</fileSets>
<files>
<!-- Oozie configuration files -->
