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:24:36 UTC
svn commit: r961219 - in /activemq/sandbox/activemq-apollo-actor:
activemq-cassandra/src/main/proto/
activemq-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/
activemq-cassandra/src/main/scala/org/apache/activemq/apollo/ activ...
Author: chirino
Date: Wed Jul 7 04:24:34 2010
New Revision: 961219
URL: http://svn.apache.org/viewvc?rev=961219&view=rev
Log:
refactoring classes into the activemq.apollo package.
Added:
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraClient.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStore.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreSPI.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStoreSPI.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/Schema.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/log4j.properties
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/broker/store/cassandra/log4j.properties
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/storage-conf.xml
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/broker/store/cassandra/storage-conf.xml
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/store/cassandra/CassandraServerMixin.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/store/cassandra/CassandraStoreTest.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBClient.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBDirectBufferPool.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolSPI.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBDirectBufferPoolSPI.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStore.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreSPI.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStoreSPI.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/Helpers.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStoreBenchmark.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStoreTest.scala
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportServer.java
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/package.html
- copied, changed from r961218, activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/package.html
Removed:
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraClient.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStore.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStoreSPI.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/Schema.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/broker/store/cassandra/log4j.properties
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/broker/store/cassandra/storage-conf.xml
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/store/cassandra/CassandraServerMixin.scala
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/store/cassandra/CassandraStoreTest.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBClient.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBDirectBufferPool.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBDirectBufferPoolSPI.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStore.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStoreSPI.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/Helpers.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStoreBenchmark.scala
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStoreTest.scala
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/package.html
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/proto/data.proto
activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/data.proto
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pools
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportTest.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/StubSslTransport.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java
Modified: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/proto/data.proto
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/proto/data.proto?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/proto/data.proto (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/proto/data.proto Wed Jul 7 04:24:34 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.cassandra;
+package org.apache.activemq.apollo.store.cassandra;
option java_multiple_files = true;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores Wed Jul 7 04:24:34 2010
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-org.apache.activemq.broker.store.cassandra.CassandraStoreSPI
\ No newline at end of file
+org.apache.activemq.apollo.store.cassandra.CassandraStoreSPI
\ No newline at end of file
Copied: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraClient.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/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:24:34 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.cassandra
+package org.apache.activemq.apollo.store.cassandra
import org.apache.activemq.apollo.broker.{Logging, BaseService}
import com.shorrockin.cascal.session._
Copied: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStore.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/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:24:34 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.cassandra
+package org.apache.activemq.apollo.store.cassandra
import org.apache.activemq.broker.store.{StoreUOW, Store}
import org.fusesource.hawtdispatch.BaseRetained
Copied: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreSPI.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreSPI.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStoreSPI.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/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:24:34 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.cassandra
+package org.apache.activemq.apollo.store.cassandra
import org.apache.activemq.apollo.store.StoreFactory
import org.apache.activemq.apollo.dto.{CassandraStoreDTO, StoreDTO}
Copied: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/Schema.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/Schema.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/Schema.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala Wed Jul 7 04:24:34 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.cassandra
+package org.apache.activemq.apollo.store.cassandra
import org.fusesource.hawtbuf.AsciiBuffer._
import org.fusesource.hawtbuf.Buffer
Copied: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/log4j.properties (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/broker/store/cassandra/log4j.properties)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/log4j.properties?p2=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/log4j.properties&p1=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/broker/store/cassandra/log4j.properties&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/storage-conf.xml (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/broker/store/cassandra/storage-conf.xml)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/storage-conf.xml?p2=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/storage-conf.xml&p1=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/resources/org/apache/activemq/broker/store/cassandra/storage-conf.xml&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/store/cassandra/CassandraServerMixin.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/store/cassandra/CassandraServerMixin.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/store/cassandra/CassandraServerMixin.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala Wed Jul 7 04:24:34 2010
@@ -1,4 +1,4 @@
-package org.apache.activemq.broker.store.cassandra
+package org.apache.activemq.apollo.store.cassandra
import org.apache.cassandra.thrift.CassandraDaemon
import org.apache.cassandra.config.DatabaseDescriptor
Copied: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/store/cassandra/CassandraStoreTest.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/test/scala/org/apache/activemq/broker/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:24:34 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.cassandra
+package org.apache.activemq.apollo.store.cassandra
import org.apache.activemq.broker.store.{Store, StoreFunSuiteSupport}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/data.proto
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/data.proto?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/data.proto (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/data.proto Wed Jul 7 04:24:34 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.hawtdb.model;
+package org.apache.activemq.apollo.store.hawtdb.model;
option java_multiple_files = true;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pools
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pools?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pools (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pools Wed Jul 7 04:24:34 2010
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-org.apache.activemq.broker.store.hawtdb.HawtDBDirectBufferPoolSPI
\ No newline at end of file
+org.apache.activemq.apollo.store.hawtdb.HawtDBDirectBufferPoolSPI
\ No newline at end of file
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/stores Wed Jul 7 04:24:34 2010
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-org.apache.activemq.broker.store.hawtdb.HawtDBStoreSPI
\ No newline at end of file
+org.apache.activemq.apollo.store.hawtdb.HawtDBStoreSPI
\ No newline at end of file
Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBClient.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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:24:34 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.hawtdb
+package org.apache.activemq.apollo.store.hawtdb
import java.{lang=>jl}
import java.{util=>ju}
@@ -26,8 +26,8 @@ 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.broker.store.hawtdb.model.Type._
-import org.apache.activemq.broker.store.hawtdb.model._
+import org.apache.activemq.apollo.store.hawtdb.model.Type._
+import org.apache.activemq.apollo.store.hawtdb.model._
import org.fusesource.hawtbuf._
import org.fusesource.hawtdispatch.ScalaDispatch._
import collection.mutable.{LinkedHashMap, HashMap, ListBuffer}
@@ -38,11 +38,9 @@ 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 org.fusesource.hawtdb.api.Paged.SliceType
import java.util.concurrent.TimeUnit
-
object HawtDBClient extends Log {
val BEGIN = -1
val COMMIT = -2
Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBDirectBufferPool.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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:24:34 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.hawtdb
+package org.apache.activemq.apollo.store.hawtdb
import org.fusesource.hawtdispatch.BaseRetained
import org.fusesource.hawtdb.api.Paged.SliceType
Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolSPI.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolSPI.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBDirectBufferPoolSPI.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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:24:34 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.hawtdb
+package org.apache.activemq.apollo.store.hawtdb
import java.io.File
import java.lang.String
Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStore.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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:24:34 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.hawtdb
+package org.apache.activemq.apollo.store.hawtdb
import org.fusesource.hawtdispatch.BaseRetained
import java.util.concurrent.atomic.AtomicLong
Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreSPI.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreSPI.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStoreSPI.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/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:24:34 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.hawtdb
+package org.apache.activemq.apollo.store.hawtdb
import org.apache.activemq.apollo.store.StoreFactory
import org.apache.activemq.apollo.dto.{HawtDBStoreDTO, StoreDTO}
Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/Helpers.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/Helpers.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/Helpers.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala Wed Jul 7 04:24:34 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.hawtdb
+package org.apache.activemq.apollo.store.hawtdb
import model._
import model.Type.TypeCreatable
Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStoreBenchmark.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/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:24:34 2010
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker.store.cassandra
+package org.apache.activemq.apollo.store.hawtdb
-import org.apache.activemq.broker.store.hawtdb.HawtDBStore
import org.apache.activemq.broker.store.{StoreBenchmarkSupport, Store}
/**
Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStoreTest.scala&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/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:24:34 2010
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker.store.cassandra
+package org.apache.activemq.apollo.store.hawtdb
import org.apache.activemq.broker.store.{Store, StoreFunSuiteSupport}
-import org.apache.activemq.broker.store.hawtdb.HawtDBStore
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Copied: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java Wed Jul 7 04:24:34 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.tcp;
+package org.apache.activemq.apollo.transport.tcp;
import org.apache.activemq.apollo.transport.ProtocolCodec;
import org.apache.activemq.apollo.transport.TransportListener;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/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:24:34 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.tcp;
+package org.apache.activemq.apollo.transport.tcp;
import java.io.IOException;
import java.net.URI;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportServer.java (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/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?p2=activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportServer.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/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:24:34 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.tcp;
+package org.apache.activemq.apollo.transport.tcp;
import org.apache.activemq.apollo.transport.TransportServer;
import org.apache.activemq.apollo.transport.Transport;
Copied: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/package.html (from r961218, activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/package.html)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/package.html?p2=activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/package.html&p1=activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/package.html&r1=961218&r2=961219&rev=961219&view=diff
==============================================================================
(empty)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp Wed Jul 7 04:24:34 2010
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-class=org.apache.activemq.transport.tcp.TcpTransportFactory
+class=org.apache.activemq.apollo.transport.tcp.TcpTransportFactory
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java Wed Jul 7 04:24:34 2010
@@ -32,7 +32,7 @@ import org.apache.activemq.transport.Tra
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportListener;
import org.apache.activemq.transport.TransportServer;
-import org.apache.activemq.transport.tcp.TcpTransport;
+import org.apache.activemq.apollo.transport.tcp.TcpTransport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java Wed Jul 7 04:24:34 2010
@@ -24,8 +24,8 @@ import java.util.Map;
import junit.framework.TestCase;
import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.transport.tcp.SslTransportFactory;
-import org.apache.activemq.transport.tcp.SslTransportServer;
+import org.apache.activemq.apollo.transport.tcp.SslTransportFactory;
+import org.apache.activemq.apollo.transport.tcp.SslTransportServer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportTest.java?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportTest.java Wed Jul 7 04:24:34 2010
@@ -26,7 +26,7 @@ import javax.net.ssl.SSLSocket;
import junit.framework.TestCase;
import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.legacy.transport.StubTransportListener;
-import org.apache.activemq.transport.tcp.SslTransport;
+import org.apache.activemq.apollo.transport.tcp.SslTransport;
import org.apache.activemq.wireformat.ObjectStreamWireFormat;
/**
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/StubSslTransport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/StubSslTransport.java?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/StubSslTransport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/StubSslTransport.java Wed Jul 7 04:24:34 2010
@@ -19,7 +19,7 @@ package org.apache.activemq.legacy.trans
import javax.net.ssl.SSLSocket;
-import org.apache.activemq.transport.tcp.SslTransport;
+import org.apache.activemq.apollo.transport.tcp.SslTransport;
import org.apache.activemq.wireformat.WireFormat;
public class StubSslTransport extends SslTransport {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java?rev=961219&r1=961218&r2=961219&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java Wed Jul 7 04:24:34 2010
@@ -37,7 +37,7 @@ import org.apache.activemq.apollo.test1.
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
-import org.apache.activemq.transport.tcp.TcpTransport;
+import org.apache.activemq.apollo.transport.tcp.TcpTransport;
public class ProducerFlowControlTest extends JmsTestSupport {