flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From esam...@apache.org
Subject svn commit: r1156901 - in /incubator/flume/branches/flume-728: flume-ng-core/src/main/java/org/apache/flume/ flume-ng-core/src/main/java/org/apache/flume/core/ flume-ng-core/src/main/java/org/apache/flume/core/util/ flume-ng-core/src/main/java/org/apac...
Date Fri, 12 Aug 2011 00:48:07 GMT
Author: esammer
Date: Fri Aug 12 00:48:05 2011
New Revision: 1156901

URL: http://svn.apache.org/viewvc?rev=1156901&view=rev
Log:
- Moved org.apache.flume.core to org.apache.flume.

Added:
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/ChannelDriverThread.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriverThread.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Context.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Context.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/CounterGroup.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Event.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Event.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventDeliveryException.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventDeliveryException.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSink.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSink.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSource.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSource.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/LogicalNode.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Reporter.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Reporter.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/EventBuilder.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/util/EventBuilder.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/SimpleEvent.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/SimpleEvent.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestContext.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestContext.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestCounterGroup.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestCounterGroup.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestLogicalNode.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestLogicalNode.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestReporter.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestReporter.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/util/
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/util/TestEventBuilder.java
      - copied, changed from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/util/TestEventBuilder.java
Removed:
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriverThread.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Context.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Event.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventDeliveryException.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSink.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSource.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Reporter.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/SimpleEvent.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/util/EventBuilder.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestContext.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestCounterGroup.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestLogicalNode.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestReporter.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/util/TestEventBuilder.java
Modified:
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleState.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/AbstractEventSink.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/LoggerSink.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/NullSink.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/AbstractEventSource.java
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/SequenceGeneratorSource.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/sink/TestLoggerSink.java
    incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestSequenceGeneratorSource.java
    incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java
    incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/NodeManager.java
    incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/AbstractLogicalNodeManager.java
    incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/FileBasedLogicalNodeManager.java
    incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/MemoryBasedLogicalNodeManager.java
    incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestAbstractLogicalNodeManager.java
    incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.java

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/ChannelDriverThread.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriverThread.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/ChannelDriverThread.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/ChannelDriverThread.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriverThread.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriverThread.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/ChannelDriverThread.java
Fri Aug 12 00:48:05 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import org.apache.flume.lifecycle.LifecycleAware;
 import org.apache.flume.lifecycle.LifecycleException;

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Context.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Context.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Context.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Context.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Context.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Context.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Context.java
Fri Aug 12 00:48:05 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/CounterGroup.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/CounterGroup.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/CounterGroup.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/CounterGroup.java
Fri Aug 12 00:48:05 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicLong;

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Event.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Event.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Event.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Event.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Event.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Event.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Event.java
Fri Aug 12 00:48:05 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import java.util.Map;
 

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventDeliveryException.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventDeliveryException.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventDeliveryException.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventDeliveryException.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventDeliveryException.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventDeliveryException.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventDeliveryException.java
Fri Aug 12 00:48:05 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 public class EventDeliveryException extends Exception {
 

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSink.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSink.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSink.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSink.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSink.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSink.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSink.java
Fri Aug 12 00:48:05 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import org.apache.flume.lifecycle.LifecycleException;
 

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSource.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSource.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSource.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSource.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSource.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/EventSource.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/EventSource.java
Fri Aug 12 00:48:05 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import org.apache.flume.lifecycle.LifecycleException;
 

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/LogicalNode.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/LogicalNode.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/LogicalNode.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/LogicalNode.java
Fri Aug 12 00:48:05 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import org.apache.flume.lifecycle.LifecycleAware;
 import org.apache.flume.lifecycle.LifecycleException;

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Reporter.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Reporter.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Reporter.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Reporter.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Reporter.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/Reporter.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/Reporter.java
Fri Aug 12 00:48:05 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/EventBuilder.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/util/EventBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/EventBuilder.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/EventBuilder.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/util/EventBuilder.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/util/EventBuilder.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/EventBuilder.java
Fri Aug 12 00:48:05 2011
@@ -1,10 +1,9 @@
-package org.apache.flume.core.util;
+package org.apache.flume.event;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.flume.core.Event;
-import org.apache.flume.core.SimpleEvent;
+import org.apache.flume.Event;
 
 public class EventBuilder {
 

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/SimpleEvent.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/SimpleEvent.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/SimpleEvent.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/SimpleEvent.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/SimpleEvent.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/SimpleEvent.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/event/SimpleEvent.java
Fri Aug 12 00:48:05 2011
@@ -1,8 +1,10 @@
-package org.apache.flume.core;
+package org.apache.flume.event;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.flume.Event;
+
 public class SimpleEvent<T> implements Event<T> {
 
   private Map<String, String> headers;

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java
Fri Aug 12 00:48:05 2011
@@ -1,6 +1,6 @@
 package org.apache.flume.lifecycle;
 
-import org.apache.flume.core.Context;
+import org.apache.flume.Context;
 
 /**
  * <p>

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleState.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleState.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleState.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleState.java
Fri Aug 12 00:48:05 2011
@@ -2,4 +2,10 @@ package org.apache.flume.lifecycle;
 
 public enum LifecycleState {
   IDLE, START, STOP, ERROR;
+
+  public static final LifecycleState[] START_OR_ERROR = new LifecycleState[] {
+      START, ERROR };
+  public static final LifecycleState[] STOP_OR_ERROR = new LifecycleState[] {
+      STOP, ERROR };
+
 }

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/AbstractEventSink.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/AbstractEventSink.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/AbstractEventSink.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/AbstractEventSink.java
Fri Aug 12 00:48:05 2011
@@ -1,9 +1,9 @@
 package org.apache.flume.sink;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.Event;
-import org.apache.flume.core.EventSink;
-import org.apache.flume.core.EventDeliveryException;
+import org.apache.flume.Context;
+import org.apache.flume.Event;
+import org.apache.flume.EventDeliveryException;
+import org.apache.flume.EventSink;
 import org.apache.flume.lifecycle.LifecycleException;
 
 abstract public class AbstractEventSink implements EventSink {

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/LoggerSink.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/LoggerSink.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/LoggerSink.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/LoggerSink.java
Fri Aug 12 00:48:05 2011
@@ -1,8 +1,8 @@
 package org.apache.flume.sink;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.Event;
-import org.apache.flume.core.EventDeliveryException;
+import org.apache.flume.Context;
+import org.apache.flume.Event;
+import org.apache.flume.EventDeliveryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/NullSink.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/NullSink.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/NullSink.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/sink/NullSink.java
Fri Aug 12 00:48:05 2011
@@ -1,8 +1,8 @@
 package org.apache.flume.sink;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.Event;
-import org.apache.flume.core.EventDeliveryException;
+import org.apache.flume.Context;
+import org.apache.flume.Event;
+import org.apache.flume.EventDeliveryException;
 
 public class NullSink extends AbstractEventSink {
 

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/AbstractEventSource.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/AbstractEventSource.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/AbstractEventSource.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/AbstractEventSource.java
Fri Aug 12 00:48:05 2011
@@ -1,9 +1,9 @@
 package org.apache.flume.source;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.Event;
-import org.apache.flume.core.EventSource;
-import org.apache.flume.core.EventDeliveryException;
+import org.apache.flume.Context;
+import org.apache.flume.Event;
+import org.apache.flume.EventDeliveryException;
+import org.apache.flume.EventSource;
 
 abstract public class AbstractEventSource implements EventSource {
 

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/SequenceGeneratorSource.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/SequenceGeneratorSource.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/SequenceGeneratorSource.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/source/SequenceGeneratorSource.java
Fri Aug 12 00:48:05 2011
@@ -1,9 +1,9 @@
 package org.apache.flume.source;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.Event;
-import org.apache.flume.core.EventDeliveryException;
-import org.apache.flume.core.SimpleEvent;
+import org.apache.flume.Context;
+import org.apache.flume.Event;
+import org.apache.flume.EventDeliveryException;
+import org.apache.flume.event.SimpleEvent;
 
 public class SequenceGeneratorSource extends AbstractEventSource {
 

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestContext.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestContext.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestContext.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestContext.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestContext.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestContext.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestContext.java
Fri Aug 12 00:48:05 2011
@@ -1,5 +1,6 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
+import org.apache.flume.Context;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestCounterGroup.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestCounterGroup.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestCounterGroup.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestCounterGroup.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestCounterGroup.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestCounterGroup.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestCounterGroup.java
Fri Aug 12 00:48:05 2011
@@ -1,9 +1,10 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import java.util.concurrent.atomic.AtomicLong;
 
 import junit.framework.Assert;
 
+import org.apache.flume.CounterGroup;
 import org.junit.Before;
 import org.junit.Test;
 

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestLogicalNode.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestLogicalNode.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestLogicalNode.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestLogicalNode.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestLogicalNode.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestLogicalNode.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestLogicalNode.java
Fri Aug 12 00:48:05 2011
@@ -1,8 +1,10 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.flume.Context;
+import org.apache.flume.LogicalNode;
 import org.apache.flume.lifecycle.LifecycleController;
 import org.apache.flume.lifecycle.LifecycleException;
 import org.apache.flume.lifecycle.LifecycleState;

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestReporter.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestReporter.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestReporter.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestReporter.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestReporter.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/TestReporter.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/TestReporter.java
Fri Aug 12 00:48:05 2011
@@ -1,5 +1,6 @@
-package org.apache.flume.core;
+package org.apache.flume;
 
+import org.apache.flume.Reporter;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java
Fri Aug 12 00:48:05 2011
@@ -2,7 +2,7 @@ package org.apache.flume.lifecycle;
 
 import junit.framework.Assert;
 
-import org.apache.flume.core.Context;
+import org.apache.flume.Context;
 import org.junit.Test;
 
 public class TestLifecycleController {

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/sink/TestLoggerSink.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/sink/TestLoggerSink.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/sink/TestLoggerSink.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/sink/TestLoggerSink.java
Fri Aug 12 00:48:05 2011
@@ -1,8 +1,8 @@
 package org.apache.flume.sink;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.EventDeliveryException;
-import org.apache.flume.core.util.EventBuilder;
+import org.apache.flume.Context;
+import org.apache.flume.EventDeliveryException;
+import org.apache.flume.event.EventBuilder;
 import org.apache.flume.lifecycle.LifecycleException;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestSequenceGeneratorSource.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestSequenceGeneratorSource.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestSequenceGeneratorSource.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestSequenceGeneratorSource.java
Fri Aug 12 00:48:05 2011
@@ -1,9 +1,9 @@
 package org.apache.flume.source;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.Event;
-import org.apache.flume.core.EventSource;
-import org.apache.flume.core.EventDeliveryException;
+import org.apache.flume.Context;
+import org.apache.flume.Event;
+import org.apache.flume.EventDeliveryException;
+import org.apache.flume.EventSource;
 import org.apache.flume.lifecycle.LifecycleException;
 import org.junit.Assert;
 import org.junit.Before;

Copied: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/util/TestEventBuilder.java
(from r1156900, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/util/TestEventBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/util/TestEventBuilder.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/util/TestEventBuilder.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/util/TestEventBuilder.java&r1=1156900&r2=1156901&rev=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/core/util/TestEventBuilder.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/util/TestEventBuilder.java
Fri Aug 12 00:48:05 2011
@@ -1,9 +1,10 @@
-package org.apache.flume.core.util;
+package org.apache.flume.util;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.flume.core.Event;
+import org.apache.flume.Event;
+import org.apache.flume.event.EventBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java
Fri Aug 12 00:48:05 2011
@@ -1,6 +1,6 @@
 package org.apache.flume.node;
 
-import org.apache.flume.core.Context;
+import org.apache.flume.Context;
 import org.apache.flume.lifecycle.LifecycleAware;
 import org.apache.flume.lifecycle.LifecycleException;
 import org.apache.flume.lifecycle.LifecycleState;

Modified: incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/NodeManager.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/NodeManager.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/NodeManager.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/NodeManager.java
Fri Aug 12 00:48:05 2011
@@ -2,7 +2,7 @@ package org.apache.flume.node;
 
 import java.util.Set;
 
-import org.apache.flume.core.LogicalNode;
+import org.apache.flume.LogicalNode;
 import org.apache.flume.lifecycle.LifecycleAware;
 
 public interface NodeManager extends LifecycleAware {

Modified: incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/AbstractLogicalNodeManager.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/AbstractLogicalNodeManager.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/AbstractLogicalNodeManager.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/AbstractLogicalNodeManager.java
Fri Aug 12 00:48:05 2011
@@ -3,7 +3,7 @@ package org.apache.flume.node.nodemanage
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.flume.core.LogicalNode;
+import org.apache.flume.LogicalNode;
 import org.apache.flume.node.NodeManager;
 
 import com.google.common.base.Preconditions;

Modified: incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/FileBasedLogicalNodeManager.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/FileBasedLogicalNodeManager.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/FileBasedLogicalNodeManager.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/FileBasedLogicalNodeManager.java
Fri Aug 12 00:48:05 2011
@@ -1,6 +1,6 @@
 package org.apache.flume.node.nodemanager;
 
-import org.apache.flume.core.Context;
+import org.apache.flume.Context;
 import org.apache.flume.lifecycle.LifecycleException;
 import org.apache.flume.lifecycle.LifecycleState;
 

Modified: incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/MemoryBasedLogicalNodeManager.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/MemoryBasedLogicalNodeManager.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/MemoryBasedLogicalNodeManager.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/MemoryBasedLogicalNodeManager.java
Fri Aug 12 00:48:05 2011
@@ -5,8 +5,8 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.LogicalNode;
+import org.apache.flume.Context;
+import org.apache.flume.LogicalNode;
 import org.apache.flume.lifecycle.LifecycleController;
 import org.apache.flume.lifecycle.LifecycleException;
 import org.apache.flume.lifecycle.LifecycleState;

Modified: incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestAbstractLogicalNodeManager.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestAbstractLogicalNodeManager.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestAbstractLogicalNodeManager.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestAbstractLogicalNodeManager.java
Fri Aug 12 00:48:05 2011
@@ -2,8 +2,8 @@ package org.apache.flume.node;
 
 import junit.framework.Assert;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.LogicalNode;
+import org.apache.flume.Context;
+import org.apache.flume.LogicalNode;
 import org.apache.flume.lifecycle.LifecycleController;
 import org.apache.flume.lifecycle.LifecycleException;
 import org.apache.flume.lifecycle.LifecycleState;

Modified: incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.java?rev=1156901&r1=1156900&r2=1156901&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.java
(original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.java
Fri Aug 12 00:48:05 2011
@@ -1,7 +1,7 @@
 package org.apache.flume.node;
 
-import org.apache.flume.core.Context;
-import org.apache.flume.core.LogicalNode;
+import org.apache.flume.Context;
+import org.apache.flume.LogicalNode;
 import org.apache.flume.lifecycle.LifecycleController;
 import org.apache.flume.lifecycle.LifecycleException;
 import org.apache.flume.lifecycle.LifecycleState;



Mime
View raw message