You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:50:26 UTC
[sling-org-apache-sling-jms] 06/08: SLING-5645 Made the
ActiveMQConfigurationFactory require config to enable other JMS
implementations to be used
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jms-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jms.git
commit 69841da26f4e401b07cd1c821c1d2742bdf8e659
Author: Ian Boston <ie...@apache.org>
AuthorDate: Tue Oct 4 15:47:55 2016 +0000
SLING-5645 Made the ActiveMQConfigurationFactory require config to enable other JMS implementations to be used
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/mom/jms@1763291 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/amq/ActiveMQConnectionFactoryService.java | 8 ++------
.../org/apache/sling/jms/{ => impl}/JMSMessageTypes.java | 2 +-
.../org/apache/sling/jms/{ => impl}/JMSQueueManager.java | 3 ++-
.../org/apache/sling/jms/{ => impl}/JMSTopicManager.java | 3 ++-
src/main/java/org/apache/sling/jms/{ => impl}/Json.java | 2 +-
.../sling/jms/{JMSMessageTypes.java => package-info.java} | 12 +++++-------
src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java | 1 +
src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java | 1 +
src/test/java/org/apache/sling/jms/JsonTest.java | 1 +
9 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/sling/amq/ActiveMQConnectionFactoryService.java b/src/main/java/org/apache/sling/amq/ActiveMQConnectionFactoryService.java
index bb3798e..0fdca79 100644
--- a/src/main/java/org/apache/sling/amq/ActiveMQConnectionFactoryService.java
+++ b/src/main/java/org/apache/sling/amq/ActiveMQConnectionFactoryService.java
@@ -19,11 +19,7 @@
package org.apache.sling.amq;
import org.apache.activemq.pool.PooledConnectionFactory;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
+import org.apache.felix.scr.annotations.*;
import org.apache.sling.jms.ConnectionFactoryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +56,7 @@ import javax.jms.ConnectionFactory;
* properties:/foo/bar.properties uses a properties file as per http://activemq.apache.org/broker-properties-uri.html
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true, metatype = true, policy = ConfigurationPolicy.REQUIRE)
@Service(value=ConnectionFactoryService.class)
public class ActiveMQConnectionFactoryService implements ConnectionFactoryService {
diff --git a/src/main/java/org/apache/sling/jms/JMSMessageTypes.java b/src/main/java/org/apache/sling/jms/impl/JMSMessageTypes.java
similarity index 96%
copy from src/main/java/org/apache/sling/jms/JMSMessageTypes.java
copy to src/main/java/org/apache/sling/jms/impl/JMSMessageTypes.java
index b560a5a..3f12bd9 100644
--- a/src/main/java/org/apache/sling/jms/JMSMessageTypes.java
+++ b/src/main/java/org/apache/sling/jms/impl/JMSMessageTypes.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jms;
+package org.apache.sling.jms.impl;
/**
*/
diff --git a/src/main/java/org/apache/sling/jms/JMSQueueManager.java b/src/main/java/org/apache/sling/jms/impl/JMSQueueManager.java
similarity index 99%
rename from src/main/java/org/apache/sling/jms/JMSQueueManager.java
rename to src/main/java/org/apache/sling/jms/impl/JMSQueueManager.java
index ff9bfbc..37edecf 100644
--- a/src/main/java/org/apache/sling/jms/JMSQueueManager.java
+++ b/src/main/java/org/apache/sling/jms/impl/JMSQueueManager.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jms;
+package org.apache.sling.jms.impl;
import org.apache.felix.scr.annotations.*;
+import org.apache.sling.jms.ConnectionFactoryService;
import org.apache.sling.mom.*;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/jms/JMSTopicManager.java b/src/main/java/org/apache/sling/jms/impl/JMSTopicManager.java
similarity index 99%
rename from src/main/java/org/apache/sling/jms/JMSTopicManager.java
rename to src/main/java/org/apache/sling/jms/impl/JMSTopicManager.java
index e9b7af8..ebc2cc8 100644
--- a/src/main/java/org/apache/sling/jms/JMSTopicManager.java
+++ b/src/main/java/org/apache/sling/jms/impl/JMSTopicManager.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jms;
+package org.apache.sling.jms.impl;
import org.apache.felix.scr.annotations.*;
+import org.apache.sling.jms.ConnectionFactoryService;
import org.apache.sling.mom.*;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/jms/Json.java b/src/main/java/org/apache/sling/jms/impl/Json.java
similarity index 98%
rename from src/main/java/org/apache/sling/jms/Json.java
rename to src/main/java/org/apache/sling/jms/impl/Json.java
index c769a89..b71e3a8 100644
--- a/src/main/java/org/apache/sling/jms/Json.java
+++ b/src/main/java/org/apache/sling/jms/impl/Json.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jms;
+package org.apache.sling.jms.impl;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
diff --git a/src/main/java/org/apache/sling/jms/JMSMessageTypes.java b/src/main/java/org/apache/sling/jms/package-info.java
similarity index 89%
rename from src/main/java/org/apache/sling/jms/JMSMessageTypes.java
rename to src/main/java/org/apache/sling/jms/package-info.java
index b560a5a..3b47c12 100644
--- a/src/main/java/org/apache/sling/jms/JMSMessageTypes.java
+++ b/src/main/java/org/apache/sling/jms/package-info.java
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jms;
/**
*/
-public enum JMSMessageTypes {
- /**
- * A text message containing json.
- */
- JSON
-}
+
+@Version("1.0.0")
+package org.apache.sling.jms;
+
+import aQute.bnd.annotation.Version;
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java b/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java
index c391004..b0e2744 100644
--- a/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java
+++ b/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java
@@ -21,6 +21,7 @@ package org.apache.sling.jms;
import org.apache.sling.amq.ActiveMQConnectionFactoryService;
import org.apache.sling.amq.ActiveMQConnectionFactoryServiceTest;
+import org.apache.sling.jms.impl.JMSQueueManager;
import org.apache.sling.mom.*;
import org.junit.After;
import org.junit.Before;
diff --git a/src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java b/src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java
index b984c5d..59bca13 100644
--- a/src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java
+++ b/src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java
@@ -20,6 +20,7 @@ package org.apache.sling.jms;
import org.apache.sling.amq.ActiveMQConnectionFactoryService;
import org.apache.sling.amq.ActiveMQConnectionFactoryServiceTest;
+import org.apache.sling.jms.impl.JMSTopicManager;
import org.apache.sling.mom.*;
import org.junit.After;
import org.junit.Before;
diff --git a/src/test/java/org/apache/sling/jms/JsonTest.java b/src/test/java/org/apache/sling/jms/JsonTest.java
index 919f527..12dda05 100644
--- a/src/test/java/org/apache/sling/jms/JsonTest.java
+++ b/src/test/java/org/apache/sling/jms/JsonTest.java
@@ -19,6 +19,7 @@
package org.apache.sling.jms;
+import org.apache.sling.jms.impl.Json;
import org.junit.Before;
import org.junit.Test;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.