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:03:36 UTC
svn commit: r961122 [3/3] - in /activemq/sandbox/activemq-apollo-actor:
activemq-broker/src/main/resources/
activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/
activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/
activem...
Copied: activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java (from r961121, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStorePerformance.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStorePerformance.java&r1=961121&r2=961122&rev=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBStorePerformance.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java Wed Jul 7 04:03:34 2010
@@ -14,22 +14,21 @@
* 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;
-import java.io.File;
+import org.fusesource.hawtbuf.AsciiBuffer;
+import org.fusesource.hawtbuf.Buffer;
-import org.apache.activemq.broker.store.Store;
-import org.apache.activemq.broker.store.StorePerformanceBase;
-import org.apache.activemq.broker.store.hawtdb.HawtDBStore;
-
-public class HawtDBStorePerformance extends StorePerformanceBase {
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class SubscriptionRecord {
- @Override
- protected Store createStore() {
- HawtDBStore rc = new HawtDBStore();
- rc.setStoreDirectory(new File("target/test-data/kahadb-store-performance"));
- rc.setDeleteAllMessages(true);
- return rc;
- }
+ public AsciiBuffer name;
+ public AsciiBuffer selector;
+ public AsciiBuffer destination;
+ public boolean isDurable;
+ public long expiration = -1;
+ public Buffer attachment;
}
Copied: activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/memory/MemoryStore.scala (from r961121, activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/memory/MemoryBrokerDatabase.scala)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/memory/MemoryStore.scala?p2=activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/memory/MemoryStore.scala&p1=activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/memory/MemoryBrokerDatabase.scala&r1=961121&r2=961122&rev=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/memory/MemoryBrokerDatabase.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/scala/org/apache/activemq/apollo/store/memory/MemoryStore.scala Wed Jul 7 04:03:34 2010
@@ -29,6 +29,7 @@ import org.apache.activemq.Service
import org.fusesource.hawtdispatch.{DispatchQueue, BaseRetained, Retained}
import org.apache.activemq.apollo.util.BaseService
import org.apache.activemq.broker.store._
+import org.apache.activemq.apollo.store.{QueueStatus, MessageRecord, QueueRecord}
/**
* <p>
@@ -61,7 +62,7 @@ class Counter(private var value:Int = 0)
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
-class MemoryBrokerDatabase() extends BaseService with BrokerDatabase {
+class MemoryStore() extends BaseService with Store {
val dispatchQueue = createQueue("MessagesTable")
def getDispatchQueue = dispatchQueue
@@ -88,7 +89,7 @@ class MemoryBrokerDatabase() extends Bas
private val queue_id_generator = new AtomicLong
val queues = new TreeMap[Long, QueueData]
- case class QueueData(val record:StoredQueue) {
+ case class QueueData(val record:QueueRecord) {
var messges = new TreeMap[Long, Long]()
}
@@ -96,26 +97,29 @@ class MemoryBrokerDatabase() extends Bas
JavaConversions.asSet(queues.keySet).toSeq
} >>: dispatchQueue
- def getQueueInfo(id:Long)(cb:(Option[StoredQueue])=>Unit ) = reply(cb) {
+ def getQueueStatus(id:Long)(cb:(Option[QueueStatus])=>Unit ) = reply(cb) {
val qd = queues.get(id)
if( qd == null ) {
None
} else {
- val rc = qd.record
+ val rc = new QueueStatus
+ rc.record = qd.record
if( qd.messges.isEmpty ) {
rc.count = 0
+ rc.size = 0
rc.first = -1
rc.last = -1
} else {
rc.count = qd.messges.size
rc.first = qd.messges.firstKey
rc.last = qd.messges.lastKey
+ rc.size = 0 // TODO
}
Some(rc)
}
} >>: dispatchQueue
- def addQueue(record:StoredQueue)(cb:(Option[Long])=>Unit):Unit = reply(cb) {
+ def addQueue(record:QueueRecord)(cb:(Option[Long])=>Unit):Unit = reply(cb) {
val id = queue_id_generator.incrementAndGet
if( queues.containsKey(id) ) {
None
@@ -130,7 +134,7 @@ class MemoryBrokerDatabase() extends Bas
// Methods related to message storage
//
/////////////////////////////////////////////////////////////////////
- class MessageData(val delivery:StoredMessage) {
+ class MessageData(val delivery:MessageRecord) {
val queueRefs = new Counter()
var onFlush = List[()=>Unit]()
}
@@ -147,7 +151,7 @@ class MemoryBrokerDatabase() extends Bas
}
} >>: dispatchQueue
- def loadMessage(ref:Long)(cb:(Option[StoredMessage])=>Unit ) = reply(cb) {
+ def loadMessage(ref:Long)(cb:(Option[MessageRecord])=>Unit ) = reply(cb) {
val rc = messages.get(ref)
if( rc == null ) {
None
@@ -175,7 +179,7 @@ class MemoryBrokerDatabase() extends Bas
val updated = HashMap[Long, MessageData]()
- def store(sm:StoredMessage) = {
+ def store(sm:MessageRecord) = {
if( sm.id == -1 ) {
sm.id = msg_id_generator.incrementAndGet
using(this) {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/activemq.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/activemq.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/activemq.xml Wed Jul 7 04:03:34 2010
@@ -28,4 +28,4 @@
<kahadb-store directory="${user.dir}/target/${user.name}/${x}/activemq-data"/>
</virtual-host>
-</broker>
\ No newline at end of file
+</broker>
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/activemq.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/master.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/master.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/master.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/slave.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/slave.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/slave.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/slave2.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/slave2.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/ft/slave2.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/store/loadtester.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml Wed Jul 7 04:03:34 2010
@@ -30,4 +30,4 @@
</broker>
-</beans>
\ No newline at end of file
+</beans>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/config.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/config.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/config.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/example.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/example.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/example.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/spring-test.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/spring-test.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/spring-test.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/spring-test.xml Wed Jul 7 04:03:34 2010
@@ -32,4 +32,4 @@
</constructor-arg>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/config/spring-test.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/security/ldap-spring.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/security/ldap-spring.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/security/ldap-spring.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/security/ldap-spring.xml Wed Jul 7 04:03:34 2010
@@ -23,14 +23,14 @@
<bean id="environment" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">
<props>
- <prop key="java.naming.security.authentication">simple</prop>
- <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
- <prop key="java.naming.security.credentials">secret</prop>
- <!--<prop key="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
- <!--<prop key="kdc.java.naming.security.credentials">secret</prop>-->
- <!--<prop key="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
- <!--<prop key="changepw.java.naming.security.credentials">secret</prop>-->
- <!-- Set this key to a space delimited set of attributeType descriptions
+ <prop id="java.naming.security.authentication">simple</prop>
+ <prop id="java.naming.security.principal">uid=admin,ou=system</prop>
+ <prop id="java.naming.security.credentials">secret</prop>
+ <!--<prop id="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+ <!--<prop id="kdc.java.naming.security.credentials">secret</prop>-->
+ <!--<prop id="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+ <!--<prop id="changepw.java.naming.security.credentials">secret</prop>-->
+ <!-- Set this id to a space delimited set of attributeType descriptions
and their OID's if you want an attributeType to be handled as
binary content.
@@ -40,7 +40,7 @@
must add both the OID and all the names an attributeType can have.
-->
<!--
- <prop key="java.naming.ldap.attributes.binary"></prop>
+ <prop id="java.naming.ldap.attributes.binary"></prop>
-->
</props>
</property>
@@ -204,7 +204,7 @@
<bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
<property name="customEditors">
<map>
- <entry key="javax.naming.directory.Attributes">
+ <entry id="javax.naming.directory.Attributes">
<bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
</entry>
</map>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml Wed Jul 7 04:03:34 2010
@@ -62,4 +62,4 @@
</plugins>
</broker>
-</beans>
\ No newline at end of file
+</beans>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml Wed Jul 7 04:03:34 2010
@@ -64,4 +64,4 @@
</plugins>
</broker>
-</beans>
\ No newline at end of file
+</beans>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml Wed Jul 7 04:03:34 2010
@@ -64,4 +64,4 @@
</plugins>
</broker>
-</beans>
\ No newline at end of file
+</beans>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/tcp/activemq-ssl.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/tcp/activemq-ssl.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/transport/tcp/activemq-ssl.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/receiver-activecluster.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/receiver-activecluster.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/receiver-activecluster.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/receiver.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/receiver.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/receiver.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/sender.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/sender.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/usecases/sender.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/xbean/activemq2.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/xbean/activemq2.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/xbean/activemq2.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/org/apache/activemq/xbean/activemq2.xml Wed Jul 7 04:03:34 2010
@@ -54,4 +54,4 @@
</networkConnectors>
-->
</broker>
-</beans>
\ No newline at end of file
+</beans>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded-pooled.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded-pooled.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded-pooled.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded-xbean-noversion.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded-xbean-noversion.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded-xbean-noversion.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded-xbean.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded-xbean.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded-xbean.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-embedded.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-jndi.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-jndi.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-jndi.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-jndi.xml Wed Jul 7 04:03:34 2010
@@ -27,9 +27,9 @@
<bean id="jndiTemplate" class="org.springframework.jndi.JndiTemplate">
<property name="environment">
<props>
- <prop key="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</prop>
+ <prop id="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</prop>
<!-- lets register some destinations -->
- <prop key="topic.MyTopic">example.Spring.MyTopic</prop>
+ <prop id="topic.MyTopic">example.Spring.MyTopic</prop>
</props>
</property>
</bean>
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-jndi.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-queue.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-queue.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring-queue.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/resources/spring.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml Wed Jul 7 04:03:34 2010
@@ -32,7 +32,7 @@
<name>${pom.artifactId}</name>
<description>
HawtDB is a library for managing a database. The database is a file that allows you to store data in indexes.
- Each index is a map of key value pairs.</description>
+ Each index is a map of id value pairs.</description>
<repositories>
<repository>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/README
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/README?rev=961122&r1=961121&r2=961122&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/README (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/README Wed Jul 7 04:03:34 2010
@@ -5,7 +5,7 @@
Goals:
* Provide a simple collections based interface for storing persistent
data.
- * Provide a lower level key value interface for storing data. Secondary
+ * Provide a lower level id value interface for storing data. Secondary
keys should be supported.
* Fast recovery