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/16 00:19:50 UTC
svn commit: r1446809 - in /oozie/branches/hcat-intre/core/src: main/java/org/apache/oozie/dependency/ main/java/org/apache/oozie/dependency/cache/ main/java/org/apache/oozie/dependency/hcat/ main/java/org/apache/oozie/hcat/ main/java/org/apache/oozie/j...

Author: virag
Date: Fri Feb 15 23:19:49 2013
New Revision: 1446809

URL: http://svn.apache.org/r1446809
Log:
Amending commit to OOZIE-1217 by moving packages

Added:
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/
      - copied from r1446791, oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/cache/
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java
      - copied, changed from r1446791, oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java
      - copied, changed from r1446792, oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/cache/SimpleHCatDependencyCache.java
Removed:
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/cache/
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/hcat/
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java
    oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/hcat/
Modified:
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatDependencyCache.java
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/WaitingAction.java
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java
    oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java
    oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java
    oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java

Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java?rev=1446809&r1=1446808&r2=1446809&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java Fri Feb 15 23:19:49 2013
@@ -37,9 +37,9 @@ import org.apache.hcatalog.common.HCatEx
 import org.apache.oozie.ErrorCode;
 import org.apache.oozie.action.hadoop.HCatLauncherURIHandler;
 import org.apache.oozie.action.hadoop.LauncherURIHandler;
-import org.apache.oozie.jms.HCatMessageHandler;
-import org.apache.oozie.service.HCatAccessorService;
+import org.apache.oozie.dependency.hcat.HCatMessageHandler;
 import org.apache.oozie.service.HCatAccessorException;
+import org.apache.oozie.service.HCatAccessorService;
 import org.apache.oozie.service.PartitionDependencyManagerService;
 import org.apache.oozie.service.Services;
 import org.apache.oozie.service.URIHandlerService;

Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatDependencyCache.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatDependencyCache.java?rev=1446809&r1=1446791&r2=1446809&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatDependencyCache.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatDependencyCache.java Fri Feb 15 23:19:49 2013
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.oozie.dependency.cache;
+package org.apache.oozie.dependency.hcat;
 
 import java.util.Collection;
 import java.util.Map;

Copied: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java (from r1446791, oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java)
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java?p2=oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java&p1=oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java&r1=1446791&r2=1446809&rev=1446809&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java Fri Feb 15 23:19:49 2013
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.oozie.jms;
+package org.apache.oozie.dependency.hcat;
 
 import java.util.List;
 import java.util.Map;
@@ -25,6 +25,7 @@ import javax.jms.Message;
 import org.apache.hcatalog.messaging.AddPartitionMessage;
 import org.apache.hcatalog.messaging.HCatEventMessage;
 import org.apache.hcatalog.messaging.jms.MessagingUtils;
+import org.apache.oozie.jms.MessageHandler;
 import org.apache.oozie.service.PartitionDependencyManagerService;
 import org.apache.oozie.service.Services;
 import org.apache.oozie.util.XLog;

Copied: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java (from r1446792, oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/cache/SimpleHCatDependencyCache.java)
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java?p2=oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java&p1=oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/cache/SimpleHCatDependencyCache.java&r1=1446792&r2=1446809&rev=1446809&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/cache/SimpleHCatDependencyCache.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java Fri Feb 15 23:19:49 2013
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.oozie.dependency.cache;
+package org.apache.oozie.dependency.hcat;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/WaitingAction.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/WaitingAction.java?rev=1446809&r1=1446791&r2=1446809&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/WaitingAction.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/dependency/hcat/WaitingAction.java Fri Feb 15 23:19:49 2013
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.oozie.dependency.cache;
+package org.apache.oozie.dependency.hcat;
 
 import java.io.Serializable;
 

Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java?rev=1446809&r1=1446808&r2=1446809&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java Fri Feb 15 23:19:49 2013
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.oozie.jms.HCatMessageHandler;
+import org.apache.oozie.dependency.hcat.HCatMessageHandler;
 import org.apache.oozie.jms.JMSConnectionInfo;
 import org.apache.oozie.util.HCatURI;
 import org.apache.oozie.util.MappingRule;

Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java?rev=1446809&r1=1446808&r2=1446809&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java Fri Feb 15 23:19:49 2013
@@ -23,8 +23,8 @@ import java.util.Map;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.oozie.command.coord.CoordActionUpdatePushMissingDependency;
-import org.apache.oozie.dependency.cache.HCatDependencyCache;
-import org.apache.oozie.dependency.cache.SimpleHCatDependencyCache;
+import org.apache.oozie.dependency.hcat.HCatDependencyCache;
+import org.apache.oozie.dependency.hcat.SimpleHCatDependencyCache;
 import org.apache.oozie.util.HCatURI;
 import org.apache.oozie.util.XLog;
 

Modified: oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java?rev=1446809&r1=1446808&r2=1446809&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java (original)
+++ oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java Fri Feb 15 23:19:49 2013
@@ -22,12 +22,14 @@ import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.Topic;
+
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.hcatalog.common.HCatConstants;
 import org.apache.hcatalog.messaging.HCatEventMessage;
@@ -37,6 +39,7 @@ import org.apache.log4j.Layout;
 import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
 import org.apache.log4j.WriterAppender;
+import org.apache.oozie.dependency.hcat.HCatMessageHandler;
 import org.apache.oozie.service.HCatAccessorService;
 import org.apache.oozie.service.PartitionDependencyManagerService;
 import org.apache.oozie.service.Services;

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=1446809&r1=1446808&r2=1446809&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 Fri Feb 15 23:19:49 2013
@@ -25,10 +25,10 @@ import javax.jms.Session;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.oozie.dependency.hcat.HCatMessageHandler;
+import org.apache.oozie.jms.ConnectionContext;
 import org.apache.oozie.jms.DefaultConnectionContext;
-import org.apache.oozie.jms.HCatMessageHandler;
 import org.apache.oozie.jms.JMSConnectionInfo;
-import org.apache.oozie.jms.ConnectionContext;
 import org.apache.oozie.jms.MessageReceiver;
 import org.apache.oozie.test.XTestCase;
 import org.junit.Test;