You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2013/02/19 00:23:00 UTC

svn commit: r1447551 - in /oozie/branches/hcat-intre: ./ core/src/main/java/org/apache/oozie/command/coord/ core/src/main/java/org/apache/oozie/service/ core/src/test/java/org/apache/oozie/service/ examples/src/main/apps/hcatalog/

Author: virag
Date: Mon Feb 18 23:22:59 2013
New Revision: 1447551

URL: http://svn.apache.org/r1447551
Log:
Amending release log and fixing lines > 132

Modified:
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java
    oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestHCatAccessorService.java
    oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java
    oozie/branches/hcat-intre/examples/src/main/apps/hcatalog/id.pig
    oozie/branches/hcat-intre/release-log.txt

Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java?rev=1447551&r1=1447550&r2=1447551&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java Mon Feb 18 23:22:59 2013
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.oozie.command.coord;
 
 import java.util.ArrayList;

Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java?rev=1447551&r1=1447550&r2=1447551&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java Mon Feb 18 23:22:59 2013
@@ -65,11 +65,13 @@ public class JMSAccessorService implemen
     /**
      * Map of JMS connection info to established JMS Connection
      */
-    private ConcurrentMap<JMSConnectionInfo, ConnectionContext> connectionMap = new ConcurrentHashMap<JMSConnectionInfo, ConnectionContext>();
+    private ConcurrentMap<JMSConnectionInfo, ConnectionContext> connectionMap = 
+            new ConcurrentHashMap<JMSConnectionInfo, ConnectionContext>();
     /**
      * Map of JMS connection info to topic names to MessageReceiver
      */
-    private ConcurrentMap<JMSConnectionInfo, Map<String, MessageReceiver>> receiversMap = new ConcurrentHashMap<JMSConnectionInfo, Map<String, MessageReceiver>>();
+    private ConcurrentMap<JMSConnectionInfo, Map<String, MessageReceiver>> receiversMap = 
+            new ConcurrentHashMap<JMSConnectionInfo, Map<String, MessageReceiver>>();
 
     /**
      * Map of JMS connection info to connection retry information

Modified: oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestHCatAccessorService.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestHCatAccessorService.java?rev=1447551&r1=1447550&r2=1447551&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestHCatAccessorService.java (original)
+++ oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestHCatAccessorService.java Mon Feb 18 23:22:59 2013
@@ -45,8 +45,10 @@ public class TestHCatAccessorService ext
         services.destroy();
         services = super.setupServicesForHCatalog();
         Configuration conf = services.getConf();
-        String server2 = "hcat://${1}.${2}.server.com:8020=java.naming.factory.initial#Dummy.Factory;java.naming.provider.url#tcp://broker.${2}:61616";
-        String server3 = "hcat://xyz.corp.dummy.com=java.naming.factory.initial#Dummy.Factory;java.naming.provider.url#tcp:localhost:61616";
+        String server2 = "hcat://${1}.${2}.server.com:8020=java.naming.factory.initial#Dummy.Factory;" +
+        		"java.naming.provider.url#tcp://broker.${2}:61616";
+        String server3 = "hcat://xyz.corp.dummy.com=java.naming.factory.initial#Dummy.Factory;" +
+        		"java.naming.provider.url#tcp:localhost:61616";
 
         String jmsConnectionURL = server2 + "," + server3;
         conf.set(HCatAccessorService.JMS_CONNECTIONS_PROPERTIES, jmsConnectionURL);
@@ -57,9 +59,11 @@ public class TestHCatAccessorService ext
         JMSConnectionInfo connInfo = hcatService.getJMSConnectionInfo(new URI("http://unknown:9999/fs"));
         assertNull(connInfo);
         connInfo = hcatService.getJMSConnectionInfo(new URI("hcat://server1.colo1.server.com:8020/db/table/pk1=val1;pk2=val2"));
-        assertEquals("java.naming.factory.initial#Dummy.Factory;java.naming.provider.url#tcp://broker.colo1:61616", connInfo.getJNDIPropertiesString());
+        assertEquals("java.naming.factory.initial#Dummy.Factory;java.naming.provider.url#tcp://broker.colo1:61616",
+                connInfo.getJNDIPropertiesString());
         connInfo = hcatService.getJMSConnectionInfo(new URI("hcat://xyz.corp.dummy.com/db/table"));
-        assertEquals("java.naming.factory.initial#Dummy.Factory;java.naming.provider.url#tcp:localhost:61616", connInfo.getJNDIPropertiesString());
+        assertEquals("java.naming.factory.initial#Dummy.Factory;java.naming.provider.url#tcp:localhost:61616",
+                connInfo.getJNDIPropertiesString());
     }
 
     @Test
@@ -67,9 +71,12 @@ public class TestHCatAccessorService ext
         services.destroy();
         services = super.setupServicesForHCatalog();
         Configuration conf = services.getConf();
-        String server1 = "default=java.naming.factory.initial#org.apache.activemq.jndi.ActiveMQInitialContextFactory;java.naming.provider.url#vm://localhost?broker.persistent=false";
-        String server2 = "hcat://${1}.${2}.server.com:8020=java.naming.factory.initial#Dummy.Factory;java.naming.provider.url#tcp://broker.${2}:61616";
-        String server3 = "hcat://xyz.corp.dummy.com=java.naming.factory.initial#Dummy.Factory;java.naming.provider.url#tcp:localhost:61616";
+        String server1 = "default=java.naming.factory.initial#org.apache.activemq.jndi.ActiveMQInitialContextFactory;" +
+        		"java.naming.provider.url#vm://localhost?broker.persistent=false";
+        String server2 = "hcat://${1}.${2}.server.com:8020=java.naming.factory.initial#Dummy.Factory;" +
+        		"java.naming.provider.url#tcp://broker.${2}:61616";
+        String server3 = "hcat://xyz.corp.dummy.com=java.naming.factory.initial#Dummy.Factory;" +
+        		"java.naming.provider.url#tcp:localhost:61616";
 
         String jmsConnectionURL = server1 + "," + server2 + "," + server3;
         conf.set(HCatAccessorService.JMS_CONNECTIONS_PROPERTIES, jmsConnectionURL);
@@ -84,7 +91,8 @@ public class TestHCatAccessorService ext
         connInfo = hcatService.getJMSConnectionInfo(new URI("http://unknown:9999/fs"));
         // will map to default
         assertEquals(
-                "java.naming.factory.initial#org.apache.activemq.jndi.ActiveMQInitialContextFactory;java.naming.provider.url#vm://localhost?broker.persistent=false",
+                "java.naming.factory.initial#org.apache.activemq.jndi.ActiveMQInitialContextFactory;" +
+                "java.naming.provider.url#vm://localhost?broker.persistent=false",
                 connInfo.getJNDIPropertiesString());
 
         connInfo = hcatService.getJMSConnectionInfo(new URI("hcat://xyz.corp.dummy.com"));

Modified: oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java?rev=1447551&r1=1447550&r2=1447551&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java (original)
+++ oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java Mon Feb 18 23:22:59 2013
@@ -124,13 +124,15 @@ public class TestJMSAccessorService exte
             services = super.setupServicesForHCatalog();
             Configuration conf = services.getConf();
             // set the connection factory name
-            String jmsURL = "hcat://${1}.${2}.server.com:8020=java.naming.factory.initial#org.apache.activemq.jndi.ActiveMQInitialContextFactory;java.naming.provider.url#vm://localhost?broker.persistent=false;connectionFactoryNames#dynamicFactories/hcat.prod.${1}";
+            String jmsURL = "hcat://${1}.${2}.server.com:8020=java.naming.factory.initial#org.apache.activemq.jndi.ActiveMQInitialContextFactory" +
+            		";java.naming.provider.url#vm://localhost?broker.persistent=false;connectionFactoryNames#dynamicFactories/hcat.prod.${1}";
             conf.set(HCatAccessorService.JMS_CONNECTIONS_PROPERTIES, jmsURL);
             services.init();
             HCatAccessorService hcatService = services.get(HCatAccessorService.class);
             JMSConnectionInfo connInfo = hcatService.getJMSConnectionInfo(new URI("hcat://hcatserver.blue.server.com:8020"));
             assertEquals(
-                    "java.naming.factory.initial#org.apache.activemq.jndi.ActiveMQInitialContextFactory;java.naming.provider.url#vm://localhost?broker.persistent=false;connectionFactoryNames#dynamicFactories/hcat.prod.hcatserver",
+                    "java.naming.factory.initial#org.apache.activemq.jndi.ActiveMQInitialContextFactory;java.naming.provider.url#" +
+                    "vm://localhost?broker.persistent=false;connectionFactoryNames#dynamicFactories/hcat.prod.hcatserver",
                     connInfo.getJNDIPropertiesString());
 
             ConnectionContext ctx1 = new DefaultConnectionContext();

Modified: oozie/branches/hcat-intre/examples/src/main/apps/hcatalog/id.pig
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/examples/src/main/apps/hcatalog/id.pig?rev=1447551&r1=1447550&r2=1447551&view=diff
==============================================================================
--- oozie/branches/hcat-intre/examples/src/main/apps/hcatalog/id.pig (original)
+++ oozie/branches/hcat-intre/examples/src/main/apps/hcatalog/id.pig Mon Feb 18 23:22:59 2013
@@ -1,3 +1,20 @@
+-- 
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- 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.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
 A = load '$DB.$TABLE' using org.apache.hcatalog.pig.HCatLoader();
 B = FILTER A BY $FILTER;
 C = foreach B generate foo, bar;

Modified: oozie/branches/hcat-intre/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/release-log.txt?rev=1447551&r1=1447550&r2=1447551&view=diff
==============================================================================
--- oozie/branches/hcat-intre/release-log.txt (original)
+++ oozie/branches/hcat-intre/release-log.txt Mon Feb 18 23:22:59 2013
@@ -1,113 +1,112 @@
 -- Oozie 3.4.0 release (trunk - unreleased)
-
-OOZIE-1181 Dependency cache with configurations for eviction, ttl and max elements in memory (rohini via virag)
-OOZIE-1054 Create script to properly upload sharelib to HDFS (bowenzhangusa via tucu)
-OOZIE-1217 Address review comments in OOZIE-1210 (rohini via virag)
+OOZIE-561 Integrate Oozie with HCatalog
+    OOZIE-1217 Address review comments in OOZIE-1210 (rohini via virag)
+    OOZIE-1197 Create a hcat sharelib which can be included in pig, hive and java actions (mona,rohini via virag)
+    OOZIE-1196 HCat EL functions for database and table should be modified (mona)
+    OOZIE-1210 Rework uri handling for Prepare actions and jms server mapping (rohini via virag)
+    OOZIE-1179 coord action in WAITING when no definition of dataset in coord job xml (mona)
+    OOZIE-1185 Retry jms connections on failure (rohini via virag)
+    OOZIE-1158 Add hcataloglib sub-module (mona)
+    OOZIE-1180 Separate the connection context details from JMS Accessor service (virag)
+    OOZIE-1157 EL function hcat:exists for decision making (rohini via mona)
+    OOZIE-1167 Fix and rework PartitionDependency Management (rohini via virag)
+    OOZIE-1156 Make all the latest/future instances as pull dependences (virag)
+    OOZIE-1145 Modify Recovery Service to handle push missing dependencies (virag)
+    OOZIE-1135 Display missing partition dependencies via job -info command on CLI (mona)
+    OOZIE-1125 Prepare actions for hcat (rohini via virag)
+    OOZIE-1123 EL Functions for hcatalog (mona)
+    OOZIE-1138 Provide rule based mechanism to allow multiple hcatalog servers to connect to JMS server (virag)
+    OOZIE-1111 change HCatURI to specify partitions in path instead of query parameter (rohini,ryota via virag)
+    OOZIE-1108 Fix JMS message consumer to maintain single session per topic registration (mona)
+    OOZIE-1075 Create general scheme handler (rohini via virag)
+    OOZIE-1107 Change default done-flag from _SUCCESS to empty for Hcat (mohammad)
+    OOZIE-1095 Add HCatalog jar as resource for building (mona)
+    OOZIE-1105 Resolve issues found during integration(mohammad)
+    OOZIE-1086 Command to check the missing partitions directly against HCatalog server (mohammad)
+    OOZIE-1050 Implement logic to update dependencies via push JMS message(mona via mohammad)
+    OOZIE-1068 Metadata Accessor service for HCatalog(mohammad)
+    OOZIE-1069 Update dataIn and dataOut EL functions to support partitions (mohammad)
+    OOZIE-1043 Add logic to register to Missing Dependency Structure in coord action materialization (ryota via mohammad)
+    OOZIE-1061 Add new EL functions to retrieve HCatalog server, DB and table name(mohammad)
+    OOZIE-1056 Command to update push-based dependency (mohammad)
+    OOZIE-1059 Add static method to create URI String in HCatURI(ryota via mohammad)
+    OOZIE-1039 Implement the Missing Dependency structure for HCat partitions (mona via mohammad)
+    OOZIE-1042 Coordinator action table schema change. (Mohammad)
+    OOZIE-1036 Utility class to parse HCat URI (Ryota via Mohammad)
+    OOZIE-1033 Generic utility class to register/unregister a JMS message handler(Mohammad)
+    OOZIE-1032 Create JMSService used for any JMS compliant product (Mohammad)
+    OOZIE-1045 Parameterize <unresolved-instances> tag currently hardcoded (egashira via mona)
 OOZIE-1189 add filter option to specify JobID and AppName in SLA CLI command (egashira via mona)
-OOZIE-1197 Create a hcat sharelib which can be included in pig, hive and java actions (mona,rohini via virag)
-OOZIE-1211 oozie does not support duplicated dataset (jaoki via virag)
-OOZIE-1187 reduce memory usage of SLA query (invoked by CLI command) to avoid OOM (egashira via virag) 
+OOZIE-1054 Create script to properly upload sharelib to HDFS (bowenzhangusa via tucu)
 OOZIE-1096 Update wfgen README.txt to have the TLP mailing list (jun aoki via rkanter)
-OOZIE-809 MySQL TEXT columns should be MEDIUMTEXT (rkanter via tucu)
-OOZIE-669 Deprecate oozie-start.sh, oozie-stop.sh & oozie-run.sh scripts (rkanter via tucu)
 OOZIE-1015 HadoopAccessorService jobtracker validation should not have hardcoded conf key (mona)
 OOZIE-1078 Help -> Documentation and Help -> Online Help should link to oozie.apache.org/ (jun via mohammad)
+OOZIE-669 Deprecate oozie-start.sh, oozie-stop.sh & oozie-run.sh scripts (rkanter via tucu)
+OOZIE-809 MySQL TEXT columns should be MEDIUMTEXT (rkanter via tucu)
 OOZIE-979 bump up trunk version to 3.4.0-SNAPSHOT (tucu)
+OOZIE-1007 Add license headers to all files don't have them  (egashira via tucu)
 OOZIE-976 add workflowgenerator into distro tarball (egashira via tucu)
 OOZIE-944 Implement Workflow Generator UI Tool (egashira via virag)
 
--- Oozie 3.3.2 unreleased 
+-- Oozie 3.3.2 (unreleased)
 
 OOZIE-1227 In a coordinator, specifying the <app-path> without a namenode causes it to fail (rkanter)
 OOZIE-1226 Workflow lib path not found in classpath for a subworkflow (rkanter)
 OOZIE-1184 Demo example job.properties has an unused parameter (udai via rkanter)
+OOZIE-1211 oozie does not support duplicated dataset (jaoki via virag)
+OOZIE-1187 reduce memory usage of SLA query (invoked by CLI command) to avoid OOM (egashira via virag)
 OOZIE-1221 mvn install failing in Oozie-Mini module (jaoki via virag)
 OOZIE-1170 Update minitest module (MiniOozie) to use main pom as its parent (jaoki via rkanter)
-OOZIE-1196 HCat EL functions for database and table should be modified (mona)
-OOZIE-1210 Rework uri handling for Prepare actions and jms server mapping (rohini via virag)
-OOZIE-1179 coord action in WAITING when no definition of dataset in coord job xml (mona)
 OOZIE-1188 Typo in documentation for using login server example (rkanter)
-OOZIE-1177 HostnameFilter should only catch UnknownHostException, not Exception (rkanter)
+OOZIE-1113 The cookies used in the AltKerberosAuthenticationHandler examples aren't read properly if quoted (rkanter)
+OOZIE-1103 Create example using AltKerberosAuthenticationHandler (rkanter)
+OOZIE-1179 coord action in WAITING when no definition of dataset in coord job xml (mona)
 OOZIE-1194 test-patch shouldn't run the testHive profile because it not longer exists (rkanter)
 OOZIE-1193 upgrade jython to 2.5.3 for Pig in Oozie due to jython 2.5.0 legal issues (bowenzhangusa via rkanter)
 OOZIE-1172 Add documentation on how to get Java actions to authenticate properly on Kerberos-enabled clusters (rkanter)
 OOZIE-87 GH-47: Feature to supply a comma separated list of jars in an 'archive tag' of workflow (jaoki via rkanter)
+OOZIE-1160 Oozie web-console to display all job URLs spawned by Pig (mona)
+OOZIE-1177 HostnameFilter should only catch UnknownHostException, not Exception (rkanter)
 OOZIE-945 BundleSubmitXCommand.submit() doesn't properly remove comments (jaoki via rkanter)
 OOZIE-1171 HostnameFilter should handle hostname resolution failures and continue processing (tucu via rkanter)
+OOZIE-1053 Oozie Web-console clicking on Bundle's coord jobs does not open them up (ryota via mona)
 OOZIE-1166 Print a more helpful message when ProxyUserService is configured wrong (rkanter)
 OOZIE-1136 Fix MiniOozie (rkanter)
 OOZIE-1051 Repeating Errors for workflows that were allreday Killed (rkanter)
 OOZIE-1140 TestLogStreamer.testStreamLog fails when its started within the first 4 seconds after the hour (rkanter)
 OOZIE-1153 comma separated list in <archive> and <file> for JavaActionExecutor. (jaoki via tucu)
-OOZIE-1160 Oozie web-console to display all job URLs spawned by Pig (mona)
+OOZIE-1161 Remove unnecessary db updates for some of the blobs like missing_dependencies' of Coordinator Action (virag)
 OOZIE-1164 typo in toString() method for org.apache.oozie.client.rest.JsonCoordinatorJob.java (bowenzhangusa via rkanter)
-OOZIE-1186 Image load for Job DAG visualization should handle resources better (mona)
-OOZIE-1185 Retry jms connections on failure (rohini via virag)
-OOZIE-1158 Add hcataloglib sub-module (mona)
-OOZIE-1180 Separate the connection context details from JMS Accessor service (virag)
-OOZIE-1157 EL function hcat:exists for decision making (rohini via mona)
-OOZIE-1167 Fix and rework PartitionDependency Management (rohini via virag)
-OOZIE-1053 Oozie Web-console clicking on Bundle's coord jobs does not open them up (ryota via mona)
-OOZIE-1161 Remove unnecessary db updates for some of the blobs like missing_dependencies' of Coordinator Action(virag)
-OOZIE-1156 Make all the latest/future instances as pull dependences (virag)
+OOZIE-1152 Unit test for JavaActionExecutor has a wrong action XML (jaoki via harsh)
 OOZIE-1144 OOZIE-1137 breaks the sharelib (rkanter)
+OOZIE-1035 Improve forkjoin validation to allow same errorTo transitions (rkanter)
 OOZIE-1137 In light of federation use actionLibPath instead of appPath (vaidya via rkanter)
-OOZIE-1102 Update Oozie README.txt to have the TLP mailing list and links (jaoki via rkanter)
-OOZIE-1103 Create example using AltKerberosAuthenticationHandler (rkanter)
-OOZIE-816 Add Support for Hadoop 1.1.1 (zhujinwei and harsh via harsh)
-OOZIE-1101 Fix log messages that contain {0} or similar (rkanter)
-OOZIE-1113 The cookies used in the AltKerberosAuthenticationHandler examples aren't read properly if quoted (rkanter)
-OOZIE-1127 Missed one services.destroy() in OOZIE-1114 (rkanter)
-OOZIE-1084 When use IBM jdk , UT TestCallbackServlet and TestHadoopELFunctions fail (zhujinwei via rkanter)
-OOZIE-1129 Add documentation for configurable filesystem support (rkanter)
-OOZIE-1087 Remove requirement of hive-default.xml from Hive action (rkanter)
 OOZIE-1126 see if checkstyle works for oozie development. (jaoki via rkanter)
-OOZIE-1152 Unit test for JavaActionExecutor has a wrong action XML (jaoki via harsh)
-OOZIE-1145 Modify Recovery Service to handle push missing dependencies (virag)
-OOZIE-1135 Display missing partition dependencies via job -info command on CLI (mona)
-OOZIE-1125 Prepare actions for hcat (rohini via virag)
-OOZIE-1123 EL Functions for hcatalog (mona)
-OOZIE-1138 Provide rule based mechanism to allow multiple hcatalog servers to connect to JMS server (virag)
 OOZIE-1124 Split pig unit tests to a separate module (rohini via virag)
-OOZIE-1111 change HCatURI to specify partitions in path instead of query parameter (rohini,ryota via virag)
-OOZIE-1108 Fix JMS message consumer to maintain single session per topic registration (mona)
-OOZIE-1075 Create general scheme handler (rohini via virag)
+OOZIE-1087 Remove requirement of hive-default.xml from Hive action (rkanter)
+OOZIE-1129 Add documentation for configurable filesystem support (rkanter)
+OOZIE-1084 When use IBM jdk , UT TestCallbackServlet and TestHadoopELFunctions fail (zhujinwei via rkanter)
+OOZIE-1127 Missed one services.destroy() in OOZIE-1114 (rkanter)
 OOZIE-1071 latest EL function is based on action materialization time (rohini via virag)
- OOZIE-1035 Improve forkjoin validation to allow same errorTo transitions (rkanter)
 OOZIE-1114 Some tests don't use the Services singleton properly (rkanter)
-OOZIE-1106 latest and future function do not work correctly when oozie processing timezone is non UTC (rohini via tucu)
+OOZIE-1101 Fix log messages that contain {0} or similar (rkanter)
 OOZIE-1073 Optimize latest and future EL resolution in case of start-instance and end-instance (rohini via virag)
-OOZIE-1107 Change default done-flag from _SUCCESS to empty for Hcat (mohammad)
-OOZIE-1095 Add HCatalog jar as resource for building (mona)
-OOZIE-1105 Resolve issues found during integration(mohammad)
+OOZIE-816 Add Support for Hadoop 1.1.1 (zhujinwei and harsh via harsh)
+OOZIE-1106 latest and future function do not work correctly when oozie processing timezone is non UTC (rohini via tucu)
+OOZIE-1102 Update Oozie README.txt to have the TLP mailing list and links (jaoki via rkanter)
 OOZIE-1057 Log message for retrying to connect to the JT always says 60,000 milliseconds (jiezhou via rkanter)
 OOZIE-1080 Add a dryrun option for workflows (rkanter)
-OOZIE-1086 Command to check the missing partitions directly against HCatalog server (mohammad)
-OOZIE-1050 Implement logic to update dependencies via push JMS message(mona via mohammad)
-OOZIE-1068 Metadata Accessor service for HCatalog(mohammad)
-OOZIE-1069 Update dataIn and dataOut EL functions to support partitions (mohammad)
-OOZIE-1043 Add logic to register to Missing Dependency Structure in coord action materialization (ryota via mohammad)
-OOZIE-1061 Add new EL functions to retrieve HCatalog server, DB and table name(mohammad)
-OOZIE-1056 Command to update push-based dependency (mohammad)
-OOZIE-1059 Add static method to create URI String in HCatURI(ryota via mohammad)
-OOZIE-1039 Implement the Missing Dependency structure for HCat partitions (mona via mohammad)
 OOZIE-1062 Create a shell example
 OOZIE-1034 Allow disabling forkjoin validation just for a specific workflow
 OOZIE-1072 Oozie Coordinator Doc error in Synchronous datasets
 OOZIE-1028 Add EL function to allow date ranges to be used for dataset ranges (rkanter via tucu)
-OOZIE-1045 Parameterize <unresolved-instances> tag currently hardcoded (egashira via mona)
-OOZIE-1029 MiniMRCluster fails to start when used against YARN (rkanter via tucu)
 OOZIE-1048 Enable propagation of native libraries as a VM argument using java.library.path (venkatesh via tucu)
+OOZIE-1014 Coordinator action failure error not propagated (mona)
+OOZIE-1029 MiniMRCluster fails to start when used against YARN (rkanter via tucu)
 OOZIE-1011 Tests from OOZIE-994 fail when run against Hadoop trunk (rkanter via tucu)
 OOZIE-1037 XTestCase.delete() can cause tests to fail if it runs into a dangling symlink (rkanter via tucu)
-OOZIE-1014 Coordinator action failure error not propagated (mona)
-OOZIE-1042 Coordinator action table schema change. (Mohammad)
-OOZIE-959  Use API from OOZIE-906 in console (Ashish via Mohammad)
-OOZIE-1036 Utility class to parse HCat URI (Ryota via Mohammad)
-OOZIE-1033 Generic utility class to register/unregister a JMS message handler(Mohammad)
-OOZIE-1032 Create JMSService used for any JMS compliant product (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-1020 BulkJPAExecutor handling date-time value incorrectly.(Mona via Mohammad)
 OOZIE-967 Coordinator action window in web UI never finishes refreshing (kinley via tucu)
 OOZIE-1024 ooziedb.sh script should keep OOZIE_CONFIG, OOZIE_LOG, and OOZIE_DATA if previously set (rkanter via tucu)
 OOZIE-1023 Docs list OOZIE_CONF instead of OOZIE_CONFIG env var (rkanter via tucu)
@@ -132,11 +131,13 @@ OOZIE-984 Allow EL Functions in Coordina
 OOZIE-972 Provide  EL function to append a string in each substring of another string separated by delimiter (Mohammad via virag)
 OOZIE-977 NotificationXCommand (job.notification queue entry) should set a timeout in the HTTP connections it makes (tucu)
 OOZIE-654 Provide a way to use 'uber' jars with Oozie MR actions (rkanter via tucu)
+OOZIE-1186 Image load for Job DAG visualization should handle resources better (mona)
 
--- Oozie 3.3.1 (unreleased)
+-- Oozie 3.3.1 release
 
-OOZIE-1151 HbaseCredentials doesn't use properties from the credentials module (virag)
+OOZIE-1175 Update POM version to 3.3.1 for 3.3 branch (virag)
 OOZIE-1159 Set the RM token renewer as the full service principal instead of short name (rohini via virag)
+OOZIE-1151 HbaseCredentials doesn't use properties from the credentials module (virag)
 OOZIE-1148 Set the renewer correctly for JT/RM delegation tokens (rohini via virag)
 OOZIE-1147 HCatCredentialHelper uses the wrong API for getDelegationToken (rohini via virag)
 OOZIE-1149 Update 3.3 branch POM's to 3.3.1-SNAPSHOT (virag)
@@ -145,26 +146,26 @@ OOZIE-1110 log Error that happens in XCo
 OOZIE-1133 Remove hadoop-auth dependency from oozie-core (virag)
 OOZIE-1130 Upgrade from 3.2 to 3.3 failing due to change in WorkflowInstance structure (virag)
 OOZIE-1128 When a user submitting a job is not UNDEF in the request, it should use that user as the submitter (tucu)
-OOZIE-1065 bundle status does not transit after rerun (virag)
-OOZIE-1064 Status value of coordinator job not reflected in bundle action and invalid transition of coordinator job (virag)
-OOZIE-1149 Update 3.3 branch POM's to 3.3.1-SNAPSHOT (virag)
 OOZIE-1091 workflow functional spec, fs action related issues (virag)
 OOZIE-1116 Create hbaselibs module (virag)
 OOZIE-1093 recursive fs chmod does not change the leaf directory (virag)
 OOZIE-1094 credential cannot resolve variable (virag)
 OOZIE-1099 Pig launcher log does not show the pig job url for H23 (rohini via mona)
-OOZIE-1100 HFTP coordinator input check fails due to missing commons-httpclient.jar (egashira via virag)
+OOZIE-1100 HFTP coordinator input check fails due to missing commons-httpclient.jar (ryota via virag)
+OOZIE-1065 bundle status does not transit after rerun (virag)
+OOZIE-1064 Status value of coordinator job not reflected in bundle action and invalid transition of coordinator job (virag)
 
 -- Oozie 3.3.0 release
 
+OOZIE-959  Use API from OOZIE-906 in console (Ashish via Mohammad)
+OOZIE-1089 DistributedCache workaround for Hadoop 2.0.2-alpha (tucu)
+OOZIE-1005 Tests from OOZIE-994 use wrong condition in waitFor (rkanter via virag)
+OOZIE-994 ActionCheckXCommand does not handle failures properly (rkanter via virag)
 OOZIE-1058 ACL modify-job should not be hardcoded to group name(mona via mohammad)
 OOZIE-1052 HadoopAccessorService.createFileSystem throws exception in map-reduce action, failing workflow (egashira via mohammad)
-OOZIE-1089 DistributedCache workaround for Hadoop 2.0.2-alpha (tucu)
+OOZIE-1060 bump hadoop 2.X version to 2.0.2-alpha (rvs via tucu)
 OOZIE-993 Hadoop 23 doesn't accept user defined jobtracker (virag)
-OOZIE-1005 Tests from OOZIE-994 use wrong condition in waitFor (rkanter via virag)
-OOZIE-994  ActionCheckXCommand does not handle failures properly (rkanter via 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)
 OOZIE-1006 Oozie fails to add required dependency for Hadoop 3.0.2 (venkatesh via virag)
 OOZIE-975 Test cases should not load all the services classes (virag)
 OOZIE-989 Testcases failing intermittently where coordinator jobs are in catchup mode (virag)