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 [1/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...
Author: chirino
Date: Wed Jul 7 04:27:35 2010
New Revision: 961220
URL: http://svn.apache.org/viewvc?rev=961220&view=rev
Log:
more package moves so that everything is under activemq.apollo
Added:
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ArithmeticExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/BinaryExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BinaryExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/BooleanExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BooleanExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ComparisonExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ComparisonExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ConstantExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ConstantExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Expression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Expression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/FilterException.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/FilterException.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/Filterable.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Filterable.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/LogicExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/LogicExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/PropertyExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/PropertyExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/UnaryExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/UnaryExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XPathExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XQueryExpression.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XQueryExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/XalanXPathEvaluator.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/package.html
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/package.html
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BaseService.scala
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/BaseService.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArray.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArray.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BitArrayBin.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArrayBin.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/BooleanEditor.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BooleanEditor.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Callback.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Callback.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ClassLoadingAwareObjectInputStream.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Combinator.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/Combinator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Comparators.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Comparators.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPool.scala
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPool.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DirectBufferPoolFactory.scala
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPoolFactory.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/DiskBenchmark.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/DiskBenchmark.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FactoryFinder.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FactoryFinder.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/FutureListener.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FutureListener.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashList.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HashRing.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashRing.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Hasher.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Hasher.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/HexSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HexSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOExceptionSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOExceptionSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IOHelper.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOHelper.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IdGenerator.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IdGenerator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IndentPrinter.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IndentPrinter.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntSequenceGenerator.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntSequenceGenerator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/IntrospectionSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntrospectionSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMSExceptionSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMSExceptionSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JMXSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMXSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LRUCache.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LRUCache.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ListenableFuture.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ListenableFuture.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LockFile.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LockFile.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Logging.scala
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Logging.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/LoggingTracker.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/LongSequenceGenerator.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LongSequenceGenerator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Mapper.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Mapper.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/MemoryPropertyEditor.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/MemoryPropertyEditor.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityLinkedList.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityLinkedList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/PriorityMap.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityMap.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ProcessSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ProcessSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Reporter.scala
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Reporter.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Scheduler.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Scheduler.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SchedulerTimerTask.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SchedulerTimerTask.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/Service.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/Service.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceListener.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceListener.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceStopper.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/ServiceTrait.scala
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/ServiceTrait.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/SslContext.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SslContext.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/StringSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/StringSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TimerHeap.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TimerHeap.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/TreeMap.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TreeMap.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URIEditor.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URIEditor.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/URISupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URISupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommandLineSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommandLineSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/CommonsCLISupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommonsCLISupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/cli/OptionBuilder.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/OptionBuilder.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIBaseStorable.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIBaseStorable.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIReferenceFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIStorableInterface.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIStorableInterface.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/LazyCreateContext.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/LazyCreateContext.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/NameParserImpl.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/NameParserImpl.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/ReadOnlyContext.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/ReadOnlyContext.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/jndi/package.html
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/package.html
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNode.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNode.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/LinkedNodeList.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNodeList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/Sequence.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/Sequence.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SequenceSet.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SequenceSet.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedList.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/list/SortedLinkedListNode.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedListNode.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Metric.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Metric.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricAggregator.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricAggregator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/MetricCounter.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricCounter.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/metric/Period.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Period.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/CLibrary.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/CLibrary.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/os/JnaCLibrary.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/JnaCLibrary.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/AutoFailTestSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/BitArrayBinTest.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/BitArrayBinTest.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/CombinationTestSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/HashRingTest.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/HashRingTest.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/MessageIdList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/ReflectionSupportTest.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/ReflectionSupportTest.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/SocketProxy.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/TreeMapTest.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/TreeMapTest.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/util/URISupportTest.java
- copied, changed from r961219, activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/URISupportTest.java
Removed:
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BinaryExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BooleanExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ComparisonExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ConstantExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Expression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/FilterException.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/Filterable.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/LogicExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/PropertyExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/UnaryExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XPathExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XQueryExpression.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/package.html
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/resources/META-INF/services/org/apache/activemq/transport/mock
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/Service.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPool.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/DirectBufferPoolFactory.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/ServiceTrait.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/BaseService.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Logging.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/LoggingTracker.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/broker/Reporter.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIBaseStorable.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIReferenceFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/JNDIStorableInterface.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/LazyCreateContext.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/NameParserImpl.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/ReadOnlyContext.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/jndi/package.html
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Metric.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricAggregator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/MetricCounter.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/metric/Period.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArray.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BitArrayBin.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/BooleanEditor.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Callback.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Combinator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Comparators.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/DiskBenchmark.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FactoryFinder.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/FutureListener.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HashRing.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Hasher.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/HexSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOExceptionSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IOHelper.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IdGenerator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IndentPrinter.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntSequenceGenerator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/IntrospectionSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMSExceptionSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/JMXSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LRUCache.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ListenableFuture.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LockFile.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/LongSequenceGenerator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Mapper.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/MemoryPropertyEditor.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityLinkedList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/PriorityMap.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ProcessSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/Scheduler.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SchedulerTimerTask.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceListener.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceStopper.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/ServiceSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/SslContext.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/StringSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TimerHeap.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/TreeMap.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URIEditor.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/URISupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommandLineSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/CommonsCLISupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/cli/OptionBuilder.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNode.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/LinkedNodeList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/Sequence.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SequenceSet.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/list/SortedLinkedListNode.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/CLibrary.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/util/os/JnaCLibrary.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/AutoFailTestSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/CombinationTestSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/Combinator.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/BitArrayBinTest.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/HashRingTest.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/MessageIdList.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/ReflectionSupportTest.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/SocketProxy.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/TreeMapTest.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/scala/org/apache/activemq/util/URISupportTest.java
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/XMLBrokerFactoryTest.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreSPI.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolSPI.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreSPI.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala
activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/javacc/SelectorParser.jj
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java
activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala
activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala
activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala
activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportServer.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgent.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/DiscoveryAgentFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/ObjectStreamProtocolCodec.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/Transport.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFactorySupport.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportFilter.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServer.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/TransportServerSupport.java
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/apollo/transport/pipe/PipeTransportFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/scala/org/apache/activemq/apollo/util/JavaBaseService.java
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ConfigStore.scala
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/ServletContextListener.scala
activemq/sandbox/activemq-apollo-actor/activemq-web/src/test/scala/org/apache/activemq/apollo/web/FileConfigStoreTest.scala
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/filter/dummyPolicy.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/DispatcherThread.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/MultiFlowQueue.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/ProducerConnection.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/src/main/java/org/apache/activemq/syscall/util/IOBenchmark.java
activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java
activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/TransactionBenchmarker.java
activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala Wed Jul 7 04:27:35 2010
@@ -18,18 +18,18 @@ package org.apache.activemq.apollo.broke
import _root_.java.io.{File}
import _root_.java.lang.{String}
-import _root_.org.apache.activemq.util.{FactoryFinder}
import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
import org.fusesource.hawtdispatch.{Dispatch}
import org.fusesource.hawtbuf._
-import ReporterLevel._
import AsciiBuffer._
import collection.{JavaConversions, SortedMap}
import JavaConversions._
import org.apache.activemq.apollo.dto.{VirtualHostStatusDTO, ConnectorStatusDTO, BrokerStatusDTO, BrokerDTO}
import java.util.concurrent.atomic.AtomicLong
-import org.apache.activemq.apollo.util.LongCounter
import java.util.concurrent.ConcurrentHashMap
+import org.apache.activemq.apollo.util._
+import ReporterLevel._
+
/**
* <p>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala Wed Jul 7 04:27:35 2010
@@ -17,11 +17,12 @@
package org.apache.activemq.apollo.broker
import _root_.java.io.{IOException}
-import _root_.org.apache.activemq.filter.{BooleanExpression}
import _root_.java.lang.{String}
import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
-import protocol.{ProtocolFactory, ProtocolHandler}
+import protocol.{ProtocolHandler}
import org.apache.activemq.apollo.transport.{DefaultTransportListener, Transport}
+import org.apache.activemq.apollo.util.{Log, BaseService}
+import org.apache.activemq.apollo.filter.BooleanExpression
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala Wed Jul 7 04:27:35 2010
@@ -20,10 +20,12 @@ import _root_.org.fusesource.hawtdispatc
import org.fusesource.hawtdispatch.{Dispatch}
import org.apache.activemq.apollo.dto.{ConnectorDTO}
import protocol.{ProtocolFactory, Protocol}
-import ReporterLevel._
-import org.apache.activemq.apollo.util.LongCounter
import collection.mutable.HashMap
import org.apache.activemq.apollo.transport._
+import org.apache.activemq.apollo.util._
+import ReporterLevel._
+
+
/**
* <p>
* </p>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala Wed Jul 7 04:27:35 2010
@@ -16,13 +16,12 @@
*/
package org.apache.activemq.apollo.broker
-import _root_.org.apache.activemq.filter.{Filterable}
import _root_.java.lang.{String}
import _root_.org.fusesource.hawtdispatch._
import org.fusesource.hawtbuf._
-import org.apache.activemq.broker.store.StoreUOW
-import org.apache.activemq.apollo.store.MessageRecord
-import protocol.{Protocol, ProtocolFactory}
+import protocol.Protocol
+import org.apache.activemq.apollo.filter.Filterable
+import org.apache.activemq.apollo.store.{StoreUOW, MessageRecord}
/**
* A producer which sends Delivery objects to a delivery consumer.
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala Wed Jul 7 04:27:35 2010
@@ -16,19 +16,19 @@
*/
package org.apache.activemq.apollo.broker
+import java.util.concurrent.TimeUnit
+
import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
-import org.apache.activemq.util.TreeMap
+import java.util.concurrent.atomic.AtomicInteger
+
import collection.{SortedMap}
-import org.fusesource.hawtdispatch.{ScalaDispatch, DispatchQueue, BaseRetained}
-import org.apache.activemq.util.TreeMap.TreeEntry
-import org.apache.activemq.util.list.{LinkedNodeList, LinkedNode}
-import org.apache.activemq.broker.store.{StoreUOW}
+import org.fusesource.hawtdispatch.{DispatchQueue, BaseRetained}
+import org.apache.activemq.apollo.store.{StoreUOW}
import protocol.ProtocolFactory
-import java.util.concurrent.TimeUnit
-import java.util.{HashSet, Collections, ArrayList, LinkedList}
-import org.apache.activemq.apollo.store.{QueueEntryRange, QueueEntryRecord, MessageRecord}
import collection.mutable.ListBuffer
-import java.util.concurrent.atomic.AtomicInteger
+import org.apache.activemq.apollo.store._
+import org.apache.activemq.apollo.util._
+import org.apache.activemq.apollo.util.list._
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
@@ -63,8 +63,6 @@ object Queue extends Log {
class Queue(val host: VirtualHost, val destination: Destination, val id: Long) extends BaseRetained with Route with DeliveryConsumer with BaseService with DispatchLogging {
override protected def log = Queue
- import Queue._
-
var all_subscriptions = Map[DeliveryConsumer, Subscription]()
var fast_subscriptions = List[Subscription]()
@@ -594,8 +592,6 @@ object QueueEntry extends Sizer[QueueEnt
class QueueEntry(val queue:Queue, val seq:Long) extends LinkedNode[QueueEntry] with Comparable[QueueEntry] with Runnable with DispatchLogging {
override protected def log = Queue
- import QueueEntry._
-
// Subscriptions waiting to dispatch this entry.
var parked:List[Subscription] = Nil
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala Wed Jul 7 04:27:35 2010
@@ -25,6 +25,7 @@ import path.PathMap
import collection.JavaConversions
import org.apache.activemq.apollo.util.LongCounter
import collection.mutable.HashMap
+import org.apache.activemq.apollo.util._
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala Wed Jul 7 04:27:35 2010
@@ -17,9 +17,10 @@
package org.apache.activemq.apollo.broker
import _root_.java.util.{ArrayList}
-import _root_.org.apache.activemq.filter.{FilterException, BooleanExpression}
+import _root_.org.apache.activemq.apollo.filter.{FilterException, BooleanExpression}
import _root_.scala.collection.JavaConversions._
import path.PathFilter
+import org.apache.activemq.apollo.util._
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala Wed Jul 7 04:27:35 2010
@@ -24,14 +24,11 @@ import path.PathFilter
import org.fusesource.hawtbuf.AsciiBuffer
import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
-import protocol.Protocol
-import ReporterLevel._
-import org.apache.activemq.broker.store.{Store}
-import org.apache.activemq.apollo.store.{StoreFactory, QueueRecord}
-import org.apache.activemq.apollo.dto.{HawtDBStoreDTO, CassandraStoreDTO, VirtualHostDTO}
+import org.apache.activemq.apollo.dto.{VirtualHostDTO}
import java.util.concurrent.TimeUnit
-import org.apache.activemq.apollo.util.LongCounter
-import org.apache.activemq.apollo.{DirectBufferPoolFactory, DirectBufferPool}
+import org.apache.activemq.apollo.store.{Store, StoreFactory, QueueRecord}
+import org.apache.activemq.apollo.util._
+import ReporterLevel._
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
@@ -52,13 +49,6 @@ object VirtualHost extends Log {
rc.id = "default"
rc.enabled = true
rc.host_names.add("localhost")
-
-// val store = new CassandraStoreDTO
-// store.hosts.add("localhost:9160")
-
-// val store = new HawtDBStoreDTO
-// store.directory = new File("activemq-data")
-
rc.store = null
rc
}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala Wed Jul 7 04:27:35 2010
@@ -19,13 +19,13 @@ package org.apache.activemq.apollo.jaxb
import java.io.IOException
import javax.xml.bind.JAXBContext
import javax.xml.stream.XMLInputFactory
-import org.apache.activemq.util.URISupport
import java.net.{URL, URI}
import org.apache.activemq.apollo.broker._
import jaxb.PropertiesReader
import org.apache.activemq.apollo.dto._
import java.lang.String
import XmlEncoderDecoder._
+import org.apache.activemq.apollo.util._
class XmlBrokerFactory extends BrokerFactory.Handler {
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java Wed Jul 7 04:27:35 2010
@@ -20,9 +20,7 @@ package org.apache.activemq.apollo.broke
import java.util.ArrayList;
import org.apache.activemq.apollo.broker.Destination;
-import org.apache.activemq.filter.BooleanExpression;
-import org.apache.activemq.filter.FilterException;
-import org.apache.activemq.filter.Filterable;
+import org.apache.activemq.apollo.filter.FilterException;
import org.fusesource.hawtbuf.AsciiBuffer;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala Wed Jul 7 04:27:35 2010
@@ -22,14 +22,14 @@ import _root_.java.util.concurrent.atomi
import _root_.java.util.concurrent.atomic.AtomicInteger
import _root_.org.apache.activemq.apollo.broker._
-import _root_.org.apache.activemq.util.IOExceptionSupport
-import _root_.org.apache.activemq.util.URISupport
import _root_.scala.collection.JavaConversions._
import org.apache.activemq.apollo.transport._
import org.apache.activemq.apollo.transport.pipe.PipeTransportFactory
import org.apache.activemq.apollo.transport.pipe.PipeTransport
import org.apache.activemq.apollo.transport.pipe.PipeTransportServer
+import org.apache.activemq.apollo.util._
+
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/XMLBrokerFactoryTest.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/XMLBrokerFactoryTest.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/XMLBrokerFactoryTest.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/XMLBrokerFactoryTest.scala Wed Jul 7 04:27:35 2010
@@ -16,8 +16,8 @@
*/
package org.apache.activemq.apollo.broker.jaxb
-import java.util.ArrayList
-import org.apache.activemq.apollo.broker.{FunSuiteSupport, BrokerFactory}
+import org.apache.activemq.apollo.broker.BrokerFactory
+import org.apache.activemq.apollo.util.FunSuiteSupport
/**
* <p>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala Wed Jul 7 04:27:35 2010
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.apollo.broker.perf
-import _root_.org.apache.activemq.metric.{Period}
+import _root_.org.apache.activemq.apollo.util.metric.{Period}
import org.apache.activemq.apollo.broker._
import _root_.org.fusesource.hawtbuf._
import java.net.URL
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala Wed Jul 7 04:27:35 2010
@@ -19,12 +19,10 @@ package org.apache.activemq.apollo.broke
import _root_.java.util.concurrent.atomic.{AtomicBoolean, AtomicLong}
import _root_.java.lang.{String}
-import java.util.ArrayList
import org.apache.activemq.apollo.broker._
import org.scalatest._
import java.io.{File, IOException}
-import org.apache.activemq.util.{IOHelper, ProcessSupport}
-import org.apache.activemq.metric.{Period, MetricAggregator, MetricCounter}
+import org.apache.activemq.apollo.util.metric.{Period, MetricAggregator, MetricCounter}
import org.fusesource.hawtbuf.AsciiBuffer
import collection.mutable.ListBuffer
import java.net.URL
@@ -32,6 +30,7 @@ import java.util.concurrent.TimeUnit
import org.fusesource.hawtdispatch.ScalaDispatch._
import org.apache.activemq.apollo.dto.BrokerDTO
import org.apache.activemq.apollo.transport.TransportFactory
+import org.apache.activemq.apollo.util._
/**
*
Modified: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala Wed Jul 7 04:27:35 2010
@@ -16,7 +16,6 @@
*/
package org.apache.activemq.apollo.store.cassandra
-import org.apache.activemq.apollo.broker.{Logging, BaseService}
import com.shorrockin.cascal.session._
import com.shorrockin.cascal.utils.Conversions._
import java.util.{HashMap}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala Wed Jul 7 04:27:35 2010
@@ -16,22 +16,19 @@
*/
package org.apache.activemq.apollo.store.cassandra
-import org.apache.activemq.broker.store.{StoreUOW, Store}
import org.fusesource.hawtdispatch.BaseRetained
import com.shorrockin.cascal.session._
import java.util.concurrent.atomic.AtomicLong
import collection.mutable.ListBuffer
import java.util.HashMap
-import org.apache.activemq.apollo.broker.{Logging, Log, BaseService}
import collection.{JavaConversions, Seq}
-import org.apache.activemq.apollo.broker.{Reporting, ReporterLevel, Reporter}
import com.shorrockin.cascal.utils.Conversions._
import org.fusesource.hawtdispatch.ScalaDispatch._
-import ReporterLevel._
import java.util.concurrent._
-import org.apache.activemq.apollo.util.{TimeCounter, IntCounter}
+import org.apache.activemq.apollo.dto._
import org.apache.activemq.apollo.store._
-import org.apache.activemq.apollo.dto.{StoreStatusDTO, CassandraStoreDTO, StoreDTO}
+import org.apache.activemq.apollo.util._
+import ReporterLevel._
object CassandraStore extends Log {
@@ -77,7 +74,7 @@ class CassandraStore extends Store with
var config:CassandraStoreDTO = defaultConfig
var blocking:ExecutorService = null
- def configure(config: StoreDTO, reporter: Reporter) = configure(config.asInstanceOf[CassandraStoreDTO], reporter)
+ def configure(config: StoreDTO, reporter: Reporter):Unit = configure(config.asInstanceOf[CassandraStoreDTO], reporter)
def storeStatusDTO(callback:(StoreStatusDTO)=>Unit) = dispatchQueue {
@@ -87,7 +84,7 @@ class CassandraStore extends Store with
callback(rc)
}
- def configure(config: CassandraStoreDTO, reporter: Reporter) = {
+ def configure(config: CassandraStoreDTO, reporter: Reporter):Unit = {
if ( CassandraStore.validate(config, reporter) < ERROR ) {
if( serviceState.isStarted ) {
// TODO: apply changes while he broker is running.
Modified: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreSPI.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreSPI.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreSPI.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreSPI.scala Wed Jul 7 04:27:35 2010
@@ -18,7 +18,7 @@ package org.apache.activemq.apollo.store
import org.apache.activemq.apollo.store.StoreFactory
import org.apache.activemq.apollo.dto.{CassandraStoreDTO, StoreDTO}
-import org.apache.activemq.apollo.broker.{Reporting, ReporterLevel, Reporter}
+import org.apache.activemq.apollo.util._
import ReporterLevel._
/**
Modified: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala Wed Jul 7 04:27:35 2010
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.apollo.store.cassandra
-import org.apache.activemq.broker.store.{Store, StoreFunSuiteSupport}
+import org.apache.activemq.apollo.store._
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala Wed Jul 7 04:27:35 2010
@@ -23,7 +23,6 @@ import model.{AddQueue, AddQueueEntry, A
import org.apache.activemq.apollo.dto.HawtDBStoreDTO
import java.io.File
import java.io.IOException
-import org.apache.activemq.util.LockFile
import java.util.concurrent.atomic.{AtomicInteger, AtomicLong}
import org.fusesource.hawtdb.internal.journal.{JournalListener, Journal, Location}
import org.apache.activemq.apollo.store.hawtdb.model.Type._
@@ -34,12 +33,10 @@ import collection.mutable.{LinkedHashMap
import collection.JavaConversions
import ju.{TreeSet, HashSet}
+import java.util.concurrent.TimeUnit
import org.fusesource.hawtdb.api._
-import org.apache.activemq.apollo.broker.{DispatchLogging, Log, Logging, BaseService}
-import org.apache.activemq.apollo.util.TimeCounter
import org.apache.activemq.apollo.store._
-import java.util.concurrent.TimeUnit
-
+import org.apache.activemq.apollo.util._
object HawtDBClient extends Log {
val BEGIN = -1
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala Wed Jul 7 04:27:35 2010
@@ -16,12 +16,13 @@
*/
package org.apache.activemq.apollo.store.hawtdb
+import java.nio.ByteBuffer
+import java.io.File
+
import org.fusesource.hawtdispatch.BaseRetained
import org.fusesource.hawtdb.api.Paged.SliceType
-import org.apache.activemq.apollo.{DirectBuffer, DirectBufferPool}
-import java.nio.ByteBuffer
import org.fusesource.hawtdb.api.PageFileFactory
-import java.io.File
+import org.apache.activemq.apollo.util.{DirectBuffer, DirectBufferPool}
/**
* <p>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolSPI.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolSPI.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolSPI.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolSPI.scala Wed Jul 7 04:27:35 2010
@@ -18,7 +18,7 @@ package org.apache.activemq.apollo.store
import java.io.File
import java.lang.String
-import org.apache.activemq.apollo.DirectBufferPoolFactory
+import org.apache.activemq.apollo.util.DirectBufferPoolFactory
/**
* <p>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala Wed Jul 7 04:27:35 2010
@@ -20,16 +20,14 @@ import org.fusesource.hawtdispatch.BaseR
import java.util.concurrent.atomic.AtomicLong
import collection.mutable.ListBuffer
import java.util.HashMap
-import collection.{JavaConversions, Seq}
+import collection.{Seq}
import org.fusesource.hawtdispatch.ScalaDispatch._
-import org.apache.activemq.apollo.broker._
import java.io.File
-import ReporterLevel._
import java.util.concurrent._
-import org.apache.activemq.apollo.store._
-import org.apache.activemq.broker.store.{StoreUOW, Store}
import org.apache.activemq.apollo.dto._
+import org.apache.activemq.apollo.store._
import org.apache.activemq.apollo.util._
+import ReporterLevel._
object HawtDBStore extends Log {
val DATABASE_LOCKED_WAIT_DELAY = 10 * 1000;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreSPI.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreSPI.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreSPI.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreSPI.scala Wed Jul 7 04:27:35 2010
@@ -18,7 +18,7 @@ package org.apache.activemq.apollo.store
import org.apache.activemq.apollo.store.StoreFactory
import org.apache.activemq.apollo.dto.{HawtDBStoreDTO, StoreDTO}
-import org.apache.activemq.apollo.broker.{Reporting, ReporterLevel, Reporter}
+import org.apache.activemq.apollo.util._
import ReporterLevel._
/**
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala Wed Jul 7 04:27:35 2010
@@ -16,7 +16,9 @@
*/
package org.apache.activemq.apollo.store.hawtdb
-import org.apache.activemq.broker.store.{StoreBenchmarkSupport, Store}
+import org.apache.activemq.apollo.store.StoreBenchmarkSupport
+import org.apache.activemq.apollo.store.Store
+
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala?rev=961220&r1=961219&r2=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala Wed Jul 7 04:27:35 2010
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.apollo.store.hawtdb
-import org.apache.activemq.broker.store.{Store, StoreFunSuiteSupport}
+import org.apache.activemq.apollo.store.{Store, StoreFunSuiteSupport}
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Copied: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ArithmeticExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ArithmeticExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ArithmeticExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ArithmeticExpression.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/BinaryExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BinaryExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/BinaryExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/BinaryExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BinaryExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BinaryExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/BinaryExpression.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/BooleanExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BooleanExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/BooleanExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/BooleanExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BooleanExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/BooleanExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/BooleanExpression.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/ComparisonExpression.java (from r961219, activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ComparisonExpression.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ComparisonExpression.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ComparisonExpression.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ComparisonExpression.java&r1=961219&r2=961220&rev=961220&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/ComparisonExpression.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/apollo/filter/ComparisonExpression.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.util.HashSet;
import java.util.List;