[jboss-cvs] JBossAS SVN: r104040 - in trunk: component-matrix and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 16 03:11:54 EDT 2010
Author: clebert.suconic at jboss.com
Date: 2010-04-16 03:11:52 -0400 (Fri, 16 Apr 2010)
New Revision: 104040
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/depchain/pom.xml
trunk/hornetq-int/src/resources/config/clustered/hornetq-configuration.xml
trunk/hornetq-int/src/resources/config/non-clustered/hornetq-configuration.xml
trunk/testsuite/build.xml
trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java
trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq/hornetq-configuration.xml
trunk/webservices/pom.xml
Log:
Upgrading HornetQ to Beta2
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/build/build.xml 2010-04-16 07:11:52 UTC (rev 104040)
@@ -2059,7 +2059,6 @@
<fileset refid="org.hornetq:hornetq-bootstrap:jar"/>
<fileset refid="org.hornetq:hornetq-core:jar"/>
<fileset refid="org.hornetq:hornetq-logging:jar"/>
- <fileset refid="org.hornetq:hornetq-transports:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
<fileset refid="org.hornetq:hornetq-jms:jar"/>
<mapper refid="remove-versions" />
@@ -2273,7 +2272,6 @@
<fileset refid="org.jboss.weld:weld-api:jar"/>
<fileset refid="org.hornetq:hornetq-core-client:jar"/>
<fileset refid="org.hornetq:hornetq-jms-client:jar"/>
- <fileset refid="org.hornetq:hornetq-transports:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
<mapper refid="remove-versions" />
</copy>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/component-matrix/pom.xml 2010-04-16 07:11:52 UTC (rev 104040)
@@ -37,7 +37,7 @@
<version.beanvalidation.integration>1.0.0-Beta-1</version.beanvalidation.integration>
<version.commons.beanutils>1.8.0</version.commons.beanutils>
<version.fastinfoset>1.2.2</version.fastinfoset>
- <version.hornetq>2.1.0.BETA1</version.hornetq>
+ <version.hornetq>2.1.0.BETA2</version.hornetq>
<version.rhq>1.4.0.B01</version.rhq>
<version.inject.api>1</version.inject.api>
<version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
@@ -609,12 +609,6 @@
</dependency>
<dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-transports</artifactId>
- <version>${version.hornetq}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-current-invocation-aspects</artifactId>
<version>${version.org.jboss.aspects.currentinvocation}</version>
Modified: trunk/depchain/pom.xml
===================================================================
--- trunk/depchain/pom.xml 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/depchain/pom.xml 2010-04-16 07:11:52 UTC (rev 104040)
@@ -381,10 +381,6 @@
<groupId>org.hornetq</groupId>
<artifactId>hornetq-resources</artifactId>
</dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-transports</artifactId>
- </dependency>
<dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
Modified: trunk/hornetq-int/src/resources/config/clustered/hornetq-configuration.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/clustered/hornetq-configuration.xml 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/hornetq-int/src/resources/config/clustered/hornetq-configuration.xml 2010-04-16 07:11:52 UTC (rev 104040)
@@ -18,13 +18,13 @@
<connectors>
<connector name="netty">
- <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
- <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
@@ -32,19 +32,20 @@
<connector name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ <param key="server-id" value="${hornetq.server-id:0}"/>
</connector>
</connectors>
<acceptors>
<acceptor name="netty">
- <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
- <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
@@ -83,8 +84,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/hornetq-int/src/resources/config/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/non-clustered/hornetq-configuration.xml 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/hornetq-int/src/resources/config/non-clustered/hornetq-configuration.xml 2010-04-16 07:11:52 UTC (rev 104040)
@@ -16,13 +16,13 @@
<connectors>
<connector name="netty">
- <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
- <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
@@ -30,19 +30,20 @@
<connector name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ <param key="server-id" value="${hornetq.server-id:0}"/>
</connector>
</connectors>
<acceptors>
<acceptor name="netty">
- <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
- <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
@@ -57,8 +58,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/testsuite/build.xml 2010-04-16 07:11:52 UTC (rev 104040)
@@ -313,7 +313,6 @@
<fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
<fileset refid="org.hornetq:hornetq-core-client:jar"/>
<fileset refid="org.hornetq:hornetq-jms-client:jar"/>
- <fileset refid="org.hornetq:hornetq-transports:jar"/>
<fileset refid="org.jboss.netty:netty:jar"/>
<!-- needed for proxy tests -->
<fileset refid="bcel:bcel:jar"/>
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java 2010-04-16 07:11:52 UTC (rev 104040)
@@ -248,7 +248,7 @@
for (Iterator i = state.errors.iterator(); i.hasNext();)
getLog().error("Error", (Throwable) i.next());
if (state.errors.size() > 0)
- throw new RuntimeException("Test failed with " + state.errors.size() + " errors");
+ throw new RuntimeException("Test failed with " + state.errors.size() + " errors",(Throwable) state.errors.get(0));
}
public void testSendReplyTopic() throws Exception
@@ -323,11 +323,11 @@
QueueReceiver receiver = session.createReceiver(queue);
queueConnection.start();
- Message message = receiver.receive(50);
+ Message message = receiver.receiveNoWait();
int c = 0;
while (message != null)
{
- message = receiver.receive(50);
+ message = receiver.receiveNoWait();
c++;
}
Modified: trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2010-04-16 07:11:52 UTC (rev 104040)
@@ -260,6 +260,7 @@
protected void deployDestinations() throws Exception
{
+ JMSDestinationsUtil.destroyEveryDestination();
JMSDestinationsUtil.setupBasicDestinations();
}
@@ -400,8 +401,12 @@
String clientID = props.getProperty("clientID");
+ log.info("ClientID = " + clientID + " on tidyUP");
+
if (user != null)
{
+
+ log.info("Getting connection with clientID");
String password = props.getProperty("password");
getConnection(user, password, clientID);
}
Modified: trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq/hornetq-configuration.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq/hornetq-configuration.xml 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq/hornetq-configuration.xml 2010-04-16 07:11:52 UTC (rev 104040)
@@ -16,13 +16,13 @@
<connectors>
<connector name="netty">
- <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
- <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
@@ -36,20 +36,20 @@
<acceptors>
<acceptor name="netty">
- <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
- <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
</acceptor>
<acceptor name="in-vm">
- <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
<param key="server-id" value="0"/>
</acceptor>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-04-16 06:39:02 UTC (rev 104039)
+++ trunk/webservices/pom.xml 2010-04-16 07:11:52 UTC (rev 104040)
@@ -242,10 +242,6 @@
<!-- transitive dependencies -->
<dependency>
<groupId>org.hornetq</groupId>
- <artifactId>hornetq-transports</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
<artifactId>hornetq-jms-client</artifactId>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list