[jboss-cvs] JBoss Messaging SVN: r1767 - in trunk: . src/etc/server/default/deploy src/main/org/jboss/jms/server/connectionfactory src/main/org/jboss/messaging/core/plugin tests/src/org/jboss/test/messaging/tools/jmx
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 11 21:16:56 EST 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-12-11 21:16:50 -0500 (Mon, 11 Dec 2006)
New Revision: 1767
Modified:
trunk/messaging.iml
trunk/messaging.ipr
trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml
trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
Log:
post-merge adjustments
Modified: trunk/messaging.iml
===================================================================
--- trunk/messaging.iml 2006-12-11 22:29:27 UTC (rev 1766)
+++ trunk/messaging.iml 2006-12-12 02:16:50 UTC (rev 1767)
@@ -40,6 +40,7 @@
<orderEntry type="library" name="jboss-serialization" level="project" />
<orderEntry type="library" name="jgroups" level="project" />
<orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="library" name="jboss-system" level="project" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: trunk/messaging.ipr
===================================================================
--- trunk/messaging.ipr 2006-12-11 22:29:27 UTC (rev 1766)
+++ trunk/messaging.ipr 2006-12-12 02:16:50 UTC (rev 1767)
@@ -301,6 +301,13 @@
<JAVADOC />
<SOURCES />
</library>
+ <library name="jboss-system">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
</component>
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
Modified: trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml 2006-12-11 22:29:27 UTC (rev 1766)
+++ trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml 2006-12-12 02:16:50 UTC (rev 1767)
@@ -39,6 +39,7 @@
UPDATE_RELIABLE_REFS_NOT_PAGED=UPDATE JMS_MESSAGE_REFERENCE SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNELID=?
SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JMS_MESSAGE_REFERENCE WHERE CHANNELID = ?
SELECT_EXISTS_REF=SELECT MESSAGEID FROM JMS_MESSAGE_REFERENCE WHERE CHANNELID = ? AND MESSAGEID = ?
+UPDATE_DELIVERYCOUNT=UPDATE JMS_MESSAGE_REFERENCE SET DELIVERYCOUNT = ? WHERE CHANNELID = ? AND MESSAGEID = ?
LOAD_MESSAGES=SELECT MESSAGEID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, COREHEADERS, PAYLOAD, CHANNELCOUNT, TYPE, JMSTYPE, CORRELATIONID, CORRELATIONID_BYTES, DESTINATION, REPLYTO, JMSPROPERTIES FROM JMS_MESSAGE
INSERT_MESSAGE=INSERT INTO JMS_MESSAGE (MESSAGEID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, COREHEADERS, PAYLOAD, CHANNELCOUNT, TYPE, JMSTYPE, CORRELATIONID, CORRELATIONID_BYTES, DESTINATION, REPLYTO, JMSPROPERTIES) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
INC_CHANNELCOUNT=UPDATE JMS_MESSAGE SET CHANNELCOUNT = CHANNELCOUNT + 1 WHERE MESSAGEID=?
Modified: trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2006-12-11 22:29:27 UTC (rev 1766)
+++ trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2006-12-12 02:16:50 UTC (rev 1767)
@@ -39,6 +39,7 @@
UPDATE_RELIABLE_REFS_NOT_PAGED=UPDATE JMS_MESSAGE_REFERENCE SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNELID=?
SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JMS_MESSAGE_REFERENCE WHERE CHANNELID = ?
SELECT_EXISTS_REF=SELECT MESSAGEID FROM JMS_MESSAGE_REFERENCE WHERE CHANNELID = ? AND MESSAGEID = ?
+ UPDATE_DELIVERYCOUNT=UPDATE JMS_MESSAGE_REFERENCE SET DELIVERYCOUNT = ? WHERE CHANNELID = ? AND MESSAGEID = ?
LOAD_MESSAGES=SELECT MESSAGEID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, COREHEADERS, PAYLOAD, CHANNELCOUNT, TYPE, JMSTYPE, CORRELATIONID, CORRELATIONID_BYTES, DESTINATION, REPLYTO, JMSPROPERTIES FROM JMS_MESSAGE
INSERT_MESSAGE=INSERT INTO JMS_MESSAGE (MESSAGEID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, COREHEADERS, PAYLOAD, CHANNELCOUNT, TYPE, JMSTYPE, CORRELATIONID, CORRELATIONID_BYTES, DESTINATION, REPLYTO, JMSPROPERTIES) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
INC_CHANNELCOUNT=UPDATE JMS_MESSAGE SET CHANNELCOUNT = CHANNELCOUNT + 1 WHERE MESSAGEID=?
Modified: trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java 2006-12-11 22:29:27 UTC (rev 1766)
+++ trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java 2006-12-12 02:16:50 UTC (rev 1767)
@@ -106,14 +106,16 @@
new String[] {"org.jboss.remoting.ConnectionListener"});
}
- //We use the MBean service name to uniquely identify the cf
+ // We use the MBean service name to uniquely identify the connection factory
connectionFactoryManager.
- registerConnectionFactory(this.getName(), clientID, jndiBindings, locatorURI, enablePing, prefetchSize,
- defaultTempQueueFullSize, defaultTempQueuePageSize, defaultTempQueueDownCacheSize,
- clustered);
+ registerConnectionFactory(this.getName(), clientID, jndiBindings, locatorURI,
+ enablePing, prefetchSize, defaultTempQueueFullSize,
+ defaultTempQueuePageSize, defaultTempQueueDownCacheSize,
+ clustered);
InvokerLocator locator = new InvokerLocator(locatorURI);
+
String info =
"Connector " + locator.getProtocol() + "://" + locator.getHost() + ":" + locator.getPort();
Modified: trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2006-12-11 22:29:27 UTC (rev 1766)
+++ trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2006-12-12 02:16:50 UTC (rev 1767)
@@ -109,9 +109,10 @@
boolean clustered)
throws Exception
{
- log.info("Registering connection factory with name " + uniqueName + " bindings " + jndiBindings);
+ log.info("Registering connection factory with name " + uniqueName + " " +
+ "bindings " + jndiBindings);
- //Sanity check
+ // Sanity check
if (delegates.containsKey(uniqueName))
{
throw new IllegalArgumentException("There's already a connection factory registered with name " + uniqueName);
Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java 2006-12-11 22:29:27 UTC (rev 1766)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java 2006-12-12 02:16:50 UTC (rev 1767)
@@ -170,9 +170,7 @@
throw new IllegalArgumentException("No such SQL statement: " + statementName);
}
- String statement = sqlProperties.getProperty(statementName, defaultStatement);
-
- return statement;
+ return sqlProperties.getProperty(statementName, defaultStatement);
}
protected Map getDefaultDMLStatements()
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2006-12-11 22:29:27 UTC (rev 1766)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2006-12-12 02:16:50 UTC (rev 1767)
@@ -63,6 +63,7 @@
import org.jboss.logging.Logger;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.transport.PortUtil;
import org.jboss.remoting.serialization.SerializationStreamFactory;
import org.jboss.resource.adapter.jdbc.local.LocalManagedConnectionFactory;
import org.jboss.resource.adapter.jdbc.remote.WrapperDataSourceService;
@@ -1175,9 +1176,7 @@
params += "&timeout=0";
}
-// int freePort = PortUtil.findFreePort(ipAddressOrHostName);
-
- int freePort = 9111;
+ int freePort = PortUtil.findFreePort(ipAddressOrHostName);
String locatorURI = transport + "://" + ipAddressOrHostName + ":" + freePort + params;
log.debug("Using locator uri: " + locatorURI);
More information about the jboss-cvs-commits
mailing list