Merge pull request #48 from dizzzz/refactor

minor repairs

Author: dizzzz

build.properties

@@ -3,7 +3,7 @@ exist.dir=../exist/
 
 # Extension details
 module.name=messaging-replication
-module.version=0.9.0
+module.version=0.9.1
 module.title=Messaging and Replication
 
 # Build instructions

doc/README.txt

@@ -55,7 +55,7 @@ Get Started
 
     <collection xmlns="http://exist-db.org/collection-config/1.0">
         <triggers>
-            <trigger class="org.exist.replication.jms.publish.ReplicationTrigger">
+            <trigger class="org.exist.jms.replication.publish.ReplicationTrigger">
 
                 <parameter name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
                 <parameter name="java.naming.provider.url" value="tcp://myserver.local:61616"/>
@@ -78,7 +78,7 @@ Get Started
 - For each 'Slave' (subscriber)
   - Add a startup trigger to conf.xml:
 
-    <trigger class="org.exist.replication.jms.subscribe.MessageReceiverStartupTrigger">>
+    <trigger class="org.exist.jms.replication.subscribe.ReceiverStartupTrigger">>
 
         <parameter name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
         <parameter name="java.naming.provider.url" value="tcp://myserver.local:61616"/>

doc/conf.xml

@@ -2,7 +2,7 @@
     Start JMS listener for listener of the clustering feature. 
 -->
 <trigger 
-    class="org.exist.replication.jms.subscribe.MessageReceiverStartupTrigger">
+    class="org.exist.jms.replication.subscribe.ReceiverStartupTrigger">
     <!-- 
         Class name of the initial context provider, default value for ActiveMQ
         see javax.naming.Context#INITIAL_CONTEXT_FACTORY

doc/example.xconf

@@ -1,6 +1,6 @@
 <collection xmlns="http://exist-db.org/collection-config/1.0">
     <triggers>
-        <trigger class="org.exist.replication.jms.publish.ReplicationTrigger">
+        <trigger class="org.exist.jms.replication.publish.ReplicationTrigger">
 
             <!-- 
                 Class name of the initial context provider, default value for ActiveMQ

java/src/org/exist/jms/replication/publish/ReplicationTrigger.java

@@ -131,7 +131,8 @@ private void afterUpdateCreateDocument(DBBroker broker, Txn transaction, Documen
             msg.setPayload(MessageHelper.gzipSerialize(broker, document));
 
         } catch (Throwable ex) {
-            LOGGER.error(String.format("Problem while serializing document (contentLength=%s) to compressed message:%s",                                    document.getContentLength(), ex.getMessage()), ex);
+            LOGGER.error(String.format("Problem while serializing document (contentLength=%s) to compressed message:%s",                                    
+                    document.getContentLength(), ex.getMessage()), ex);
             //throw new TriggerException("Unable to retrieve message payload: " + ex.getMessage());
         }
 

java/src/org/exist/jms/replication/subscribe/StartupTrigger.java renamed to java/src/org/exist/jms/replication/subscribe/ReceiverStartupTrigger.java

@@ -33,9 +33,9 @@
  *
  * @author Dannes Wessels
  */
-public class StartupTrigger implements org.exist.storage.StartupTrigger {
+public class ReceiverStartupTrigger implements org.exist.storage.StartupTrigger {
 
-    private final static Logger LOG = Logger.getLogger(StartupTrigger.class);
+    private final static Logger LOG = Logger.getLogger(ReceiverStartupTrigger.class);
 
 
     /*

java/src/org/exist/jms/shared/Receiver.java

@@ -84,7 +84,7 @@ private enum STATE {
     private Connection connection = null;
 
     private int id = 0;
-    private static int lastId = 0;
+    private static volatile int lastId = 0;
 
     private static synchronized Integer createNewId() {
         lastId++;

web/replication-consumer.html

@@ -8,7 +8,7 @@ <h1>Replication: Consumer</h1>
     Start JMS listener for listener of the clustering feature. 
 --&gt;
 &lt;trigger 
-    class="org.exist.jms.replication.subscribe.StartupTrigger"&gt;
+    class="org.exist.jms.replication.subscribe.ReceiverStartupTrigger"&gt;
     &lt;!-- 
         Class name of the initial context provider, default value for ActiveMQ
         see javax.naming.Context#INITIAL_CONTEXT_FACTORY