JBoss hornetq SVN: r11460 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-09-30 16:42:55 -0400 (Fri, 30 Sep 2011)
New Revision: 11460
Added:
tags/HornetQ_2_2_8_EAP_CR2/
Log:
EAP 2.2.8.CR2 release
12 years, 7 months
JBoss hornetq SVN: r11459 - branches.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-09-30 16:41:58 -0400 (Fri, 30 Sep 2011)
New Revision: 11459
Removed:
branches/Branch_2_2_EAP_cluster_clean3/
Log:
removing temporary branch
12 years, 7 months
JBoss hornetq SVN: r11458 - in branches/Branch_2_2_EAP: hornetq-rest and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic
Date: 2011-09-30 16:38:04 -0400 (Fri, 30 Sep 2011)
New Revision: 11458
Modified:
branches/Branch_2_2_EAP/build-maven.xml
branches/Branch_2_2_EAP/hornetq-rest/pom.xml
Log:
release update
Modified: branches/Branch_2_2_EAP/build-maven.xml
===================================================================
--- branches/Branch_2_2_EAP/build-maven.xml 2011-09-30 20:35:40 UTC (rev 11457)
+++ branches/Branch_2_2_EAP/build-maven.xml 2011-09-30 20:38:04 UTC (rev 11458)
@@ -165,7 +165,7 @@
<exec executable="mvn" dir="./build">
<arg value="install:install-file"/>
<!-- uncomment the following line to deploy to the JBoss 5 repository -->
- <arg value="-Dmaven.repo.local=/work/eap-51/maven-repository"/>
+ <!-- <arg value="-Dmaven.repo.local=/work/eap-51/maven-repository"/> -->
<arg value="-DgroupId=org.hornetq"/>
<arg value="-DartifactId=${artifact.id}"/>
<arg value="-Dversion=${hornetq.version}"/>
Modified: branches/Branch_2_2_EAP/hornetq-rest/pom.xml
===================================================================
--- branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-09-30 20:35:40 UTC (rev 11457)
+++ branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-09-30 20:38:04 UTC (rev 11458)
@@ -10,7 +10,7 @@
<properties>
<resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.8.CR1</hornetq.version>
+ <hornetq.version>2.2.8.EAP.CR2</hornetq.version>
</properties>
<licenses>
12 years, 7 months
JBoss hornetq SVN: r11457 - branches/Branch_2_2_EAP/src/config/common.
by do-not-reply＠jboss.org
Author: clebert.suconic
Date: 2011-09-30 16:35:40 -0400 (Fri, 30 Sep 2011)
New Revision: 11457
Modified:
branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
Log:
upgrade version
Modified: branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
===================================================================
--- branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-09-30 20:30:59 UTC (rev 11456)
+++ branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-09-30 20:35:40 UTC (rev 11457)
@@ -3,7 +3,7 @@
hornetq.version.minorVersion=2
hornetq.version.microVersion=8
hornetq.version.incrementingVersion=122
-hornetq.version.versionSuffix=CR1
-hornetq.version.versionTag=CR1
+hornetq.version.versionSuffix=CR2
+hornetq.version.versionTag=CR2
hornetq.netty.version=(a)NETTY.VERSION@
hornetq.version.compatibleVersionList=121,122
12 years, 7 months
JBoss hornetq SVN: r11456 - branches.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-09-30 16:30:59 -0400 (Fri, 30 Sep 2011)
New Revision: 11456
Removed:
branches/Branch_2_2_EAP_cluster4/
Log:
removing temp branch
12 years, 7 months
JBoss hornetq SVN: r11455 - in branches/Branch_2_2_EAP: src/config/common and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic
Date: 2011-09-30 16:27:47 -0400 (Fri, 30 Sep 2011)
New Revision: 11455
Modified:
branches/Branch_2_2_EAP/build-maven.xml
branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
Log:
upgrade release
Modified: branches/Branch_2_2_EAP/build-maven.xml
===================================================================
--- branches/Branch_2_2_EAP/build-maven.xml 2011-09-30 19:45:11 UTC (rev 11454)
+++ branches/Branch_2_2_EAP/build-maven.xml 2011-09-30 20:27:47 UTC (rev 11455)
@@ -13,7 +13,7 @@
-->
<project default="upload" name="HornetQ">
- <property name="hornetq.version" value="2.2.8.CR1"/>
+ <property name="hornetq.version" value="2.2.8.EAP.CR2"/>
<property name="build.dir" value="build"/>
<property name="jars.dir" value="${build.dir}/jars"/>
@@ -165,7 +165,7 @@
<exec executable="mvn" dir="./build">
<arg value="install:install-file"/>
<!-- uncomment the following line to deploy to the JBoss 5 repository -->
- <!-- arg value="-Dmaven.repo.local=/work/eap/maven-repository"/ -->
+ <arg value="-Dmaven.repo.local=/work/eap-51/maven-repository"/>
<arg value="-DgroupId=org.hornetq"/>
<arg value="-DartifactId=${artifact.id}"/>
<arg value="-Dversion=${hornetq.version}"/>
Modified: branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
===================================================================
--- branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-09-30 19:45:11 UTC (rev 11454)
+++ branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-09-30 20:27:47 UTC (rev 11455)
@@ -1,4 +1,4 @@
-hornetq.version.versionName=HQ_2_2_8_EAP_CR1
+hornetq.version.versionName=HQ_2_2_8_EAP_CR2
hornetq.version.majorVersion=2
hornetq.version.minorVersion=2
hornetq.version.microVersion=8
12 years, 7 months
JBoss hornetq SVN: r11454 - in branches/Branch_2_2_EAP/src/main/org/hornetq: ra and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic
Date: 2011-09-30 15:45:11 -0400 (Fri, 30 Sep 2011)
New Revision: 11454
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
Log:
tight up DiscoveryGroup creationg on RA
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-09-30 17:23:18 UTC (rev 11453)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-09-30 19:45:11 UTC (rev 11454)
@@ -743,7 +743,7 @@
if (System.currentTimeMillis() > timeout && !receivedTopology && !closed && !closing)
{
throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT,
- "Timed out waiting to receive cluster topology");
+ "Timed out waiting to receive cluster topology. Group:" + discoveryGroup);
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-09-30 17:23:18 UTC (rev 11453)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-09-30 19:45:11 UTC (rev 11454)
@@ -1431,6 +1431,52 @@
ha = HornetQClient.DEFAULT_IS_HA;
}
+ if (discoveryAddress != null)
+ {
+ Integer discoveryPort = overrideProperties.getDiscoveryPort() != null ? overrideProperties.getDiscoveryPort()
+ : getDiscoveryPort();
+
+ if(discoveryPort == null)
+ {
+ discoveryPort = HornetQClient.DEFAULT_DISCOVERY_PORT;
+ }
+
+ DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration(discoveryAddress, discoveryPort);
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("Creating Connection Factory on the resource adapter for discovery=" + groupConfiguration + " with ha=" + ha);
+ }
+
+ Long refreshTimeout = overrideProperties.getDiscoveryRefreshTimeout() != null ? overrideProperties.getDiscoveryRefreshTimeout()
+ : raProperties.getDiscoveryRefreshTimeout();
+ if (refreshTimeout == null)
+ {
+ refreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT;
+ }
+
+ Long initialTimeout = overrideProperties.getDiscoveryInitialWaitTimeout() != null ? overrideProperties.getDiscoveryInitialWaitTimeout()
+ : raProperties.getDiscoveryInitialWaitTimeout();
+
+ if(initialTimeout == null)
+ {
+ initialTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT;
+ }
+
+ groupConfiguration.setDiscoveryInitialWaitTimeout(initialTimeout);
+
+ groupConfiguration.setRefreshTimeout(refreshTimeout);
+
+ if (ha)
+ {
+ cf = HornetQJMSClient.createConnectionFactoryWithHA(groupConfiguration, JMSFactoryType.XA_CF);
+ }
+ else
+ {
+ cf = HornetQJMSClient.createConnectionFactoryWithoutHA(groupConfiguration, JMSFactoryType.XA_CF);
+ }
+ }
+ else
if (connectorClassName != null)
{
TransportConfiguration[] transportConfigurations = new TransportConfiguration[connectorClassName.size()];
@@ -1461,53 +1507,19 @@
transportConfigurations[i] = tc;
}
- if (ha)
- {
- cf = HornetQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.XA_CF, transportConfigurations);
- }
- else
- {
- cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, transportConfigurations);
- }
- }
- else if (discoveryAddress != null)
- {
- Integer discoveryPort = overrideProperties.getDiscoveryPort() != null ? overrideProperties.getDiscoveryPort()
- : getDiscoveryPort();
- if(discoveryPort == null)
+ if (log.isDebugEnabled())
{
- discoveryPort = HornetQClient.DEFAULT_DISCOVERY_PORT;
+ log.debug("Creating Connection Factory on the resource adapter for transport=" + transportConfigurations + " with ha=" + ha);
}
-
- DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration(discoveryAddress, discoveryPort);
-
- Long refreshTimeout = overrideProperties.getDiscoveryRefreshTimeout() != null ? overrideProperties.getDiscoveryRefreshTimeout()
- : raProperties.getDiscoveryRefreshTimeout();
- if (refreshTimeout == null)
- {
- refreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT;
- }
-
- Long initialTimeout = overrideProperties.getDiscoveryInitialWaitTimeout() != null ? overrideProperties.getDiscoveryInitialWaitTimeout()
- : raProperties.getDiscoveryInitialWaitTimeout();
-
- if(initialTimeout == null)
- {
- initialTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT;
- }
-
- groupConfiguration.setDiscoveryInitialWaitTimeout(initialTimeout);
-
- groupConfiguration.setRefreshTimeout(refreshTimeout);
-
+
if (ha)
{
- cf = HornetQJMSClient.createConnectionFactoryWithHA(groupConfiguration, JMSFactoryType.XA_CF);
+ cf = HornetQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.XA_CF, transportConfigurations);
}
else
{
- cf = HornetQJMSClient.createConnectionFactoryWithoutHA(groupConfiguration, JMSFactoryType.XA_CF);
+ cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, transportConfigurations);
}
}
else
12 years, 7 months
JBoss hornetq SVN: r11453 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/security/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-09-30 13:23:18 -0400 (Fri, 30 Sep 2011)
New Revision: 11453
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java
Log:
JBPAPP-7256 & SOA-3363 - invalidate security cache independently of the activity as JAAS won't set any callback when data is changed. We just have to invalidate it every X (configurable) milliseconds
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java 2011-09-30 12:51:08 UTC (rev 11452)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java 2011-09-30 17:23:18 UTC (rev 11453)
@@ -235,6 +235,8 @@
if (now - lastCheck > invalidationInterval)
{
invalidateCache();
+
+ lastCheck = now;
}
else
{
@@ -245,8 +247,6 @@
}
}
- lastCheck = now;
-
return granted;
}
12 years, 7 months
JBoss hornetq SVN: r11452 - in branches/HORNETQ-720_Replication: tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-09-30 08:51:08 -0400 (Fri, 30 Sep 2011)
New Revision: 11452
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicatedJournal.java
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java
Log:
HORNETQ-720 Add Journal methods missing from previous commit.
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicatedJournal.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicatedJournal.java 2011-09-30 11:49:44 UTC (rev 11451)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicatedJournal.java 2011-09-30 12:51:08 UTC (rev 11452)
@@ -634,6 +634,12 @@
throw new UnsupportedOperationException();
}
+ @Override
+ public int getFileSize()
+ {
+ return localJournal.getFileSize();
+ }
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java 2011-09-30 11:49:44 UTC (rev 11451)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java 2011-09-30 12:51:08 UTC (rev 11452)
@@ -908,5 +908,11 @@
return null;
}
+ @Override
+ public int getFileSize()
+ {
+ return 0;
+ }
+
}
}
12 years, 7 months
JBoss hornetq SVN: r11451 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-09-30 07:49:44 -0400 (Fri, 30 Sep 2011)
New Revision: 11451
Modified:
trunk/README
Log:
Update the README file.
Modified: trunk/README
===================================================================
--- trunk/README 2011-09-30 09:08:42 UTC (rev 11450)
+++ trunk/README 2011-09-30 11:49:44 UTC (rev 11451)
@@ -15,7 +15,7 @@
You need Maven 3.X.
Do note that there are some compatibility issues with Maven 3.X still
-unsolved [1]. This is specially true for the 'site' plugin [2].
+unsolved [1]. This is specially true for the 'site' plugin [2].
[1]: <https://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html>
[2]: <https://cwiki.apache.org/MAVEN/maven-3x-and-site-plugin.html>
@@ -37,13 +37,11 @@
* Eclipse
-** Use the Maven eclipse plugin to configure the sub-projects
+Maven support has been improved a lot in Eclipse 3.7 "Indigo", you
+really should use it. There are still some Maven plugins used by
+documentation sub-projects which are not supported even in Eclipse 3.7.
-$ mvn eclipse:eclipse
-
-** Install the m2Eclipse plugin, and use it to import the root
- project. Each sub-project will be imported automatically.
-
The M2Eclipse plugin only works correctly with javacc Maven rules in
-Eclipse 3.7. In Eclipse 3.6 after importing the projects you should use
-"Maven / Update project configuration" to fix up the projects.
+Eclipse 3.7. So in Eclipse 3.6 you need install M2Eclipse yourself, and
+after importing the projects you should use "Maven / Update project
+configuration" to fix up the projects.
12 years, 7 months