You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/07/07 06:27:42 UTC
svn commit: r961220 [2/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...
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ConstantExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ConstantExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ConstantExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ConstantExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ConstantExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ConstantExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ConstantExpression.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.filter;
+package org.apache.activemq.apollo.filter;
import java.math.BigDecimal;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Expression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Expression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Expression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Expression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Expression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Expression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Expression.java Wed Jul 7 04:27:35 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.filter;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/FilterException.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/FilterException.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/FilterException.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/FilterException.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/FilterException.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/FilterException.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/FilterException.java Wed Jul 7 04:27:35 2010
@@ -1,4 +1,4 @@
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.filter;
public class FilterException extends Exception {
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Filterable.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Filterable.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Filterable.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Filterable.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Filterable.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Filterable.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Filterable.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.filter;
+package org.apache.activemq.apollo.filter;
/**
* A Filterable is the object being evaluated by the filters. It provides
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/LogicExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/LogicExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/LogicExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/LogicExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/LogicExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/LogicExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/LogicExpression.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.filter;
+package org.apache.activemq.apollo.filter;
/**
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/PropertyExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/PropertyExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/PropertyExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/PropertyExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/PropertyExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/PropertyExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/PropertyExpression.java Wed Jul 7 04:27:35 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.filter;
/**
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/UnaryExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/UnaryExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/UnaryExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/UnaryExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/UnaryExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/UnaryExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/UnaryExpression.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.filter;
+package org.apache.activemq.apollo.filter;
import java.math.BigDecimal;
import java.util.Collection;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XPathExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XPathExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XPathExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.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.filter;
+package org.apache.activemq.apollo.filter;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XQueryExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XQueryExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XQueryExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XQueryExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XQueryExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XQueryExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XQueryExpression.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.filter;
+package org.apache.activemq.apollo.filter;
/**
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XalanXPathEvaluator.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XalanXPathEvaluator.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XalanXPathEvaluator.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XalanXPathEvaluator.java Wed Jul 7 04:27:35 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.filter;
import java.io.StringReader;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/package.html (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/package.html)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/package.html?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/package.html&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/package.html&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
(empty)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/javacc/SelectorParser.jj
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/javacc/SelectorParser.jj?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/javacc/SelectorParser.jj (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/javacc/SelectorParser.jj Wed Jul 7 04:27:35 2010
@@ -47,13 +47,13 @@ PARSER_BEGIN(SelectorParser)
* limitations under the License.
*/
-package org.apache.activemq.selector;
+package org.apache.activemq.apollo.selector;
import java.io.*;
import java.util.*;
-import org.apache.activemq.filter.*;
-import org.apache.activemq.util.LRUCache;
+import org.apache.activemq.apollo.filter.*;
+import org.apache.activemq.apollo.util.LRUCache;
/**
* JMS Selector Parser generated by JavaCC
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java Wed Jul 7 04:27:35 2010
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector;
+package org.apache.activemq.apollo.selector;
import junit.framework.TestCase;
-import org.apache.activemq.filter.BooleanExpression;
-import org.apache.activemq.filter.ComparisonExpression;
-import org.apache.activemq.filter.Expression;
-import org.apache.activemq.filter.LogicExpression;
-import org.apache.activemq.filter.PropertyExpression;
-import org.apache.activemq.filter.XPathExpression;
+import org.apache.activemq.apollo.filter.BooleanExpression;
+import org.apache.activemq.apollo.filter.ComparisonExpression;
+import org.apache.activemq.apollo.filter.Expression;
+import org.apache.activemq.apollo.filter.LogicExpression;
+import org.apache.activemq.apollo.filter.PropertyExpression;
+import org.apache.activemq.apollo.filter.XPathExpression;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java Wed Jul 7 04:27:35 2010
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector;
+package org.apache.activemq.apollo.selector;
import java.util.HashMap;
import junit.framework.TestCase;
-import org.apache.activemq.filter.BooleanExpression;
-import org.apache.activemq.filter.Expression;
-import org.apache.activemq.filter.FilterException;
-import org.apache.activemq.filter.Filterable;
+import org.apache.activemq.apollo.filter.BooleanExpression;
+import org.apache.activemq.apollo.filter.FilterException;
+import org.apache.activemq.apollo.filter.Filterable;
/**
* @version $Revision: 1.7 $
Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala Wed Jul 7 04:27:35 2010
@@ -16,9 +16,10 @@
*/
package org.apache.activemq.apollo.stomp
-import org.apache.activemq.apollo.broker.{LoggingTracker, Broker}
+import org.apache.activemq.apollo.broker.Broker
import java.io.File
import org.apache.activemq.apollo.dto.{CassandraStoreDTO, HawtDBStoreDTO}
+import org.apache.activemq.apollo.util._
/**
*/
Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala Wed Jul 7 04:27:35 2010
@@ -28,12 +28,11 @@ import _root_.scala.collection.JavaConve
import StompFrameConstants._
import java.io.{EOFException, DataOutput, DataInput, IOException}
import java.nio.channels.{SocketChannel, WritableByteChannel, ReadableByteChannel}
-import org.apache.activemq.apollo.{DirectBuffer, DirectBufferPool}
import org.apache.activemq.apollo.transport._
import org.apache.activemq.apollo.store.MessageRecord
import _root_.org.fusesource.hawtbuf._
import Buffer._
-
+import org.apache.activemq.apollo.util._
object StompCodec extends Log {
val READ_BUFFFER_SIZE = 1024*64;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala Wed Jul 7 04:27:35 2010
@@ -17,12 +17,12 @@
package org.apache.activemq.apollo.stomp
import _root_.java.util.LinkedList
-import _root_.org.apache.activemq.filter.{Expression, Filterable}
+import _root_.org.apache.activemq.apollo.filter.{Expression, Filterable}
import _root_.org.fusesource.hawtbuf._
import collection.mutable.ListBuffer
import java.lang.{String, Class}
import org.apache.activemq.apollo.broker._
-import org.apache.activemq.apollo.DirectBuffer
+import org.apache.activemq.apollo.util._
import org.fusesource.hawtdispatch.BaseRetained
import java.io.{OutputStream, DataOutput}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala Wed Jul 7 04:27:35 2010
@@ -29,11 +29,11 @@ import Stomp._
import BufferConversions._
import StompFrameConstants._
import java.io.IOException
-import org.apache.activemq.selector.SelectorParser
-import org.apache.activemq.filter.{BooleanExpression, FilterException}
-import org.apache.activemq.broker.store.{StoreUOW}
+import org.apache.activemq.apollo.selector.SelectorParser
+import org.apache.activemq.apollo.filter.{BooleanExpression, FilterException}
import org.apache.activemq.apollo.transport._
-import org.apache.activemq.apollo.store.MessageRecord
+import org.apache.activemq.apollo.store._
+import org.apache.activemq.apollo.util._
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java Wed Jul 7 04:27:35 2010
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.apollo.store;
-import org.apache.activemq.apollo.DirectBuffer;
+import org.apache.activemq.apollo.util.DirectBuffer;
import org.fusesource.hawtbuf.AsciiBuffer;
import org.fusesource.hawtbuf.Buffer;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala 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.broker.store
+package org.apache.activemq.apollo.store
-import org.apache.activemq.apollo.store._
-import org.apache.activemq.apollo.broker.Reporter
-import org.apache.activemq.apollo.ServiceTrait
import org.apache.activemq.apollo.dto.{StoreStatusDTO, StoreDTO}
+import org.apache.activemq.apollo.util._
+import ReporterLevel._
/**
* <p>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala Wed Jul 7 04:27:35 2010
@@ -16,10 +16,8 @@
*/
package org.apache.activemq.apollo.store
-import org.apache.activemq.apollo.util.ClassFinder
-import org.apache.activemq.broker.store.Store
import org.apache.activemq.apollo.dto.StoreDTO
-import org.apache.activemq.apollo.broker.{ReporterLevel, Reporter}
+import org.apache.activemq.apollo.util._
import ReporterLevel._
/**
Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.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.broker.store
+package org.apache.activemq.apollo.store
import org.fusesource.hawtdispatch.{Retained}
import org.apache.activemq.apollo.store._
Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala Wed Jul 7 04:27:35 2010
@@ -14,18 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker.store
+package org.apache.activemq.apollo.store
import org.fusesource.hawtbuf.AsciiBuffer._
import org.fusesource.hawtdispatch.ScalaDispatch._
import org.fusesource.hawtdispatch.TaskTracker
-import org.apache.activemq.apollo.broker.{LoggingTracker, FunSuiteSupport}
import java.util.concurrent.{TimeUnit, CountDownLatch}
-import org.apache.activemq.apollo.store.{QueueEntryRecord, QueueStatus, QueueRecord, MessageRecord}
import org.scalatest.{BeforeAndAfterEach, BeforeAndAfterAll}
import collection.mutable.ListBuffer
import java.util.concurrent.atomic.{AtomicLong, AtomicInteger, AtomicBoolean}
-import org.apache.activemq.apollo.util.LongCounter
+import org.apache.activemq.apollo.store.{Store, QueueEntryRecord, QueueStatus, QueueRecord, MessageRecord}
+import org.apache.activemq.apollo.util.{LoggingTracker, FunSuiteSupport, LongCounter}
/**
* <p>Implements generic testing of Store implementations.</p>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala Wed Jul 7 04:27:35 2010
@@ -14,17 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker.store
+package org.apache.activemq.apollo.store
import org.fusesource.hawtbuf.AsciiBuffer._
import org.fusesource.hawtdispatch.ScalaDispatch._
import org.fusesource.hawtdispatch.TaskTracker
-import org.apache.activemq.apollo.broker.{LoggingTracker, FunSuiteSupport}
import java.util.concurrent.{TimeUnit, CountDownLatch}
-import org.apache.activemq.apollo.store.{QueueEntryRecord, QueueStatus, QueueRecord, MessageRecord}
import org.scalatest.{BeforeAndAfterEach, BeforeAndAfterAll}
import collection.mutable.ListBuffer
-import org.apache.activemq.apollo.util.LongCounter
+import org.apache.activemq.apollo.util.{LoggingTracker, FunSuiteSupport, LongCounter}
/**
* <p>Implements generic testing of Store implementations.</p>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java Wed Jul 7 04:27:35 2010
@@ -26,8 +26,8 @@ import org.apache.activemq.apollo.transp
import org.apache.activemq.apollo.transport.TransportFactory;
//import org.apache.activemq.transport.TransportLoggerFactory;
import org.apache.activemq.apollo.transport.TransportServer;
-import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.activemq.util.URISupport;
+import org.apache.activemq.apollo.util.IntrospectionSupport;
+import org.apache.activemq.apollo.util.URISupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportServer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportServer.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportServer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportServer.java Wed Jul 7 04:27:35 2010
@@ -19,8 +19,8 @@ package org.apache.activemq.apollo.trans
import org.apache.activemq.apollo.transport.TransportServer;
import org.apache.activemq.apollo.transport.Transport;
import org.apache.activemq.apollo.transport.TransportAcceptListener;
-import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.apollo.util.IOExceptionSupport;
+import org.apache.activemq.apollo.util.IntrospectionSupport;
import org.fusesource.hawtdispatch.Dispatch;
import org.fusesource.hawtdispatch.DispatchQueue;
import org.fusesource.hawtdispatch.DispatchSource;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgent.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgent.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgent.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgent.java Wed Jul 7 04:27:35 2010
@@ -18,7 +18,7 @@ package org.apache.activemq.apollo.trans
import java.io.IOException;
-import org.apache.activemq.Service;
+import org.apache.activemq.apollo.util.Service;
/**
* An agent used to discover other instances of a service.
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgentFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgentFactory.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgentFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgentFactory.java Wed Jul 7 04:27:35 2010
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.net.URI;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.activemq.util.FactoryFinder;
-import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.apollo.util.FactoryFinder;
+import org.apache.activemq.apollo.util.IOExceptionSupport;
public abstract class DiscoveryAgentFactory {
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/ObjectStreamProtocolCodec.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/ObjectStreamProtocolCodec.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/ObjectStreamProtocolCodec.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/ObjectStreamProtocolCodec.java Wed Jul 7 04:27:35 2010
@@ -27,7 +27,7 @@ import java.io.OutputStream;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.WritableByteChannel;
-import org.apache.activemq.util.ClassLoadingAwareObjectInputStream;
+import org.apache.activemq.apollo.util.ClassLoadingAwareObjectInputStream;
import org.fusesource.hawtbuf.Buffer;
import org.fusesource.hawtbuf.ByteArrayInputStream;
import org.fusesource.hawtbuf.ByteArrayOutputStream;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/Transport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/Transport.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/Transport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/Transport.java Wed Jul 7 04:27:35 2010
@@ -19,7 +19,7 @@ package org.apache.activemq.apollo.trans
import java.io.IOException;
import java.net.URI;
-import org.apache.activemq.Service;
+import org.apache.activemq.apollo.util.Service;
import org.fusesource.hawtdispatch.DispatchQueue;
/**
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactory.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactory.java Wed Jul 7 04:27:35 2010
@@ -16,8 +16,8 @@
*/
package org.apache.activemq.apollo.transport;
-import org.apache.activemq.util.FactoryFinder;
-import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.apollo.util.FactoryFinder;
+import org.apache.activemq.apollo.util.IOExceptionSupport;
import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactorySupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactorySupport.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactorySupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactorySupport.java Wed Jul 7 04:27:35 2010
@@ -16,10 +16,10 @@
*/
package org.apache.activemq.apollo.transport;
-import org.apache.activemq.util.FactoryFinder;
-import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.activemq.util.URISupport;
+import org.apache.activemq.apollo.util.FactoryFinder;
+import org.apache.activemq.apollo.util.IOExceptionSupport;
+import org.apache.activemq.apollo.util.IntrospectionSupport;
+import org.apache.activemq.apollo.util.URISupport;
import java.io.IOException;
import java.net.URI;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFilter.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFilter.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFilter.java Wed Jul 7 04:27:35 2010
@@ -74,7 +74,7 @@ public class TransportFilter implements
}
/**
- * @see org.apache.activemq.Service#start()
+ * @see org.apache.activemq.apollo.util.Service#start()
* @throws IOException
* if the next channel has not been set.
*/
@@ -93,7 +93,7 @@ public class TransportFilter implements
}
/**
- * @see org.apache.activemq.Service#stop()
+ * @see org.apache.activemq.apollo.util.Service#stop()
*/
public void stop() throws Exception {
next.stop();
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServer.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServer.java Wed Jul 7 04:27:35 2010
@@ -19,7 +19,7 @@ package org.apache.activemq.apollo.trans
import java.net.InetSocketAddress;
import java.net.URI;
-import org.apache.activemq.Service;
+import org.apache.activemq.apollo.util.Service;
import org.fusesource.hawtdispatch.DispatchQueue;
/**
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServerSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServerSupport.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServerSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServerSupport.java Wed Jul 7 04:27:35 2010
@@ -18,7 +18,7 @@ package org.apache.activemq.apollo.trans
import java.net.URI;
-import org.apache.activemq.util.ServiceSupport;
+import org.apache.activemq.apollo.util.ServiceSupport;
/**
* A useful base class for implementations of {@link TransportServer}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/pipe/PipeTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/pipe/PipeTransportFactory.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/pipe/PipeTransportFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/pipe/PipeTransportFactory.java Wed Jul 7 04:27:35 2010
@@ -27,8 +27,8 @@ import static org.apache.activemq.apollo
import org.apache.activemq.apollo.transport.Transport;
import org.apache.activemq.apollo.transport.TransportFactory;
import org.apache.activemq.apollo.transport.TransportServer;
-import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.activemq.util.URISupport;
+import org.apache.activemq.apollo.util.URISupport;
+import org.apache.activemq.apollo.util.IntrospectionSupport;
/**
*
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BaseService.scala (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/BaseService.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BaseService.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BaseService.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/BaseService.scala&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/BaseService.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BaseService.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.broker
+package org.apache.activemq.apollo.util
-import org.apache.activemq.Service
import org.fusesource.hawtdispatch.DispatchQueue
import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArray.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArray.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArray.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArray.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArray.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArray.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArray.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.DataInput;
import java.io.DataOutput;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArrayBin.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArrayBin.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArrayBin.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArrayBin.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArrayBin.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArrayBin.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArrayBin.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;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BooleanEditor.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BooleanEditor.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BooleanEditor.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BooleanEditor.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BooleanEditor.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BooleanEditor.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BooleanEditor.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;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Callback.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Callback.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Callback.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Callback.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Callback.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Callback.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Callback.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;
/**
* A simple callback object used by the
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ClassLoadingAwareObjectInputStream.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ClassLoadingAwareObjectInputStream.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ClassLoadingAwareObjectInputStream.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ClassLoadingAwareObjectInputStream.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.IOException;
import java.io.InputStream;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Combinator.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/Combinator.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Combinator.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Combinator.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/Combinator.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/Combinator.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Combinator.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.Array;
import java.lang.reflect.Field;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Comparators.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Comparators.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Comparators.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Comparators.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Comparators.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Comparators.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Comparators.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;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPool.scala (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPool.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPool.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPool.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPool.scala&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPool.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPool.scala Wed Jul 7 04:27:35 2010
@@ -14,11 +14,10 @@
* 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.nio.ByteBuffer
import org.fusesource.hawtdispatch.Retained
-import org.apache.activemq.Service
/**
* <p>
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPoolFactory.scala (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPoolFactory.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPoolFactory.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPoolFactory.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPoolFactory.scala&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPoolFactory.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPoolFactory.scala 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.apollo
-
-import org.apache.activemq.apollo.util.ClassFinder
+package org.apache.activemq.apollo.util
/**
* <p>
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DiskBenchmark.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/DiskBenchmark.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DiskBenchmark.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DiskBenchmark.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/DiskBenchmark.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/DiskBenchmark.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DiskBenchmark.java Wed Jul 7 04:27:35 2010
@@ -14,10 +14,9 @@
* 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.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.ArrayList;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FactoryFinder.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FactoryFinder.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FactoryFinder.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FactoryFinder.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FactoryFinder.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FactoryFinder.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FactoryFinder.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.BufferedInputStream;
import java.io.IOException;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FutureListener.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FutureListener.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FutureListener.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FutureListener.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FutureListener.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FutureListener.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FutureListener.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.concurrent.Future;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashList.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashList.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashList.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashList.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashList.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashList.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashList.java Wed Jul 7 04:27:35 2010
@@ -13,13 +13,14 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */package org.apache.activemq.util;
+ */
+package org.apache.activemq.apollo.util;
import java.util.HashMap;
import java.util.Iterator;
-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 HashList<E> {
private HashMap<E, HashListNode> m_index = null;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashRing.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashRing.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashRing.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashRing.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashRing.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashRing.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashRing.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 java.util.ArrayList;
import java.util.Arrays;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Hasher.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Hasher.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Hasher.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Hasher.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Hasher.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Hasher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Hasher.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 org.fusesource.hawtbuf.Buffer;
import org.fusesource.hawtbuf.DataByteArrayOutputStream;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HexSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HexSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HexSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HexSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HexSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HexSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HexSupport.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;
/**
* Used to convert to hex from byte arrays and back.
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOExceptionSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOExceptionSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOExceptionSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOExceptionSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOExceptionSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOExceptionSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOExceptionSupport.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.IOException;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOHelper.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOHelper.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOHelper.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOHelper.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOHelper.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOHelper.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOHelper.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.io.*;
import java.lang.reflect.Field;
-import org.apache.activemq.util.os.CLibrary;
+import org.apache.activemq.apollo.util.os.CLibrary;
import org.fusesource.hawtbuf.ByteArrayOutputStream;
/**
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IdGenerator.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IdGenerator.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IdGenerator.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IdGenerator.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IdGenerator.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IdGenerator.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IdGenerator.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.net.InetAddress;
import java.net.ServerSocket;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IndentPrinter.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IndentPrinter.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IndentPrinter.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IndentPrinter.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IndentPrinter.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IndentPrinter.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IndentPrinter.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.PrintWriter;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntSequenceGenerator.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntSequenceGenerator.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntSequenceGenerator.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntSequenceGenerator.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntSequenceGenerator.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntSequenceGenerator.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntSequenceGenerator.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;
public class IntSequenceGenerator {
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntrospectionSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntrospectionSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntrospectionSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntrospectionSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntrospectionSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntrospectionSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntrospectionSupport.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.PropertyEditor;
import java.beans.PropertyEditorManager;
@@ -37,7 +37,7 @@ public final class IntrospectionSupport
// Add Spring and ActiveMQ specific property editors
String[] additionalPath = new String[] {
"org.springframework.beans.propertyeditors",
- "org.apache.activemq.util" };
+ "org.apache.activemq.apollo.util" };
String[] searchPath = (String[]) Array.newInstance(String.class,
PropertyEditorManager.getEditorSearchPath().length
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMSExceptionSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMSExceptionSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMSExceptionSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMSExceptionSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMSExceptionSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMSExceptionSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMSExceptionSupport.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 javax.jms.InvalidSelectorException;
import javax.jms.JMSException;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMXSupport.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMXSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMXSupport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMXSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMXSupport.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMXSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMXSupport.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;
public final class JMXSupport {
Modified: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JavaBaseService.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JavaBaseService.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JavaBaseService.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JavaBaseService.java Wed Jul 7 04:27:35 2010
@@ -16,7 +16,6 @@
*/
package org.apache.activemq.apollo.util;
-import org.apache.activemq.Service;
import org.fusesource.hawtdispatch.DispatchQueue;
import java.util.LinkedList;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LRUCache.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LRUCache.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LRUCache.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LRUCache.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LRUCache.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LRUCache.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LRUCache.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.LinkedHashMap;
import java.util.Map;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ListenableFuture.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ListenableFuture.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ListenableFuture.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ListenableFuture.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ListenableFuture.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ListenableFuture.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ListenableFuture.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.concurrent.Future;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LockFile.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LockFile.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LockFile.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LockFile.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LockFile.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LockFile.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LockFile.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.File;
import java.io.IOException;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Logging.scala (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Logging.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Logging.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Logging.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Logging.scala&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Logging.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Logging.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.util.{LinkedHashMap, HashMap}
import _root_.java.lang.{Throwable, String}
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/LoggingTracker.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/LoggingTracker.scala&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/LoggingTracker.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala 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.apollo.broker
+package org.apache.activemq.apollo.util
import java.util.concurrent.{CountDownLatch, TimeUnit}
import java.util.HashSet
import org.fusesource.hawtdispatch.ScalaDispatch._
-import org.apache.activemq.Service
import org.fusesource.hawtdispatch.{TaskTracker, DispatchQueue}
/**
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LongSequenceGenerator.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LongSequenceGenerator.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LongSequenceGenerator.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LongSequenceGenerator.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LongSequenceGenerator.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LongSequenceGenerator.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LongSequenceGenerator.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;
public class LongSequenceGenerator {
Copied: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Mapper.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Mapper.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Mapper.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Mapper.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Mapper.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Mapper.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Mapper.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;
public interface Mapper<K, V> {
K map(V element);