svn commit: r1763291 - in /sling/trunk/contrib/commons/mom: jms/src/main/java/org/apache/sling/amq/ jms/src/main/java/org/apache/sling/jms/ jms/src/main/java/org/apache/sling/jms/impl/ jms/src/test/java/org/apache/sling/jms/ jobs/it/src/test/resources/...

[ie...@apache.org]

Author: ieb
Date: Tue Oct  4 15:47:55 2016
New Revision: 1763291

URL: http://svn.apache.org/viewvc?rev=1763291&view=rev
Log:
SLING-5645 Made the ActiveMQConfigurationFactory require config to enable other JMS implementations to be used

Added:
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSMessageTypes.java
      - copied, changed from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSMessageTypes.java
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSQueueManager.java   (contents, props changed)
      - copied, changed from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSQueueManager.java
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSTopicManager.java   (contents, props changed)
      - copied, changed from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSTopicManager.java
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/Json.java   (contents, props changed)
      - copied, changed from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/Json.java
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java   (contents, props changed)
      - copied, changed from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSMessageTypes.java
Removed:
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSMessageTypes.java
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSQueueManager.java
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSTopicManager.java
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/Json.java
Modified:
    sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/amq/ActiveMQConnectionFactoryService.java
    sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java
    sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java
    sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JsonTest.java
    sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/jobs-runtime.txt

Modified: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/amq/ActiveMQConnectionFactoryService.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/amq/ActiveMQConnectionFactoryService.java?rev=1763291&r1=1763290&r2=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/amq/ActiveMQConnectionFactoryService.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/amq/ActiveMQConnectionFactoryService.java Tue Oct  4 15:47:55 2016
@@ -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 {
 

Copied: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSMessageTypes.java (from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSMessageTypes.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSMessageTypes.java?p2=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSMessageTypes.java&p1=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSMessageTypes.java&r1=1763290&r2=1763291&rev=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSMessageTypes.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSMessageTypes.java Tue Oct  4 15:47:55 2016
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jms;
+package org.apache.sling.jms.impl;
 
 /**
  */

Copied: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSQueueManager.java (from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSQueueManager.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSQueueManager.java?p2=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSQueueManager.java&p1=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSQueueManager.java&r1=1763290&r2=1763291&rev=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSQueueManager.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSQueueManager.java Tue Oct  4 15:47:55 2016
@@ -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;

Propchange: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSQueueManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSTopicManager.java (from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSTopicManager.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSTopicManager.java?p2=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSTopicManager.java&p1=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSTopicManager.java&r1=1763290&r2=1763291&rev=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSTopicManager.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSTopicManager.java Tue Oct  4 15:47:55 2016
@@ -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;

Propchange: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/JMSTopicManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/Json.java (from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/Json.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/Json.java?p2=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/Json.java&p1=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/Json.java&r1=1763290&r2=1763291&rev=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/Json.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/Json.java Tue Oct  4 15:47:55 2016
@@ -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;

Propchange: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/impl/Json.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java (from r1763290, sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSMessageTypes.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java?p2=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java&p1=sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSMessageTypes.java&r1=1763290&r2=1763291&rev=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/JMSMessageTypes.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java Tue Oct  4 15:47:55 2016
@@ -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

Propchange: sling/trunk/contrib/commons/mom/jms/src/main/java/org/apache/sling/jms/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java?rev=1763291&r1=1763290&r2=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java Tue Oct  4 15:47:55 2016
@@ -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;

Modified: sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java?rev=1763291&r1=1763290&r2=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java Tue Oct  4 15:47:55 2016
@@ -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;

Modified: sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JsonTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JsonTest.java?rev=1763291&r1=1763290&r2=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JsonTest.java (original)
+++ sling/trunk/contrib/commons/mom/jms/src/test/java/org/apache/sling/jms/JsonTest.java Tue Oct  4 15:47:55 2016
@@ -19,6 +19,7 @@
 
 package org.apache.sling.jms;
 
+import org.apache.sling.jms.impl.Json;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/jobs-runtime.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/jobs-runtime.txt?rev=1763291&r1=1763290&r2=1763291&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/jobs-runtime.txt (original)
+++ sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/jobs-runtime.txt Tue Oct  4 15:47:55 2016
@@ -32,10 +32,14 @@
   org.apache.sling/org.apache.sling.jobs-it-services/0.0.1-SNAPSHOT
 
 [configurations]
+  # The ActiveMQConnectionFactoryService must be configured to start, could use any property, even one not used.
+  org.apache.sling.amq.ActiveMQConnectionFactoryService
+  jms.brokerUri="vm://localhost:61616?broker.useShutdownHook\=false"
+
   # Configure a queue to listen to the queue used in the IT Services components.
   # In general a queue should only be activated on an instance if the
   # instance is configured with consumers for that queue.
   # If consumers are not present, then the queue will dequeue and force a retry
   # of each item it can process untill the retry limit is reached.
   org.apache.sling.jobs.impl.JobQueueConsumerFactory
-  queue-name="org/apache/sling/jobs/it/services"
+    queue-name="org/apache/sling/jobs/it/services"