svn commit: r961220 [3/4] - in /activemq/sandbox/activemq-apollo-actor: activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/ activemq-broker/src/main/scala/org/apache/a...

[ch...@apache.org]

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/MemoryPropertyEditor.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/MemoryPropertyEditor.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/MemoryPropertyEditor.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/MemoryPropertyEditor.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/MemoryPropertyEditor.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/MemoryPropertyEditor.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/MemoryPropertyEditor.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.beans.PropertyEditorSupport;
 import java.util.regex.Matcher;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityLinkedList.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityLinkedList.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityLinkedList.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityLinkedList.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityLinkedList.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityLinkedList.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityLinkedList.java Wed Jul  7 04:27:35 2010
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.ArrayList;
 
-import org.apache.activemq.util.list.LinkedNode;
-import org.apache.activemq.util.list.LinkedNodeList;
+import org.apache.activemq.apollo.util.list.LinkedNode;
+import org.apache.activemq.apollo.util.list.LinkedNodeList;
 
 public class PriorityLinkedList<E extends LinkedNode<E>> {
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityMap.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityMap.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityMap.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityMap.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityMap.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityMap.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityMap.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.Arrays;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ProcessSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ProcessSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ProcessSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ProcessSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ProcessSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ProcessSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ProcessSupport.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtbuf.ByteArrayOutputStream;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Reporter.scala (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Reporter.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Reporter.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Reporter.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Reporter.scala&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Reporter.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Reporter.scala Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.broker
+package org.apache.activemq.apollo.util
 
 import _root_.java.lang.{String}
 import java.util.{LinkedHashMap}

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Scheduler.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Scheduler.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Scheduler.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Scheduler.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Scheduler.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Scheduler.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Scheduler.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.HashMap;
 import java.util.Timer;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SchedulerTimerTask.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SchedulerTimerTask.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SchedulerTimerTask.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SchedulerTimerTask.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SchedulerTimerTask.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SchedulerTimerTask.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SchedulerTimerTask.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.TimerTask;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Service.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/Service.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Service.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Service.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/Service.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/Service.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Service.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq;
+package org.apache.activemq.apollo.util;
 
 
 /**

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceListener.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceListener.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceListener.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceListener.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceListener.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceListener.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceListener.java Wed Jul  7 04:27:35 2010
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
-
-import org.apache.activemq.Service;
+package org.apache.activemq.apollo.util;
 
 /**
  * A listener for service start, stop events

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceStopper.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceStopper.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceStopper.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java Wed Jul  7 04:27:35 2010
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.activemq.Service;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java Wed Jul  7 04:27:35 2010
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.activemq.Service;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceTrait.scala (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/ServiceTrait.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceTrait.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceTrait.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/ServiceTrait.scala&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/ServiceTrait.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceTrait.scala Wed Jul  7 04:27:35 2010
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo
+package org.apache.activemq.apollo.util
 
-import org.apache.activemq.Service
 import org.fusesource.hawtdispatch.ScalaDispatch
 
 /**

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SslContext.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SslContext.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SslContext.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SslContext.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SslContext.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SslContext.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SslContext.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/StringSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/StringSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/StringSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/StringSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/StringSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/StringSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/StringSupport.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.Arrays;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TimerHeap.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TimerHeap.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TimerHeap.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TimerHeap.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TimerHeap.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TimerHeap.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TimerHeap.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.LinkedList;
 import java.util.TreeMap;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TreeMap.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TreeMap.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TreeMap.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TreeMap.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TreeMap.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TreeMap.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TreeMap.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.io.Serializable;
 import java.util.AbstractCollection;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URIEditor.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URIEditor.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URIEditor.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URIEditor.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URIEditor.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URIEditor.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URIEditor.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.beans.PropertyEditorSupport;
 import java.net.URI;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URISupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URISupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URISupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URISupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URISupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URISupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URISupport.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommandLineSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommandLineSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommandLineSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommandLineSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommandLineSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommandLineSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommandLineSupport.java Wed Jul  7 04:27:35 2010
@@ -19,7 +19,7 @@ package org.apache.activemq.util.cli;
 
 import java.util.ArrayList;
 
-import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.apollo.util.IntrospectionSupport;
 
 /**
  * Support utility that can be used to set the properties on any object

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommonsCLISupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommonsCLISupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommonsCLISupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommonsCLISupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommonsCLISupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommonsCLISupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommonsCLISupport.java Wed Jul  7 04:27:35 2010
@@ -3,7 +3,7 @@ package org.apache.activemq.util.cli;
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.apollo.util.IntrospectionSupport;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/OptionBuilder.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/OptionBuilder.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/OptionBuilder.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/OptionBuilder.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/OptionBuilder.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIBaseStorable.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIBaseStorable.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIBaseStorable.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIBaseStorable.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIBaseStorable.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIBaseStorable.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIBaseStorable.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jndi;
+package org.apache.activemq.apollo.util.jndi;
 
 import java.io.Externalizable;
 import java.io.IOException;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIReferenceFactory.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIReferenceFactory.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIReferenceFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jndi;
+package org.apache.activemq.apollo.util.jndi;
 
 import java.util.Enumeration;
 import java.util.Hashtable;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIStorableInterface.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIStorableInterface.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIStorableInterface.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIStorableInterface.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIStorableInterface.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIStorableInterface.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIStorableInterface.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jndi;
+package org.apache.activemq.apollo.util.jndi;
 
 import java.util.Properties;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/LazyCreateContext.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/LazyCreateContext.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/LazyCreateContext.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/LazyCreateContext.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/LazyCreateContext.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/LazyCreateContext.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/LazyCreateContext.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jndi;
+package org.apache.activemq.apollo.util.jndi;
 
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/NameParserImpl.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/NameParserImpl.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/NameParserImpl.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/NameParserImpl.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/NameParserImpl.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/NameParserImpl.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/NameParserImpl.java Wed Jul  7 04:27:35 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.jndi;
+package org.apache.activemq.apollo.util.jndi;
 
 import javax.naming.CompositeName;
 import javax.naming.Name;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/ReadOnlyContext.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/ReadOnlyContext.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/ReadOnlyContext.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/ReadOnlyContext.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/ReadOnlyContext.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/ReadOnlyContext.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/ReadOnlyContext.java Wed Jul  7 04:27:35 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.jndi;
+package org.apache.activemq.apollo.util.jndi;
 
 import java.io.Serializable;
 import java.util.Collections;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/package.html (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/package.html)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/package.html?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/package.html&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/package.html&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNode.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNode.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNode.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNode.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNode.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNode.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNode.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util.list;
+package org.apache.activemq.apollo.util.list;
 
 /**
  * Provides a base class for you to extend when you want object to maintain a

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNodeList.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNodeList.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNodeList.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNodeList.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNodeList.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNodeList.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNodeList.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util.list;
+package org.apache.activemq.apollo.util.list;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/Sequence.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/Sequence.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/Sequence.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/Sequence.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/Sequence.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/Sequence.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/Sequence.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util.list;
+package org.apache.activemq.apollo.util.list;
 
 
 /**

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SequenceSet.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SequenceSet.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SequenceSet.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SequenceSet.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SequenceSet.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SequenceSet.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SequenceSet.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util.list;
+package org.apache.activemq.apollo.util.list;
 
 import org.fusesource.hawtbuf.codec.Codec;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedList.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedList.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedList.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedList.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedList.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedList.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedList.java Wed Jul  7 04:27:35 2010
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util.list;
+package org.apache.activemq.apollo.util.list;
 
 import java.util.ArrayList;
 import java.util.Map.Entry;
 
-import org.apache.activemq.util.Comparators;
-import org.apache.activemq.util.TreeMap;
+import org.apache.activemq.apollo.util.Comparators;
+import org.apache.activemq.apollo.util.TreeMap;
 
 public class SortedLinkedList<T extends SortedLinkedListNode<T>> {
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedListNode.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedListNode.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedListNode.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedListNode.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedListNode.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedListNode.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedListNode.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util.list;
+package org.apache.activemq.apollo.util.list;
 
 public abstract class SortedLinkedListNode<T extends SortedLinkedListNode<T>> {
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Metric.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Metric.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Metric.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Metric.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Metric.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Metric.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Metric.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.metric;
+package org.apache.activemq.apollo.util.metric;
 
 abstract public class Metric {
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricAggregator.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricAggregator.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricAggregator.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricAggregator.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricAggregator.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricAggregator.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricAggregator.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.metric;
+package org.apache.activemq.apollo.util.metric;
 
 import java.util.ArrayList;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricCounter.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricCounter.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricCounter.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricCounter.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricCounter.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricCounter.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricCounter.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.metric;
+package org.apache.activemq.apollo.util.metric;
 
 import java.util.concurrent.atomic.AtomicLong;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Period.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Period.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Period.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Period.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Period.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Period.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Period.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.metric;
+package org.apache.activemq.apollo.util.metric;
 
 public class Period {
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/CLibrary.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/CLibrary.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/CLibrary.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/CLibrary.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/CLibrary.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/CLibrary.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/CLibrary.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util.os;
+package org.apache.activemq.apollo.util.os;
 
 public interface CLibrary {
     void fcntl(int fd, int cmd, Object... args);

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/JnaCLibrary.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/JnaCLibrary.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/JnaCLibrary.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/JnaCLibrary.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/JnaCLibrary.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/JnaCLibrary.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/JnaCLibrary.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util.os;
+package org.apache.activemq.apollo.util.os;
 
 import com.sun.jna.Library;
 import com.sun.jna.Native;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/AutoFailTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/AutoFailTestSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/AutoFailTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo;
+package org.apache.activemq.apollo.util;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/BitArrayBinTest.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/BitArrayBinTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/BitArrayBinTest.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/BitArrayBinTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/BitArrayBinTest.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/BitArrayBinTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/BitArrayBinTest.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import org.junit.Test;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/CombinationTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/CombinationTestSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/CombinationTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo;
+package org.apache.activemq.apollo.util;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala Wed Jul  7 04:27:35 2010
@@ -1,5 +1,4 @@
-package org.apache.activemq.apollo.broker
-
+package org.apache.activemq.apollo.util
 
 import _root_.org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/HashRingTest.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/HashRingTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/HashRingTest.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/HashRingTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/HashRingTest.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/HashRingTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/HashRingTest.java Wed Jul  7 04:27:35 2010
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import junit.framework.TestCase;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/MessageIdList.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/MessageIdList.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/MessageIdList.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/ReflectionSupportTest.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/ReflectionSupportTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/ReflectionSupportTest.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/ReflectionSupportTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/ReflectionSupportTest.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/ReflectionSupportTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/ReflectionSupportTest.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import org.junit.Test;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/SocketProxy.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/SocketProxy.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/SocketProxy.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java Wed Jul  7 04:27:35 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/TreeMapTest.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/TreeMapTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/TreeMapTest.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/TreeMapTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/TreeMapTest.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/TreeMapTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/TreeMapTest.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.util.Comparator;
 import java.util.Iterator;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/URISupportTest.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/URISupportTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/URISupportTest.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/URISupportTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/URISupportTest.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/URISupportTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/URISupportTest.java Wed Jul  7 04:27:35 2010
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.util;
+package org.apache.activemq.apollo.util;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
 
-import org.apache.activemq.util.URISupport.CompositeData;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -33,13 +32,13 @@ public class URISupportTest {
     
     @Test()
 	public void testEmptyCompositePath() throws Exception {
-        CompositeData data = URISupport.parseComposite(new URI("broker:()/localhost?persistent=false"));
+        URISupport.CompositeData data = URISupport.parseComposite(new URI("broker:()/localhost?persistent=false"));
         assertEquals(0, data.getComponents().length);        
     }
             
     @Test()
 	public void testCompositePath() throws Exception {
-        CompositeData data = URISupport.parseComposite(new URI("test:(path)/path"));
+        URISupport.CompositeData data = URISupport.parseComposite(new URI("test:(path)/path"));
         assertEquals("path", data.getPath());        
         data = URISupport.parseComposite(new URI("test:path"));
         assertNull(data.getPath());
@@ -47,13 +46,13 @@ public class URISupportTest {
 
 	@Test()
 	public void testSimpleComposite() throws Exception {
-        CompositeData data = URISupport.parseComposite(new URI("test:part1"));
+        URISupport.CompositeData data = URISupport.parseComposite(new URI("test:part1"));
         assertEquals(1, data.getComponents().length);
     }
 
     @Test()
 	public void testComposite() throws Exception {
-        CompositeData data = URISupport.parseComposite(new URI("test:(part1://host,part2://(sub1://part,sube2:part))"));
+        URISupport.CompositeData data = URISupport.parseComposite(new URI("test:(part1://host,part2://(sub1://part,sube2:part))"));
         assertEquals(2, data.getComponents().length);
     }
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ConfigStore.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ConfigStore.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ConfigStore.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ConfigStore.scala Wed Jul  7 04:27:35 2010
@@ -22,13 +22,12 @@ import org.apache.activemq.apollo.dto.{X
 import java.util.regex.Pattern
 import javax.xml.stream.{XMLOutputFactory, XMLInputFactory}
 import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
-import org.apache.activemq.util.{Hasher, IOHelper}
 import java.util.concurrent.{TimeUnit, ExecutorService, Executors}
 import org.fusesource.hawtbuf.{ByteArrayInputStream, ByteArrayOutputStream}
-import org.apache.activemq.Service
 import javax.xml.bind.{Marshaller, JAXBContext}
 import java.io.{OutputStreamWriter, File}
 import XmlEncoderDecoder._
+import org.apache.activemq.apollo.util._
 
 object ConfigStore {
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ServletContextListener.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ServletContextListener.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ServletContextListener.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ServletContextListener.scala Wed Jul  7 04:27:35 2010
@@ -21,7 +21,8 @@ import org.fusesource.scalate.guice.Scal
 import javax.servlet.ServletContextEvent
 import java.io.File
 import com.google.inject.{Provides, Guice, Singleton}
-import org.apache.activemq.apollo.broker.{BrokerRegistry, LoggingTracker, Broker}
+import org.apache.activemq.apollo.broker.{BrokerRegistry, Broker}
+import org.apache.activemq.apollo.util._
 
 
 /**

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/test/scala/org/apache/activemq/apollo/web/FileConfigStoreTest.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/test/scala/org/apache/activemq/apollo/web/FileConfigStoreTest.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/test/scala/org/apache/activemq/apollo/web/FileConfigStoreTest.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/test/scala/org/apache/activemq/apollo/web/FileConfigStoreTest.scala Wed Jul  7 04:27:35 2010
@@ -19,7 +19,7 @@ package org.apache.activemq.apollo.web
 import java.io.File
 import java.util.concurrent.{TimeUnit, CountDownLatch}
 import org.fusesource.hawtdispatch.Future
-import org.apache.activemq.apollo.broker.{FunSuiteSupport, LoggingTracker}
+import org.apache.activemq.apollo.util._
 
 /**
  * <p>

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/filter/dummyPolicy.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/filter/dummyPolicy.xml?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/filter/dummyPolicy.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/filter/dummyPolicy.xml Wed Jul  7 04:27:35 2010
@@ -19,10 +19,10 @@
 <beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <bean id="policy" class="org.apache.activemq.filter.DummyPolicy">
+  <bean id="policy" class="org.apache.activemq.apollo.filter.DummyPolicy">
     <property name="entries">
       <list>
-        <bean class="org.apache.activemq.filter.DummyPolicyEntry">
+        <bean class="org.apache.activemq.apollo.filter.DummyPolicyEntry">
           <property name="topic" value="FOO.>" />
           <property name="description" value="Edam" />
         </bean>

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java Wed Jul  7 04:27:35 2010
@@ -6,7 +6,7 @@ import org.apache.activemq.amqp.wireform
 import org.apache.activemq.amqp.protocol.types.AmqpTransfer;
 import org.apache.activemq.apollo.broker.BrokerMessageDelivery;
 import org.apache.activemq.apollo.broker.Destination;
-import org.apache.activemq.filter.MessageEvaluationContext;
+import org.apache.activemq.apollo.filter.MessageEvaluationContext;
 import org.fusesource.hawtbuf.AsciiBuffer;
 import org.fusesource.hawtbuf.Buffer;
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java Wed Jul  7 04:27:35 2010
@@ -36,7 +36,7 @@ import javax.jms.TopicConnectionFactory;
 import javax.naming.Context;
 
 import org.apache.activemq.blob.BlobTransferPolicy;
-import org.apache.activemq.jndi.JNDIBaseStorable;
+import org.apache.activemq.apollo.util.jndi.JNDIBaseStorable;
 import org.apache.activemq.management.JMSStatsImpl;
 import org.apache.activemq.management.StatsCapable;
 import org.apache.activemq.management.StatsImpl;

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Wed Jul  7 04:27:35 2010
@@ -50,7 +50,7 @@ import org.apache.activemq.filter.Filter
 import org.apache.activemq.management.JMSConsumerStatsImpl;
 import org.apache.activemq.management.StatsCapable;
 import org.apache.activemq.management.StatsImpl;
-import org.apache.activemq.selector.SelectorParser;
+import org.apache.activemq.apollo.selector.SelectorParser;
 import org.apache.activemq.thread.Scheduler;
 import org.apache.activemq.transaction.Synchronization;
 import org.apache.activemq.util.Callback;

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java Wed Jul  7 04:27:35 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jndi;
+package org.apache.activemq.apollo.util.jndi;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java Wed Jul  7 04:27:35 2010
@@ -17,7 +17,6 @@
 package org.apache.activemq.dispatch.internal.advanced;
 
 import java.io.IOException;
-import java.nio.channels.SelectableChannel;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.concurrent.Executor;

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java Wed Jul  7 04:27:35 2010
@@ -26,7 +26,7 @@ import javax.management.openmbean.Compos
 import javax.management.openmbean.OpenDataException;
 import javax.management.openmbean.TabularData;
 
-import org.apache.activemq.filter.FilterException;
+import org.apache.activemq.apollo.filter.FilterException;
 
 public interface DestinationViewMBean {
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java Wed Jul  7 04:27:35 2010
@@ -12,7 +12,7 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.TransactionId;
-import org.apache.activemq.filter.Expression;
+import org.apache.activemq.apollo.filter.Expression;
 import org.apache.activemq.filter.FilterException;
 import org.apache.activemq.filter.MessageEvaluationContext;
 import org.fusesource.hawtbuf.Buffer;

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java Wed Jul  7 04:27:35 2010
@@ -77,9 +77,9 @@ import org.apache.activemq.command.Trans
 import org.apache.activemq.command.WireFormatInfo;
 import org.apache.activemq.dispatch.DispatchPriority;
 import org.apache.activemq.filter.BooleanExpression;
-import org.apache.activemq.filter.FilterException;
-import org.apache.activemq.filter.LogicExpression;
-import org.apache.activemq.filter.NoLocalExpression;
+import org.apache.activemq.apollo.filter.FilterException;
+import org.apache.activemq.apollo.filter.LogicExpression;
+import org.apache.activemq.apollo.filter.NoLocalExpression;
 import org.apache.activemq.flow.Flow;
 import org.apache.activemq.flow.FlowController;
 import org.apache.activemq.flow.IFlowController;

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java Wed Jul  7 04:27:35 2010
@@ -47,8 +47,8 @@ import org.apache.activemq.flow.ISinkCon
 import org.apache.activemq.flow.ISourceController;
 import org.apache.activemq.flow.SizeLimiter;
 import org.apache.activemq.flow.ISinkController.FlowUnblockListener;
-import org.apache.activemq.metric.MetricAggregator;
-import org.apache.activemq.metric.MetricCounter;
+import org.apache.activemq.apollo.util.metric.MetricAggregator;
+import org.apache.activemq.apollo.util.metric.MetricCounter;
 import org.apache.activemq.metric.Period;
 import org.apache.activemq.openwire.OpenWireFormat;
 import org.apache.activemq.queue.AbstractFlowRelay;

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/MultiFlowQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/MultiFlowQueue.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/MultiFlowQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/MultiFlowQueue.java Wed Jul  7 04:27:35 2010
@@ -27,7 +27,7 @@ import org.apache.activemq.flow.ISinkCon
 import org.apache.activemq.flow.ISourceController;
 import org.apache.activemq.flow.SizeLimiter;
 import org.apache.activemq.util.list.LinkedNode;
-import org.apache.activemq.util.list.LinkedNodeList;
+import org.apache.activemq.apollo.util.list.LinkedNodeList;
 
 public class MultiFlowQueue<E> extends AbstractFlowQueue<E> {
     private final HashMap<Flow, SingleFlowQueue> flowQueues = new HashMap<Flow, SingleFlowQueue>();

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java Wed Jul  7 04:27:35 2010
@@ -27,9 +27,9 @@ import org.apache.activemq.dispatch.Disp
 import org.apache.activemq.flow.Commands.Destination;
 import org.apache.activemq.flow.Commands.Destination.DestinationBean;
 import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
-import org.apache.activemq.metric.MetricAggregator;
-import org.apache.activemq.metric.MetricCounter;
-import org.apache.activemq.metric.Period;
+import org.apache.activemq.apollo.util.metric.MetricAggregator;
+import org.apache.activemq.apollo.util.metric.MetricCounter;
+import org.apache.activemq.apollo.util.metric.Period;
 import org.apache.activemq.util.IntrospectionSupport;
 import org.fusesource.hawtbuf.AsciiBuffer;
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/ProducerConnection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/ProducerConnection.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/ProducerConnection.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/ProducerConnection.java Wed Jul  7 04:27:35 2010
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.activemq.actor.ActorProxy;
 import org.apache.activemq.flow.Commands.Destination;
 import org.apache.activemq.metric.MetricAggregator;
-import org.apache.activemq.metric.MetricCounter;
+import org.apache.activemq.apollo.util.metric.MetricCounter;
 
 import static java.util.concurrent.TimeUnit.*;
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/src/main/java/org/apache/activemq/syscall/util/IOBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/src/main/java/org/apache/activemq/syscall/util/IOBenchmark.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/src/main/java/org/apache/activemq/syscall/util/IOBenchmark.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/src/main/java/org/apache/activemq/syscall/util/IOBenchmark.java Wed Jul  7 04:27:35 2010
@@ -41,7 +41,7 @@ import org.apache.activemq.util.Combinat
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.util.MemoryPropertyEditor;
-import org.apache.activemq.util.cli.CommonsCLISupport;
+import org.apache.activemq.apollo.util.cli.CommonsCLISupport;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java Wed Jul  7 04:27:35 2010
@@ -24,7 +24,7 @@ import java.util.Map;
 
 import javolution.io.Struct;
 
-import org.apache.activemq.metric.MetricCounter;
+import org.apache.activemq.apollo.util.metric.MetricCounter;
 import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtbuf.DataByteArrayOutputStream;
 import org.apache.hawtdb.internal.Benchmarker.BenchmarkAction;