You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2013/11/22 11:23:20 UTC
[1/2] git commit: AMQ-4885: Renamed some API methods in MessageStore
due typos.
Updated Branches:
refs/heads/trunk 25f4e874e -> 00cb9a566
AMQ-4885: Renamed some API methods in MessageStore due typos.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c0090f6f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c0090f6f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c0090f6f
Branch: refs/heads/trunk
Commit: c0090f6f0c94b502d8043ffaea20b57500188156
Parents: 25f4e87
Author: Claus Ibsen <cl...@gmail.com>
Authored: Fri Nov 22 11:21:42 2013 +0100
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Fri Nov 22 11:21:42 2013 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/activemq/broker/region/Topic.java | 2 +-
.../src/main/java/org/apache/activemq/store/MessageStore.java | 4 ++--
.../java/org/apache/activemq/store/ProxyTopicMessageStore.java | 4 ++--
.../main/java/org/apache/activemq/store/TopicMessageStore.java | 2 +-
.../apache/activemq/store/memory/MemoryTopicMessageStore.java | 2 +-
.../org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java | 2 +-
.../apache/activemq/store/journal/JournalTopicMessageStore.java | 4 ++--
.../main/java/org/apache/activemq/store/kahadb/KahaDBStore.java | 4 ++--
.../java/org/apache/activemq/store/kahadb/TempKahaDBStore.java | 4 ++--
.../main/scala/org/apache/activemq/leveldb/LevelDBStore.scala | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
index 328410c..41eef60 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
@@ -255,7 +255,7 @@ public class Topic extends BaseDestination implements Task {
// This destination might be a pattern
synchronized (consumers) {
consumers.add(subscription);
- topicStore.addSubsciption(info, subscription.getConsumerInfo().isRetroactive());
+ topicStore.addSubscription(info, subscription.getConsumerInfo().isRetroactive());
}
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java
index b519718..6dac804 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java
@@ -147,10 +147,10 @@ public interface MessageStore extends Service {
ActiveMQDestination getDestination();
/**
- * @param memoeyUSage The SystemUsage that is controlling the
+ * @param memoryUsage The SystemUsage that is controlling the
* destination's memory usage.
*/
- void setMemoryUsage(MemoryUsage memoeyUSage);
+ void setMemoryUsage(MemoryUsage memoryUsage);
/**
* @return the number of messages ready to deliver
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
index 00e5150..8487650 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
@@ -94,8 +94,8 @@ public class ProxyTopicMessageStore implements TopicMessageStore {
}
@Override
- public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
- delegate.addSubsciption(subscriptionInfo, retroactive);
+ public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
+ delegate.addSubscription(subscriptionInfo, retroactive);
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java
index 24f5b0c..0343c11 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java
@@ -129,5 +129,5 @@ public interface TopicMessageStore extends MessageStore {
* @param retroactive
* @throws IOException
*/
- void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException;
+ void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
index 023d9eb..0debfe6 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
@@ -80,7 +80,7 @@ public class MemoryTopicMessageStore extends MemoryMessageStore implements Topic
return subscriberDatabase.get(new SubscriptionKey(clientId, subscriptionName));
}
- public synchronized void addSubsciption(SubscriptionInfo info, boolean retroactive) throws IOException {
+ public synchronized void addSubscription(SubscriptionInfo info, boolean retroactive) throws IOException {
SubscriptionKey key = new SubscriptionKey(info);
MemoryTopicSub sub = new MemoryTopicSub();
topicSubMap.put(key, sub);
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
index 8d38234..1efdc63 100755
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
@@ -330,7 +330,7 @@ public class JDBCTopicMessageStore extends JDBCMessageStore implements TopicMess
}
- public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
+ public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
TransactionContext c = persistenceAdapter.getTransactionContext();
try {
c = persistenceAdapter.getTransactionContext();
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
index 64964fb..51d9693 100755
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
@@ -71,9 +71,9 @@ public class JournalTopicMessageStore extends JournalMessageStore implements Top
return longTermStore.lookupSubscription(clientId, subscriptionName);
}
- public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
+ public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
this.peristenceAdapter.checkpoint(true, true);
- longTermStore.addSubsciption(subscriptionInfo, retroactive);
+ longTermStore.addSubscription(subscriptionInfo, retroactive);
}
public void addMessage(ConnectionContext context, Message message) throws IOException {
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
index 0c269b4..3095a0d 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
@@ -662,7 +662,7 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter {
}
@Override
- public void setMemoryUsage(MemoryUsage memoeyUSage) {
+ public void setMemoryUsage(MemoryUsage memoryUsage) {
}
@Override
public void start() throws Exception {
@@ -765,7 +765,7 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter {
}
@Override
- public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
+ public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
String subscriptionKey = subscriptionKey(subscriptionInfo.getClientId(), subscriptionInfo
.getSubscriptionName());
KahaSubscriptionCommand command = new KahaSubscriptionCommand();
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java
index b68972e..66ae496 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java
@@ -265,7 +265,7 @@ public class TempKahaDBStore extends TempMessageDatabase implements PersistenceA
}
@Override
- public void setMemoryUsage(MemoryUsage memoeyUSage) {
+ public void setMemoryUsage(MemoryUsage memoryUsage) {
}
@Override
public void start() throws Exception {
@@ -294,7 +294,7 @@ public class TempKahaDBStore extends TempMessageDatabase implements PersistenceA
processRemove(command, null);
}
- public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
+ public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException {
String subscriptionKey = subscriptionKey(subscriptionInfo.getClientId(), subscriptionInfo.getSubscriptionName());
KahaSubscriptionCommand command = new KahaSubscriptionCommand();
command.setDestination(dest);
http://git-wip-us.apache.org/repos/asf/activemq/blob/c0090f6f/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
index 7f5b534..322656f 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
@@ -816,7 +816,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P
}
}
- def addSubsciption(info: SubscriptionInfo, retroactive: Boolean) = {
+ def addSubscription(info: SubscriptionInfo, retroactive: Boolean) = {
check_running
var sub = db.addSubscription(key, info)
subscriptions.synchronized {
[2/2] git commit: AMQ-4858: Moved scala source file from java to
scala dir. Thanks to Jaromir Hamala for patch.
Posted by da...@apache.org.
AMQ-4858: Moved scala source file from java to scala dir. Thanks to Jaromir Hamala for patch.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/00cb9a56
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/00cb9a56
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/00cb9a56
Branch: refs/heads/trunk
Commit: 00cb9a566816357f3712e0de1ca0ee80815ddf0f
Parents: c0090f6
Author: Claus Ibsen <cl...@gmail.com>
Authored: Fri Nov 22 11:25:08 2013 +0100
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Fri Nov 22 11:25:08 2013 +0100
----------------------------------------------------------------------
.../ReplicatedLevelDBStoreTrait.scala | 66 --------------------
.../ReplicatedLevelDBStoreTrait.scala | 66 ++++++++++++++++++++
2 files changed, 66 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/00cb9a56/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala
deleted file mode 100644
index 1c522aa..0000000
--- a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.leveldb.replicated
-
-import scala.reflect.BeanProperty
-import java.util.UUID
-import org.apache.activemq.leveldb.LevelDBStore
-import org.apache.activemq.leveldb.util.FileSupport._
-import java.io.File
-
-object ReplicatedLevelDBStoreTrait {
-
- def create_uuid = UUID.randomUUID().toString
-
- def node_id(directory:File):String = {
- val nodeid_file = directory / "nodeid.txt"
- if( nodeid_file.exists() ) {
- nodeid_file.readText()
- } else {
- val rc = create_uuid
- nodeid_file.getParentFile.mkdirs()
- nodeid_file.writeText(rc)
- rc
- }
- }
-}
-
-/**
- */
-trait ReplicatedLevelDBStoreTrait extends LevelDBStore {
-
- @BeanProperty
- var securityToken = ""
-
- def node_id = ReplicatedLevelDBStoreTrait.node_id(directory)
-
- def storeId:String = {
- val storeid_file = directory / "storeid.txt"
- if( storeid_file.exists() ) {
- storeid_file.readText()
- } else {
- null
- }
- }
-
- def storeId_=(value:String) {
- val storeid_file = directory / "storeid.txt"
- storeid_file.writeText(value)
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/activemq/blob/00cb9a56/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala
new file mode 100644
index 0000000..1c522aa
--- /dev/null
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.leveldb.replicated
+
+import scala.reflect.BeanProperty
+import java.util.UUID
+import org.apache.activemq.leveldb.LevelDBStore
+import org.apache.activemq.leveldb.util.FileSupport._
+import java.io.File
+
+object ReplicatedLevelDBStoreTrait {
+
+ def create_uuid = UUID.randomUUID().toString
+
+ def node_id(directory:File):String = {
+ val nodeid_file = directory / "nodeid.txt"
+ if( nodeid_file.exists() ) {
+ nodeid_file.readText()
+ } else {
+ val rc = create_uuid
+ nodeid_file.getParentFile.mkdirs()
+ nodeid_file.writeText(rc)
+ rc
+ }
+ }
+}
+
+/**
+ */
+trait ReplicatedLevelDBStoreTrait extends LevelDBStore {
+
+ @BeanProperty
+ var securityToken = ""
+
+ def node_id = ReplicatedLevelDBStoreTrait.node_id(directory)
+
+ def storeId:String = {
+ val storeid_file = directory / "storeid.txt"
+ if( storeid_file.exists() ) {
+ storeid_file.readText()
+ } else {
+ null
+ }
+ }
+
+ def storeId_=(value:String) {
+ val storeid_file = directory / "storeid.txt"
+ storeid_file.writeText(value)
+ }
+
+
+}