You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2009/01/29 17:38:03 UTC

svn commit: r738915 [6/7] - in /incubator/etch/trunk: ./ binding-csharp/compiler/ binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/ binding-csharp/compiler/src/main/java/org/ binding-csharp/compiler/src/main/java/org/apache/ binding-...

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmListener.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/AlarmListener.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmListener.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmListener.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/AlarmListener.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/AlarmListener.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmListener.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * Classes wanting alarms must implement this interface to receive the

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmManager.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/AlarmManager.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmManager.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmManager.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/AlarmManager.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/AlarmManager.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmManager.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ArrayIterator.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/ArrayIterator.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ArrayIterator.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ArrayIterator.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/ArrayIterator.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/ArrayIterator.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ArrayIterator.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.lang.reflect.Array;
 import java.util.Iterator;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Assertion.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/Assertion.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Assertion.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Assertion.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/Assertion.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/Assertion.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Assertion.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * Portable assertion checking.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AssertionException.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/AssertionException.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AssertionException.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AssertionException.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/AssertionException.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/AssertionException.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AssertionException.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * Exception thrown upon assertion failure.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ByteBuffer.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/ByteBuffer.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ByteBuffer.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ByteBuffer.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/ByteBuffer.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/ByteBuffer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ByteBuffer.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.io.EOFException;
 import java.nio.BufferOverflowException;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CharIterator.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/CharIterator.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CharIterator.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CharIterator.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/CharIterator.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/CharIterator.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CharIterator.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * @author wert

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularByteBuffer.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/CircularByteBuffer.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularByteBuffer.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularByteBuffer.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/CircularByteBuffer.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/CircularByteBuffer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularByteBuffer.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.io.EOFException;
 import java.nio.BufferOverflowException;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularQueue.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/CircularQueue.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularQueue.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularQueue.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/CircularQueue.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/CircularQueue.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularQueue.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * A circular queue of a fixed size. Elements are added to one

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/EmptyIterator.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/EmptyIterator.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/EmptyIterator.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/EmptyIterator.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/EmptyIterator.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/EmptyIterator.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/EmptyIterator.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/FlexBuffer.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/FlexBuffer.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/FlexBuffer.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/FlexBuffer.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/FlexBuffer.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/FlexBuffer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/FlexBuffer.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.io.EOFException;
 import java.io.IOException;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Hash.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/Hash.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Hash.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Hash.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/Hash.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/Hash.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Hash.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * A pretty cool hash function which has few collisions.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/IdGenerator.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/IdGenerator.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/IdGenerator.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/IdGenerator.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/IdGenerator.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/IdGenerator.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/IdGenerator.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * Synchronously generates long id numbers.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/IntCounter.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/IntCounter.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/IntCounter.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/IntCounter.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/IntCounter.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/IntCounter.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/IntCounter.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * A safe integer counter.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Log.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/Log.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Log.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Log.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/Log.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/Log.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Log.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Monitor.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/Monitor.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Monitor.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Monitor.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/Monitor.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/Monitor.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Monitor.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 
 /**

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/PerfTest.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/PerfTest.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/PerfTest.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/PerfTest.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/PerfTest.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/PerfTest.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/PerfTest.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.util.ArrayList;
 import java.util.Collections;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/PlainByteBuffer.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/PlainByteBuffer.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/PlainByteBuffer.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/PlainByteBuffer.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/PlainByteBuffer.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/PlainByteBuffer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/PlainByteBuffer.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.io.EOFException;
 import java.nio.BufferOverflowException;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Resources.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/Resources.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Resources.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Resources.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/Resources.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/Resources.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Resources.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Runner.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/Runner.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Runner.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Runner.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/Runner.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/Runner.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Runner.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 
 /**

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/RunnerHandler.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/RunnerHandler.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/RunnerHandler.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/RunnerHandler.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/RunnerHandler.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/RunnerHandler.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/RunnerHandler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * RunnerHandler receives notification of runner events.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/SingleIterator.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/SingleIterator.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/SingleIterator.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/SingleIterator.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/SingleIterator.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/SingleIterator.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/SingleIterator.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Startable.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/Startable.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Startable.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Startable.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/Startable.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/Startable.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Startable.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * Description of Startable

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/StringUtil.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/StringUtil.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/StringUtil.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/StringUtil.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/StringUtil.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/StringUtil.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/StringUtil.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * Miscellaneous string utility functions.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TimeoutException.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/TimeoutException.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TimeoutException.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TimeoutException.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/TimeoutException.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/TimeoutException.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TimeoutException.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * RuntimeException for Timeout condition.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Timer.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/Timer.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Timer.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Timer.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/Timer.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/Timer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Timer.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * Timer enables making high precision interval tests. In the usual

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Todo.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/Todo.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Todo.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Todo.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/Todo.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/Todo.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Todo.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * A Todo is used to perform a lightweight action.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TodoManager.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/TodoManager.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TodoManager.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TodoManager.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/TodoManager.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/TodoManager.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TodoManager.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 /**
  * A standalone verion of a processor for todo items.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/URL.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/URL.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/URL.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/URL.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/URL.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/URL.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/URL.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/AndConstraint.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/AndConstraint.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/AndConstraint.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/AndConstraint.java Thu Jan 29 16:37:49 2009
@@ -16,7 +16,7 @@
  *
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * Description of AndConstraint.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanConverter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanConverter.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanConverter.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanConverter.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanOption.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanOption.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanOption.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanOption.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * An option whose value is a boolean.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanParameter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanParameter.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanParameter.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/BooleanParameter.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * A parameter whose value is a boolean.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/CommandParser.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/CommandParser.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/CommandParser.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/CommandParser.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -27,9 +27,10 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import etch.util.CharIterator;
-import etch.util.StringUtil;
-import etch.util.URL;
+import org.apache.etch.util.CharIterator;
+import org.apache.etch.util.StringUtil;
+import org.apache.etch.util.URL;
+
 
 /**
  * CommandParser implements standard parsing of command lines.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Constraint.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Constraint.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Constraint.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Constraint.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * Constraint allows situational conditions to be placed upon

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/DoubleOption.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/DoubleOption.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/DoubleOption.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/DoubleOption.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * An option whose value is a double.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/DoubleParameter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/DoubleParameter.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/DoubleParameter.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/DoubleParameter.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * A parameter whose value is a double.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/FileOption.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/FileOption.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/FileOption.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/FileOption.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import java.io.File;
 

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/FileParameter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/FileParameter.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/FileParameter.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/FileParameter.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import java.io.File;
 

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntRangeConstraint.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntRangeConstraint.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntRangeConstraint.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntRangeConstraint.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * Description of IntRangeConstraint

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntegerOption.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntegerOption.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntegerOption.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntegerOption.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * An option whose value is an integer.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntegerParameter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntegerParameter.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntegerParameter.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/IntegerParameter.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * A parameter whose value is an integer.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/NullOption.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/NullOption.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/NullOption.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/NullOption.java Thu Jan 29 16:37:49 2009
@@ -15,9 +15,9 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
-import etch.util.Assertion;
+import org.apache.etch.util.Assertion;
 
 /**
  * An option which has no value.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OneOfConstraint.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OneOfConstraint.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OneOfConstraint.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OneOfConstraint.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import java.util.HashSet;
 import java.util.Set;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OptParamBase.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OptParamBase.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OptParamBase.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OptParamBase.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import java.lang.reflect.Method;
 

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Option.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Option.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Option.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Option.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OrConstraint.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OrConstraint.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OrConstraint.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OrConstraint.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * Description of OrConstraint.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Parameter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Parameter.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Parameter.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Parameter.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import java.lang.reflect.InvocationTargetException;
 

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/ParityConstraint.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/ParityConstraint.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/ParityConstraint.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/ParityConstraint.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * Description of ParityConstraint.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Program.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Program.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Program.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Program.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * Description of Program

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringArrayIterator.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringArrayIterator.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringArrayIterator.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringArrayIterator.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringArrayOption.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringArrayOption.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringArrayOption.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringArrayOption.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * An option whose value is a string.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringLengthConstraint.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringLengthConstraint.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringLengthConstraint.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringLengthConstraint.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * Description of StringLengthConstraint

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringOption.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringOption.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringOption.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringOption.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * An option whose value is a string.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringParameter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringParameter.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringParameter.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/StringParameter.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 /**
  * A parameter whose value is a string.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/UrlOption.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/UrlOption.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/UrlOption.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/UrlOption.java Thu Jan 29 16:37:49 2009
@@ -15,9 +15,9 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
-import etch.util.URL;
+import org.apache.etch.util.URL;
 
 /**
  * An option whose value is a url.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/UrlParameter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/UrlParameter.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/UrlParameter.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/UrlParameter.java Thu Jan 29 16:37:49 2009
@@ -15,9 +15,9 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
-import etch.util.URL;
+import org.apache.etch.util.URL;
 
 /**
  * A parameter whose value is a url.

Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/Who.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/core/Who.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/Who.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/Who.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/core/Who.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/core/Who.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/Who.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core;
+package org.apache.etch.util.core;
 
 /**
  * Abstraction of sender used by the various sources of data,

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Connection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Connection.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Connection.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Connection.java Thu Jan 29 16:37:49 2009
@@ -15,17 +15,18 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import java.io.IOException;
 import java.net.SocketAddress;
 import java.net.SocketException;
 
-import etch.util.Monitor;
-import etch.util.Runner;
-import etch.util.RunnerHandler;
-import etch.util.Todo;
-import etch.util.TodoManager;
+import org.apache.etch.util.Monitor;
+import org.apache.etch.util.Runner;
+import org.apache.etch.util.RunnerHandler;
+import org.apache.etch.util.Todo;
+import org.apache.etch.util.TodoManager;
+
 
 /**
  * Implementation of runner which handles a network connection.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/InetWho.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/InetWho.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/InetWho.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/InetWho.java Thu Jan 29 16:37:49 2009
@@ -15,11 +15,12 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import java.net.InetAddress;
 
-import etch.util.core.Who;
+import org.apache.etch.util.core.Who;
+
 
 
 /**

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Packetizer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Packetizer.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Packetizer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Packetizer.java Thu Jan 29 16:37:49 2009
@@ -15,14 +15,15 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import java.io.IOException;
 
-import etch.util.FlexBuffer;
-import etch.util.Resources;
-import etch.util.URL;
-import etch.util.core.Who;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.Who;
+
 
 /**
  * Packetizes a stream data source. Reads a packet header:

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Session.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Session.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Session.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Session.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 /**
  * Out-of-band query, control, and notification interface for sessions.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionData.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionData.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionData.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionData.java Thu Jan 29 16:37:49 2009
@@ -15,10 +15,10 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
-import etch.util.FlexBuffer;
-import etch.util.core.Who;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.core.Who;
 
 /**
  * Interface used to deliver packets to the session from the transport.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionListener.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionListener.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionListener.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 /**
  * Interface used to deliver new connections to the session from the listener.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionPacket.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionPacket.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionPacket.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/SessionPacket.java Thu Jan 29 16:37:49 2009
@@ -15,10 +15,10 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
-import etch.util.FlexBuffer;
-import etch.util.core.Who;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.core.Who;
 
 /**
  * Interface used to deliver packets to the session from the transport.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpConnection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpConnection.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpConnection.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpConnection.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,9 +23,10 @@
 import java.net.Socket;
 import java.net.SocketException;
 
-import etch.util.FlexBuffer;
-import etch.util.Resources;
-import etch.util.URL;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+
 
 /**
  * Implementation of connection which handles a tcp connection.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpListener.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpListener.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpListener.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import java.io.IOException;
 import java.net.BindException;
@@ -25,8 +25,9 @@
 import java.net.SocketAddress;
 import java.net.SocketException;
 
-import etch.util.Resources;
-import etch.util.URL;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+
 
 /**
  * Implementation of a connection which handles a socket listener.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpOptions.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpOptions.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpOptions.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpOptions.java Thu Jan 29 16:37:49 2009
@@ -15,10 +15,10 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
-import etch.util.Resources;
-import etch.util.URL;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
 
 /**
  * TCP connection options.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpTransport.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpTransport.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpTransport.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpTransport.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -25,10 +25,11 @@
 import java.net.SocketAddress;
 import java.net.SocketException;
 
-import etch.util.FlexBuffer;
-import etch.util.Resources;
-import etch.util.URL;
-import etch.util.core.Who;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.Who;
+
 
 /**
  * Constants and methods related to tcp transport.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsConnection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsConnection.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsConnection.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsConnection.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,9 +29,10 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
-import etch.util.FlexBuffer;
-import etch.util.Resources;
-import etch.util.URL;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+
 
 /**
  * Implementation of connection which handles a secure tcp connection.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsListener.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsListener.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsListener.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -32,8 +32,9 @@
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocket;
 
-import etch.util.Resources;
-import etch.util.URL;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+
 
 /**
  * Implementation of a connection which handles a secure socket listener.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Transport.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Transport.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Transport.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Transport.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 /**
  * Out-of-band query, control, and notification interface for transports.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TransportData.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TransportData.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TransportData.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TransportData.java Thu Jan 29 16:37:49 2009
@@ -15,10 +15,10 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
-import etch.util.FlexBuffer;
-import etch.util.core.Who;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.core.Who;
 
 /**
  * Interface used to deliver data to the transport from the session.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TransportPacket.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TransportPacket.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TransportPacket.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TransportPacket.java Thu Jan 29 16:37:49 2009
@@ -15,10 +15,10 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
-import etch.util.FlexBuffer;
-import etch.util.core.Who;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.core.Who;
 
 /**
  * Interface used to deliver packets to the transport from the session.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/UdpConnection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/UdpConnection.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/UdpConnection.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/UdpConnection.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -25,10 +25,11 @@
 import java.net.SocketAddress;
 import java.net.SocketException;
 
-import etch.util.FlexBuffer;
-import etch.util.Resources;
-import etch.util.URL;
-import etch.util.core.Who;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.Who;
+
 
 /**
  * Implementation of connection which handles a udp connection.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AbstractHandler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AbstractHandler.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AbstractHandler.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AbstractHandler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.io.EOFException;
 import java.io.IOException;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AcceptHandler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AcceptHandler.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AcceptHandler.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AcceptHandler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.io.EOFException;
 import java.net.InetSocketAddress;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AcceptHandlerFactory.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AcceptHandlerFactory.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AcceptHandlerFactory.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/AcceptHandlerFactory.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.nio.channels.ServerSocketChannel;
 

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/ByteBufferPool.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/ByteBufferPool.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/ByteBufferPool.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/ByteBufferPool.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -23,10 +23,11 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import etch.util.AlarmListener;
-import etch.util.AlarmManager;
-import etch.util.Todo;
-import etch.util.TodoManager;
+import org.apache.etch.util.AlarmListener;
+import org.apache.etch.util.AlarmManager;
+import org.apache.etch.util.Todo;
+import org.apache.etch.util.TodoManager;
+
 
 /**
  * A shared pool of buffers.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Handler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Handler.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Handler.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Handler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/History.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/History.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/History.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/History.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 /**
  * History keeps track of pooled resource allocations, plus maintains historical

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Selector.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Selector.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Selector.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Selector.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.io.IOException;
 import java.nio.channels.CancelledKeyException;
@@ -24,7 +24,8 @@
 import java.nio.channels.SelectionKey;
 import java.util.LinkedList;
 
-import etch.util.Assertion;
+import org.apache.etch.util.Assertion;
+
 
 /**
  * An experiment in selection.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandler.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandler.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandlerFactory.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandlerFactory.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandlerFactory.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandlerFactory.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.io.IOException;
 import java.nio.channels.SocketChannel;

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/SuperSelector.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/SuperSelector.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/SuperSelector.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/SuperSelector.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -28,7 +28,8 @@
 import java.util.NoSuchElementException;
 import java.util.TreeMap;
 
-import etch.util.Assertion;
+import org.apache.etch.util.Assertion;
+
 
 /**
  * Models the external api of a Selector while keeping a list of available

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Connection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Connection.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Connection.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Connection.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -26,20 +26,21 @@
 import java.nio.channels.SocketChannel;
 import java.util.LinkedList;
 
-import etch.util.AlarmListener;
-import etch.util.AlarmManager;
-import etch.util.FlexBuffer;
-import etch.util.Monitor;
-import etch.util.Resources;
-import etch.util.Todo;
-import etch.util.TodoManager;
-import etch.util.URL;
-import etch.util.core.Who;
-import etch.util.core.io.Session;
-import etch.util.core.io.SessionData;
-import etch.util.core.io.TcpConnection;
-import etch.util.core.io.TcpOptions;
-import etch.util.core.io.TransportData;
+import org.apache.etch.util.AlarmListener;
+import org.apache.etch.util.AlarmManager;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.Monitor;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.Todo;
+import org.apache.etch.util.TodoManager;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.Who;
+import org.apache.etch.util.core.io.Session;
+import org.apache.etch.util.core.io.SessionData;
+import org.apache.etch.util.core.io.TcpConnection;
+import org.apache.etch.util.core.io.TcpOptions;
+import org.apache.etch.util.core.io.TransportData;
+
 
 /**
  * A TCP-based transport based on selectors.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Listener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Listener.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Listener.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Listener.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.nio;
+package org.apache.etch.util.core.nio;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -25,15 +25,16 @@
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 
-import etch.util.Monitor;
-import etch.util.Resources;
-import etch.util.Todo;
-import etch.util.TodoManager;
-import etch.util.URL;
-import etch.util.core.io.Session;
-import etch.util.core.io.SessionListener;
-import etch.util.core.io.TcpConnection;
-import etch.util.core.io.Transport;
+import org.apache.etch.util.Monitor;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.Todo;
+import org.apache.etch.util.TodoManager;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.io.Session;
+import org.apache.etch.util.core.io.SessionListener;
+import org.apache.etch.util.core.io.TcpConnection;
+import org.apache.etch.util.core.io.Transport;
+
 
 /**
  * Selector based TCP listener.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/CircularStringBuf.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/CircularStringBuf.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/CircularStringBuf.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/CircularStringBuf.java Thu Jan 29 16:37:49 2009
@@ -15,9 +15,9 @@
  * under the License.
  */
 
-package etch.util.core.xml;
+package org.apache.etch.util.core.xml;
 
-import etch.util.Assertion;
+import org.apache.etch.util.Assertion;
 
 /**
  * A StringBuf implemented as a circular fixed-size list of characters.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/ParseException.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/ParseException.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/ParseException.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/ParseException.java Thu Jan 29 16:37:49 2009
@@ -15,12 +15,13 @@
  * under the License.
  */
 
-package etch.util.core.xml;
+package org.apache.etch.util.core.xml;
 
 import java.io.IOException;
 import java.util.List;
 
-import etch.util.core.xml.XmlParser.TagElement;
+import org.apache.etch.util.core.xml.XmlParser.TagElement;
+
 
 
 /**

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/PlainStringBuf.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/PlainStringBuf.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/PlainStringBuf.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/PlainStringBuf.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.xml;
+package org.apache.etch.util.core.xml;
 
 /**
  * Description of PlainStringBuf.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/StringBuf.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/StringBuf.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/StringBuf.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/StringBuf.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.xml;
+package org.apache.etch.util.core.xml;
 
 /**
  * A simple interface to a string buffer.

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/StringBufWithEscape.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/StringBufWithEscape.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/StringBufWithEscape.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/StringBufWithEscape.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.xml;
+package org.apache.etch.util.core.xml;
 
 import java.util.Map;
 

Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/XmlParser.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/XmlParser.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/XmlParser.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/XmlParser.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.xml;
+package org.apache.etch.util.core.xml;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -35,10 +35,11 @@
 import java.util.Stack;
 import java.util.StringTokenizer;
 
-import etch.util.Assertion;
-import etch.util.EmptyIterator;
-import etch.util.SingleIterator;
-import etch.util.StringUtil;
+import org.apache.etch.util.Assertion;
+import org.apache.etch.util.EmptyIterator;
+import org.apache.etch.util.SingleIterator;
+import org.apache.etch.util.StringUtil;
+
 
 
 /**

Copied: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/PerfBasics.java (from r738231, incubator/etch/trunk/util/src/test/java/etch/util/PerfBasics.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/PerfBasics.java?p2=incubator/etch/trunk/util/src/test/java/org/apache/etch/util/PerfBasics.java&p1=incubator/etch/trunk/util/src/test/java/etch/util/PerfBasics.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/etch/util/PerfBasics.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/PerfBasics.java Thu Jan 29 16:37:49 2009
@@ -15,11 +15,13 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.etch.util.PerfTest;
+
 /**
  * Basic perf tests.
  */

Copied: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestAlarmManager.java (from r738231, incubator/etch/trunk/util/src/test/java/etch/util/TestAlarmManager.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestAlarmManager.java?p2=incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestAlarmManager.java&p1=incubator/etch/trunk/util/src/test/java/etch/util/TestAlarmManager.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/etch/util/TestAlarmManager.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestAlarmManager.java Thu Jan 29 16:37:49 2009
@@ -16,8 +16,12 @@
  * the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
+import org.apache.etch.util.AlarmListener;
+import org.apache.etch.util.AlarmManager;
+import org.apache.etch.util.Monitor;
+import org.apache.etch.util.TimeoutException;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

Copied: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestCircularQueue.java (from r738231, incubator/etch/trunk/util/src/test/java/etch/util/TestCircularQueue.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestCircularQueue.java?p2=incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestCircularQueue.java&p1=incubator/etch/trunk/util/src/test/java/etch/util/TestCircularQueue.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/etch/util/TestCircularQueue.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestCircularQueue.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,6 +23,9 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.etch.util.CircularQueue;
+import org.apache.etch.util.TimeoutException;
+import org.apache.etch.util.Timer;
 import org.junit.Test;
 
 /** Test of CircularQueue */

Copied: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestFlexBuffer.java (from r738231, incubator/etch/trunk/util/src/test/java/etch/util/TestFlexBuffer.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestFlexBuffer.java?p2=incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestFlexBuffer.java&p1=incubator/etch/trunk/util/src/test/java/etch/util/TestFlexBuffer.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/etch/util/TestFlexBuffer.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestFlexBuffer.java Thu Jan 29 16:37:49 2009
@@ -15,13 +15,14 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import static org.junit.Assert.assertEquals;
 
 import java.io.EOFException;
 import java.io.IOException;
 
+import org.apache.etch.util.FlexBuffer;
 import org.junit.Test;
 
 /**

Copied: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestHelp.java (from r738231, incubator/etch/trunk/util/src/test/java/etch/util/TestHelp.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestHelp.java?p2=incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestHelp.java&p1=incubator/etch/trunk/util/src/test/java/etch/util/TestHelp.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/etch/util/TestHelp.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestHelp.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import static org.junit.Assert.fail;
 

Copied: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestMonitor.java (from r738231, incubator/etch/trunk/util/src/test/java/etch/util/TestMonitor.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestMonitor.java?p2=incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestMonitor.java&p1=incubator/etch/trunk/util/src/test/java/etch/util/TestMonitor.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/etch/util/TestMonitor.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestMonitor.java Thu Jan 29 16:37:49 2009
@@ -15,12 +15,14 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.etch.util.Monitor;
+import org.apache.etch.util.TimeoutException;
 import org.junit.Test;
 
 /** Test of Monitor */

Copied: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestUrl1.java (from r738231, incubator/etch/trunk/util/src/test/java/etch/util/TestUrl1.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestUrl1.java?p2=incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestUrl1.java&p1=incubator/etch/trunk/util/src/test/java/etch/util/TestUrl1.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/etch/util/TestUrl1.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestUrl1.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util;
+package org.apache.etch.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.etch.util.URL;
 import org.junit.Test;
 
 /**

Modified: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/cmd/TestCommandParser.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/cmd/TestCommandParser.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/org/apache/etch/util/cmd/TestCommandParser.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/cmd/TestCommandParser.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.cmd;
+package org.apache.etch.util.cmd;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,12 +25,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.etch.util.cmd.CommandParser;
+import org.apache.etch.util.cmd.Option;
+import org.apache.etch.util.cmd.Parameter;
 import org.junit.Test;
 
 /**
  * Test of CommandParser.
  */
-public class TestCommandParser extends etch.util.cmd.Program
+public class TestCommandParser extends org.apache.etch.util.cmd.Program
 {
 	/**
 	 * @param args

Modified: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestPacketizer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestPacketizer.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestPacketizer.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestPacketizer.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package etch.util.core.io;
+package org.apache.etch.util.core.io;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -25,11 +25,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.core.Who;
+import org.apache.etch.util.core.io.Packetizer;
+import org.apache.etch.util.core.io.SessionData;
+import org.apache.etch.util.core.io.SessionPacket;
+import org.apache.etch.util.core.io.TransportData;
 import org.junit.Before;
 import org.junit.Test;
 
-import etch.util.FlexBuffer;
-import etch.util.core.Who;
 
 /**
  * JUnit Test for Packetizer