[jboss-cvs] JBoss Messaging SVN: r2410 - in trunk: src/etc/server/default/deploy and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 23 23:09:02 EST 2007
Author: ovidiu.feodorov at jboss.com
Date: 2007-02-23 23:09:02 -0500 (Fri, 23 Feb 2007)
New Revision: 2410
Modified:
trunk/docs/clustering/en/modules/installation.xml
trunk/src/etc/server/default/deploy/messaging-service.xml
trunk/src/main/org/jboss/jms/server/destination/QueueService.java
trunk/src/main/org/jboss/jms/server/destination/TopicService.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FailoverStatus.java
Log:
minor
Modified: trunk/docs/clustering/en/modules/installation.xml
===================================================================
--- trunk/docs/clustering/en/modules/installation.xml 2007-02-24 03:59:41 UTC (rev 2409)
+++ trunk/docs/clustering/en/modules/installation.xml 2007-02-24 04:09:02 UTC (rev 2410)
@@ -233,4 +233,14 @@
</programlisting>
+ <note>
+ The installation script may fail while installing Messaging with source-generated
+ JBoss 4.0.5.GA-ejb3 instance. This is because release-admin.xml relies on finding
+ <filename>$JBOSS_HOME/docs/examples/binding-manager/sample-bindings.xml</filename>.
+ 4.0.5.GA-ejb3 installations seem not to have a "docs" sub-directory. A very simple work-around
+ for this situation is to recursively copy the "docs" sub-directory available under a regular
+ (non-EJB3) source-generated 4.0.5.GA instance and retry the installation process.
+ </note>
+
+
</chapter>
Modified: trunk/src/etc/server/default/deploy/messaging-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/messaging-service.xml 2007-02-24 03:59:41 UTC (rev 2409)
+++ trunk/src/etc/server/default/deploy/messaging-service.xml 2007-02-24 04:09:02 UTC (rev 2410)
@@ -21,37 +21,26 @@
<arg type="java.lang.String" value="/topic"/>
</constructor>
- <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
-
- <depends optional-attribute-name="JMSUserManager">jboss.messaging:service=JMSUserManager</depends>
-
- <depends>jboss.messaging:service=Connector,transport=bisocket</depends>
-
<attribute name="PostOffice">jboss.messaging:service=PostOffice</attribute>
-
<attribute name="SecurityDomain">java:/jaas/messaging</attribute>
-
<attribute name="DefaultSecurityConfig">
<security>
<role name="guest" read="true" write="true" create="true"/>
</security>
</attribute>
-
<attribute name="DefaultDLQ">jboss.messaging.destination:service=Queue,name=DLQ</attribute>
-
- <attribute name="DefaultMaxDeliveryAttempts">10</attribute>
-
- <attribute name="DefaultExpiryQueue">jboss.messaging.destination:service=Queue,name=ExpiryQueue</attribute>
-
+ <attribute name="DefaultMaxDeliveryAttempts">10</attribute>
+ <attribute name="DefaultExpiryQueue">jboss.messaging.destination:service=Queue,name=ExpiryQueue</attribute>
<attribute name="DefaultRedeliveryDelay">0</attribute>
-
<attribute name="QueueStatsSamplePeriod">5000</attribute>
-
<attribute name="FailoverStartTimeout">3000</attribute>
-
<attribute name="FailoverCompleteTimeout">12000</attribute>
-
<attribute name="DefaultMessageCounterHistoryDayLimit">-1</attribute>
+
+ <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
+ <depends optional-attribute-name="JMSUserManager">jboss.messaging:service=JMSUserManager</depends>
+ <depends>jboss.messaging:service=Connector,transport=bisocket</depends>
+
</mbean>
</server>
\ No newline at end of file
Modified: trunk/src/main/org/jboss/jms/server/destination/QueueService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/QueueService.java 2007-02-24 03:59:41 UTC (rev 2409)
+++ trunk/src/main/org/jboss/jms/server/destination/QueueService.java 2007-02-24 04:09:02 UTC (rev 2410)
@@ -96,15 +96,13 @@
if (q instanceof FailedOverQueue && queue.getMessageCount() == 0)
{
- //If there are no refs in the queue we can safely delete it
- //We don't want empty queues from previous failed nodes clogging up
- //the database
+ // If there are no message references in the queue we can safely delete it. We don't
+ // want empty queues from previous failed nodes clogging up the database.
//TODO - commented out for now
// ClusteredPostOffice cpo = (ClusteredPostOffice)postOffice;
-//
-// cpo.unbindClusteredQueue(q.getName());
+// cpo.unbindClusteredQueue(q.getName());
}
else
{
Modified: trunk/src/main/org/jboss/jms/server/destination/TopicService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/TopicService.java 2007-02-24 03:59:41 UTC (rev 2409)
+++ trunk/src/main/org/jboss/jms/server/destination/TopicService.java 2007-02-24 04:09:02 UTC (rev 2410)
@@ -18,7 +18,6 @@
import org.jboss.jms.util.MessageQueueNameHelper;
import org.jboss.jms.util.XMLUtil;
import org.jboss.messaging.core.local.PagingFilteredQueue;
-import org.jboss.messaging.core.plugin.contract.ClusteredPostOffice;
import org.jboss.messaging.core.plugin.postoffice.Binding;
import org.jboss.messaging.core.plugin.postoffice.cluster.FailedOverQueue;
@@ -91,14 +90,12 @@
if (queue instanceof FailedOverQueue && queue.getMessageCount() == 0)
{
- //If there are no refs in the queue we can safely delete it
- //We don't want empty queues from previous failed nodes clogging up
- //the database
+ // If there are no message references in the queue we can safely delete it. We don't
+ // want empty queues from previous failed nodes clogging up the database.
- //Commented out for now
+ //TODO - commented out for now
// ClusteredPostOffice cpo = (ClusteredPostOffice)postOffice;
-//
// cpo.unbindClusteredQueue(queue.getName());
}
else
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java 2007-02-24 03:59:41 UTC (rev 2409)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java 2007-02-24 04:09:02 UTC (rev 2410)
@@ -2170,8 +2170,6 @@
ClusteredQueue queue = (ClusteredQueue)binding.getQueue();
- log.info("queue is:" + queue.getName());
-
// Sanity check
if (queue.isLocal())
{
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FailoverStatus.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FailoverStatus.java 2007-02-24 03:59:41 UTC (rev 2409)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FailoverStatus.java 2007-02-24 04:09:02 UTC (rev 2410)
@@ -70,12 +70,11 @@
throw new IllegalStateException("Already failing over for node " + currentlyFailingOverForNode);
}
- //Remove from failedOverNodes in case its failed over for the same node before
+ // Remove from failedOverNodes in case its failed over for the same node before.
failedOverForNodes.remove(nodeID);
currentlyFailingOverForNode = nodeID.intValue();
-
- failingOver = true;
+ failingOver = true;
}
public void finishFailingOver()
@@ -86,7 +85,6 @@
}
failedOverForNodes.add(new Integer(currentlyFailingOverForNode));
-
failingOver = false;
}
More information about the jboss-cvs-commits
mailing list