tag:www.nabble.com,2006:forum-23834
Nabble - ActiveMQ - Commits
2008-11-21T16:36:44Z
<a href="http://activemq.apache.org/" target="_top" rel="nofollow">Apache ActiveMQ</a> is the most popular and powerful open source Message Broker. Apache ActiveMQ is fast, supports many <a href="http://activemq.apache.org/cross-language-clients.html" target="_top" rel="nofollow">Cross Language Clients and Protocols</a> and many <a href="http://activemq.apache.org/features.html" target="_top" rel="nofollow">advanced features<a target="_top"> while fully supporting JMS 1.1 and J2EE 1.4. Apache ActiveMQ is released under the Apache 2.0 License.
tag:www.nabble.com,2006:post-20631926
svn commit: r719763 - in /activemq/trunk: activemq-all/pom.xml assembly/pom.xml assembly/src/main/descriptors/common-bin.xml assembly/src/release/conf/ha-broker.xml assembly/src/release/conf/ha.xml kahadb/pom.xml pom.xml
2008-11-21T16:36:44Z
2008-11-21T16:36:44Z
chirino
Author: chirino
<br>Date: Fri Nov 21 16:36:43 2008
<br>New Revision: 719763
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=719763&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=719763&view=rev</a><br>Log:
<br>Updated assembly so that kahadb is included and also added an example HA configuration which uses it.
<br><br>Added:
<br> activemq/trunk/assembly/src/release/conf/ha-broker.xml
<br> activemq/trunk/assembly/src/release/conf/ha.xml
<br>Modified:
<br> activemq/trunk/activemq-all/pom.xml
<br> activemq/trunk/assembly/pom.xml
<br> activemq/trunk/assembly/src/main/descriptors/common-bin.xml
<br> activemq/trunk/kahadb/pom.xml
<br> activemq/trunk/pom.xml
<br><br>Modified: activemq/trunk/activemq-all/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/trunk/activemq-all/pom.xml?rev=719763&r1=719762&r2=719763&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/trunk/activemq-all/pom.xml?rev=719763&r1=719762&r2=719763&view=diff</a><br>==============================================================================
<br>--- activemq/trunk/activemq-all/pom.xml (original)
<br>+++ activemq/trunk/activemq-all/pom.xml Fri Nov 21 16:36:43 2008
<br>@@ -49,6 +49,10 @@
<br> <groupId>${pom.groupId}</groupId>
<br> <artifactId>activemq-jpa-store</artifactId>
<br> </dependency>
<br>+ <dependency>
<br>+ <groupId>${pom.groupId}</groupId>
<br>+ <artifactId>kahadb</artifactId>
<br>+ </dependency>
<br> </dependencies>
<br>
<br> <build>
<br>@@ -75,6 +79,8 @@
<br> <include>${project.groupId}:activemq-jaas</include>
<br> <include>${project.groupId}:activemq-optional</include>
<br> <include>${project.groupId}:activemq-jpa-store</include>
<br>+ <include>${project.groupId}:kahadb</include>
<br>+ <include>org.apache.activemq.protobuf:activemq-protobuf</include>
<br> <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<br> <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
<br> <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
<br><br>Modified: activemq/trunk/assembly/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=719763&r1=719762&r2=719763&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=719763&r1=719762&r2=719763&view=diff</a><br>==============================================================================
<br>--- activemq/trunk/assembly/pom.xml (original)
<br>+++ activemq/trunk/assembly/pom.xml Fri Nov 21 16:36:43 2008
<br>@@ -86,6 +86,10 @@
<br> <groupId>${pom.groupId}</groupId>
<br> <artifactId>activemq-run</artifactId>
<br> </dependency>
<br>+ <dependency>
<br>+ <groupId>${pom.groupId}</groupId>
<br>+ <artifactId>kahadb</artifactId>
<br>+ </dependency>
<br>
<br> <!-- camel -->
<br> <dependency>
<br>@@ -236,7 +240,12 @@
<br> <artifactId>derbynet</artifactId>
<br> <optional>true</optional>
<br> </dependency>
<br>-
<br>+ <dependency>
<br>+ <groupId>org.apache.hadoop.zookeeper</groupId>
<br>+ <artifactId>zookeeper</artifactId>
<br>+ <optional>true</optional>
<br>+ </dependency>
<br>+
<br> <!-- copied dependencies from activemq-web-console -->
<br> <!-- enable commons-logging when inside jetty6:run -->
<br> <dependency>
<br><br>Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=719763&r1=719762&r2=719763&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=719763&r1=719762&r2=719763&view=diff</a><br>==============================================================================
<br>--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
<br>+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Fri Nov 21 16:36:43 2008
<br>@@ -102,6 +102,8 @@
<br> <include>${pom.groupId}:activemq-core</include>
<br> <include>${pom.groupId}:activemq-console</include>
<br> <include>${pom.groupId}:activemq-jaas</include>
<br>+ <include>${pom.groupId}:kahadb</include>
<br>+ <include>org.apache.activemq.protobuf:activemq-protobuf</include>
<br> <include>mx4j:mx4j</include>
<br> <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
<br> <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<br>@@ -155,6 +157,7 @@
<br> <include>org.springframework:spring-jms</include>
<br> <include>com.thoughtworks.xstream:xstream</include>
<br> <include>xmlpull:xmlpull</include>
<br>+ <include>org.apache.hadoop.zookeeper:zookeeper</include>
<br> </includes>
<br> </dependencySet>
<br> <dependencySet>
<br><br>Added: activemq/trunk/assembly/src/release/conf/ha-broker.xml
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/ha-broker.xml?rev=719763&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/ha-broker.xml?rev=719763&view=auto</a><br>==============================================================================
<br>--- activemq/trunk/assembly/src/release/conf/ha-broker.xml (added)
<br>+++ activemq/trunk/assembly/src/release/conf/ha-broker.xml Fri Nov 21 16:36:43 2008
<br>@@ -0,0 +1,153 @@
<br>+<!--
<br>+ Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ contributor license agreements. See the NOTICE file distributed with
<br>+ this work for additional information regarding copyright ownership.
<br>+ The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ (the "License"); you may not use this file except in compliance with
<br>+ the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+ Unless required by applicable law or agreed to in writing, software
<br>+ distributed under the License is distributed on an "AS IS" BASIS,
<br>+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ See the License for the specific language governing permissions and
<br>+ limitations under the License.
<br>+-->
<br>+<!-- START SNIPPET: example -->
<br>+<beans
<br>+ xmlns="<a href="http://www.springframework.org/schema/beans" target="_top" rel="nofollow">http://www.springframework.org/schema/beans</a>"
<br>+ xmlns:amq="<a href="http://activemq.apache.org/schema/core" target="_top" rel="nofollow">http://activemq.apache.org/schema/core</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://www.springframework.org/schema/beans" target="_top" rel="nofollow">http://www.springframework.org/schema/beans</a> <a href="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" target="_top" rel="nofollow">http://www.springframework.org/schema/beans/spring-beans-2.0.xsd</a><br>+ <a href="http://activemq.apache.org/schema/core" target="_top" rel="nofollow">http://activemq.apache.org/schema/core</a> <a href="http://activemq.apache.org/schema/core/activemq-core.xsd" target="_top" rel="nofollow">http://activemq.apache.org/schema/core/activemq-core.xsd</a>
<br>+ <a href="http://activemq.apache.org/camel/schema/spring" target="_top" rel="nofollow">http://activemq.apache.org/camel/schema/spring</a> <a href="http://activemq.apache.org/camel/schema/spring/camel-spring.xsd" target="_top" rel="nofollow">http://activemq.apache.org/camel/schema/spring/camel-spring.xsd</a>">
<br>+
<br>+ <!-- Allows us to use system properties as variables in this configuration file -->
<br>+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<br>+ <property name="locations">
<br>+ <value>file:///${activemq.base}/conf/credentials.properties</value>
<br>+ </property>
<br>+ </bean>
<br>+
<br>+ <broker xmlns="<a href="http://activemq.apache.org/schema/core" target="_top" rel="nofollow">http://activemq.apache.org/schema/core</a>"
<br>+ start="false"
<br>+ brokerName="localhost" dataDirectory="${activemq.base}/data">
<br>+
<br>+ <!-- Destination specific policies using destination names or wildcards -->
<br>+ <destinationPolicy>
<br>+ <policyMap>
<br>+ <policyEntries>
<br>+ <policyEntry queue=">" memoryLimit="5mb"/>
<br>+ <policyEntry topic=">" memoryLimit="5mb">
<br>+ <!-- you can add other policies too such as these
<br>+ <dispatchPolicy>
<br>+ <strictOrderDispatchPolicy/>
<br>+ </dispatchPolicy>
<br>+ <subscriptionRecoveryPolicy>
<br>+ <lastImageSubscriptionRecoveryPolicy/>
<br>+ </subscriptionRecoveryPolicy>
<br>+ -->
<br>+ </policyEntry>
<br>+ </policyEntries>
<br>+ </policyMap>
<br>+ </destinationPolicy>
<br>+
<br>+ <!-- Use the following to configure how ActiveMQ is exposed in JMX -->
<br>+ <managementContext>
<br>+ <managementContext createConnector="false"/>
<br>+ </managementContext>
<br>+
<br>+ <!-- The store and forward broker networks ActiveMQ will listen to -->
<br>+ <networkConnectors>
<br>+ <!-- by default just auto discover the other brokers -->
<br>+ <networkConnector name="default-nc" uri="multicast://default"/>
<br>+ <!-- Example of a static configuration:
<br>+ <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
<br>+ -->
<br>+ </networkConnectors>
<br>+
<br>+ <sslContext>
<br>+ <sslContext keyStore="file:${activemq.base}/conf/broker.ks" keyStorePassword="password" trustStore="file:${activemq.base}/conf/broker.ts" trustStorePassword="password"/>
<br>+ </sslContext>
<br>+
<br>+ <!-- The maximum about of space the broker will use before slowing down producers -->
<br>+ <systemUsage>
<br>+ <systemUsage>
<br>+ <memoryUsage>
<br>+ <memoryUsage limit="20 mb"/>
<br>+ </memoryUsage>
<br>+ <storeUsage>
<br>+ <storeUsage limit="1 gb" name="foo"/>
<br>+ </storeUsage>
<br>+ <tempUsage>
<br>+ <tempUsage limit="100 mb"/>
<br>+ </tempUsage>
<br>+ </systemUsage>
<br>+ </systemUsage>
<br>+
<br>+ <!-- The transport connectors ActiveMQ will listen to -->
<br>+ <transportConnectors>
<br>+ <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
<br>+ <transportConnector name="ssl" uri="ssl://localhost:61617"/>
<br>+ <transportConnector name="stomp" uri="stomp://localhost:61613"/>
<br>+ <transportConnector name="xmpp" uri="xmpp://localhost:61222"/>
<br>+ </transportConnectors>
<br>+
<br>+ </broker>
<br>+
<br>+ <!--
<br>+ ** Lets deploy some Enterprise Integration Patterns inside the ActiveMQ Message Broker
<br>+ ** For more details see
<br>+ **
<br>+ ** <a href="http://activemq.apache.org/enterprise-integration-patterns.html" target="_top" rel="nofollow">http://activemq.apache.org/enterprise-integration-patterns.html</a><br>+ -->
<br>+ <camelContext id="camel" xmlns="<a href="http://activemq.apache.org/camel/schema/spring" target="_top" rel="nofollow">http://activemq.apache.org/camel/schema/spring</a>">
<br>+
<br>+ <!-- You can use a <package> element for each root package to search for Java routes -->
<br>+ <package>org.foo.bar</package>
<br>+
<br>+ <!-- You can use Spring XML syntax to define the routes here using the <route> element -->
<br>+ <route>
<br>+ <from uri="activemq:example.A"/>
<br>+ <to uri="activemq:example.B"/>
<br>+ </route>
<br>+ </camelContext>
<br>+
<br>+ <!--
<br>+ ** Lets configure some Camel endpoints
<br>+ **
<br>+ ** <a href="http://activemq.apache.org/camel/components.html" target="_top" rel="nofollow">http://activemq.apache.org/camel/components.html</a><br>+ -->
<br>+
<br>+ <!-- configure the camel activemq component to use the current broker -->
<br>+ <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent" >
<br>+ <property name="connectionFactory">
<br>+ <bean class="org.apache.activemq.ActiveMQConnectionFactory">
<br>+ <property name="brokerURL" value="vm://localhost?create=false&waitForStart=10000" />
<br>+ <property name="userName" value="${activemq.username}"/>
<br>+ <property name="password" value="${activemq.password}"/>
<br>+ </bean>
<br>+ </property>
<br>+ </bean>
<br>+
<br>+ <!-- Uncomment to create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
<br>+ <!--
<br>+ <commandAgent xmlns="<a href="http://activemq.apache.org/schema/core" target="_top" rel="nofollow">http://activemq.apache.org/schema/core</a>" brokerUrl="vm://localhost" username="${activemq.username}" password="${activemq.password}"/>
<br>+ -->
<br>+
<br>+ <!-- An embedded servlet engine for serving up the Admin console -->
<br>+ <jetty xmlns="<a href="http://mortbay.com/schemas/jetty/1.0" target="_top" rel="nofollow">http://mortbay.com/schemas/jetty/1.0</a>">
<br>+ <connectors>
<br>+ <nioConnector port="8161"/>
<br>+ </connectors>
<br>+
<br>+ <handlers>
<br>+ <webAppContext contextPath="/admin" resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true"/>
<br>+ <webAppContext contextPath="/demo" resourceBase="${activemq.base}/webapps/demo" logUrlOnStart="true"/>
<br>+ <webAppContext contextPath="/fileserver" resourceBase="${activemq.base}/webapps/fileserver" logUrlOnStart="true"/>
<br>+ </handlers>
<br>+ </jetty>
<br>+
<br>+</beans>
<br>+<!-- END SNIPPET: example -->
<br><br>Added: activemq/trunk/assembly/src/release/conf/ha.xml
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/ha.xml?rev=719763&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/ha.xml?rev=719763&view=auto</a><br>==============================================================================
<br>--- activemq/trunk/assembly/src/release/conf/ha.xml (added)
<br>+++ activemq/trunk/assembly/src/release/conf/ha.xml Fri Nov 21 16:36:43 2008
<br>@@ -0,0 +1,52 @@
<br>+<!--
<br>+ Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ contributor license agreements. See the NOTICE file distributed with
<br>+ this work for additional information regarding copyright ownership.
<br>+ The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ (the "License"); you may not use this file except in compliance with
<br>+ the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+ Unless required by applicable law or agreed to in writing, software
<br>+ distributed under the License is distributed on an "AS IS" BASIS,
<br>+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ See the License for the specific language governing permissions and
<br>+ limitations under the License.
<br>+-->
<br>+<!-- START SNIPPET: example -->
<br>+<beans
<br>+ xmlns="<a href="http://www.springframework.org/schema/beans" target="_top" rel="nofollow">http://www.springframework.org/schema/beans</a>"
<br>+ xmlns:amq="<a href="http://activemq.apache.org/schema/core" target="_top" rel="nofollow">http://activemq.apache.org/schema/core</a>"
<br>+ xmlns:kdb="<a href="http://activemq.apache.org/schema/kahadb" target="_top" rel="nofollow">http://activemq.apache.org/schema/kahadb</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://www.springframework.org/schema/beans" target="_top" rel="nofollow">http://www.springframework.org/schema/beans</a> <a href="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" target="_top" rel="nofollow">http://www.springframework.org/schema/beans/spring-beans-2.0.xsd</a><br>+ <a href="http://activ" target="_top" rel="nofollow">http://activ</a> emq.apache.org/schema/core <a href="http://activemq.apache.org/schema/core/activemq-core.xsd" target="_top" rel="nofollow">http://activemq.apache.org/schema/core/activemq-core.xsd</a>
<br>+ <a href="http://activemq.apache.org/camel/schema/spring" target="_top" rel="nofollow">http://activemq.apache.org/camel/schema/spring</a> <a href="http://activemq.apache.org/camel/schema/spring/camel-spring.xsd" target="_top" rel="nofollow">http://activemq.apache.org/camel/schema/spring/camel-spring.xsd</a><br>+ <a href="http://activemq.apache.org/schema/kahadb" target="_top" rel="nofollow">http://activemq.apache.org/schema/kahadb</a> <a href="http://activemq.apache.org/schema/kahadb/kahadb.xsd" target="_top" rel="nofollow">http://activemq.apache.org/schema/kahadb/kahadb.xsd</a>">
<br>+
<br>+
<br>+ <!-- Allows us to use system properties as variables in this configuration file -->
<br>+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<br>+ <property name="locations">
<br>+ <value>file:///${activemq.base}/conf/credentials.properties</value>
<br>+ </property>
<br>+ </bean>
<br>+
<br>+ <kahadb-replication-broker xmlns="<a href="http://activemq.apache.org/schema/kahadb" target="_top" rel="nofollow">http://activemq.apache.org/schema/kahadb</a>">
<br>+ <replicationService>
<br>+ <kahadb-replication
<br>+ directory="${activemq.base}/data/kahadb"
<br>+ brokerURI="xbean:ha-broker.xml"
<br>+ uri="kdbr://localhost:60001">
<br>+
<br>+ <cluster>
<br>+ <zookeeper-cluster uri="zk://localhost:2181/activemq/default-ha-group" userid="activemq" password=""/>
<br>+ </cluster>
<br>+
<br>+ </kahadb-replication>
<br>+ </replicationService>
<br>+ </kahadb-replication-broker>
<br>+
<br>+</beans>
<br>+<!-- END SNIPPET: example -->
<br><br>Modified: activemq/trunk/kahadb/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/trunk/kahadb/pom.xml?rev=719763&r1=719762&r2=719763&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/trunk/kahadb/pom.xml?rev=719763&r1=719762&r2=719763&view=diff</a><br>==============================================================================
<br>--- activemq/trunk/kahadb/pom.xml (original)
<br>+++ activemq/trunk/kahadb/pom.xml Fri Nov 21 16:36:43 2008
<br>@@ -20,14 +20,13 @@
<br> <parent>
<br> <groupId>org.apache.activemq</groupId>
<br> <artifactId>activemq-parent</artifactId>
<br>- <version>5.1.0</version>
<br>+ <version>5.3-SNAPSHOT</version>
<br> </parent>
<br>
<br> <modelVersion>4.0.0</modelVersion>
<br>
<br> <groupId>org.apache.activemq</groupId>
<br> <artifactId>kahadb</artifactId>
<br>- <version>1.0-SNAPSHOT</version>
<br>
<br> <dependencies>
<br> <dependency>
<br>@@ -63,55 +62,46 @@
<br> <dependency>
<br> <groupId>org.apache.activemq.protobuf</groupId>
<br> <artifactId>activemq-protobuf</artifactId>
<br>- <version>1.0-SNAPSHOT</version>
<br> </dependency>
<br> <dependency>
<br> <groupId>org.apache.activemq</groupId>
<br> <artifactId>activemq-core</artifactId>
<br>- <version>5.3-SNAPSHOT</version>
<br> </dependency>
<br> <dependency>
<br> <groupId>org.apache.xbean</groupId>
<br> <artifactId>xbean-spring</artifactId>
<br> <optional>true</optional>
<br>- <version>3.3</version>
<br> </dependency>
<br> <dependency>
<br> <groupId>org.springframework</groupId>
<br> <artifactId>spring-core</artifactId>
<br>- <version>2.5.5</version>
<br> <optional>true</optional>
<br> </dependency>
<br> <dependency>
<br> <groupId>org.springframework</groupId>
<br> <artifactId>spring-beans</artifactId>
<br>- <version>2.5.5</version>
<br> <optional>true</optional>
<br> </dependency>
<br> <dependency>
<br> <groupId>org.springframework</groupId>
<br> <artifactId>spring-context</artifactId>
<br>- <version>2.5.5</version>
<br> <optional>true</optional>
<br> </dependency>
<br> <dependency>
<br> <groupId>org.apache.hadoop.zookeeper</groupId>
<br> <artifactId>zookeeper</artifactId>
<br>- <version>3.0.0</version>
<br> <optional>true</optional>
<br> </dependency>
<br>
<br> <dependency>
<br> <groupId>org.apache.activemq</groupId>
<br> <artifactId>activemq-core</artifactId>
<br>- <version>5.3-SNAPSHOT</version>
<br> <type>test-jar</type>
<br> <scope>test</scope>
<br> </dependency>
<br> <dependency>
<br> <groupId>junit</groupId>
<br> <artifactId>junit</artifactId>
<br>- <version>3.8.1</version>
<br> <scope>test</scope>
<br> </dependency>
<br>
<br>@@ -125,17 +115,6 @@
<br> </repository>
<br> </repositories>
<br>
<br>- <pluginRepositories>
<br>- <pluginRepository>
<br>- <id>apache.snapshots</id>
<br>- <name>Apache Development Snapshot Repository</name>
<br>- <url><a href="http://people.apache.org/repo/m2-snapshot-repository" target="_top" rel="nofollow">http://people.apache.org/repo/m2-snapshot-repository</a></url>
<br>- <releases>
<br>- <enabled>false</enabled>
<br>- </releases>
<br>- </pluginRepository>
<br>- </pluginRepositories>
<br>-
<br> <build>
<br> <plugins>
<br> <plugin>
<br>@@ -164,7 +143,6 @@
<br> <plugin>
<br> <groupId>org.apache.activemq.protobuf</groupId>
<br> <artifactId>activemq-protobuf</artifactId>
<br>- <version>1.0-SNAPSHOT</version>
<br> <executions>
<br> <execution>
<br> <goals>
<br><br>Modified: activemq/trunk/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=719763&r1=719762&r2=719763&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=719763&r1=719762&r2=719763&view=diff</a><br>==============================================================================
<br>--- activemq/trunk/pom.xml (original)
<br>+++ activemq/trunk/pom.xml Fri Nov 21 16:36:43 2008
<br>@@ -139,6 +139,7 @@
<br> <module>activemq-xmpp</module>
<br> <module>assembly</module>
<br> <module>activemq-jmdns_1.0</module>
<br>+ <module>kahadb</module>
<br> </modules>
<br>
<br> <scm>
<br>@@ -276,6 +277,16 @@
<br> <artifactId>activemq-openwire-generator</artifactId>
<br> <version>${activemq-version}</version>
<br> </dependency>
<br>+ <dependency>
<br>+ <groupId>org.apache.activemq</groupId>
<br>+ <artifactId>kahadb</artifactId>
<br>+ <version>${activemq-version}</version>
<br>+ </dependency>
<br>+ <dependency>
<br>+ <groupId>org.apache.activemq.protobuf</groupId>
<br>+ <artifactId>activemq-protobuf</artifactId>
<br>+ <version>1.0-SNAPSHOT</version>
<br>+ </dependency>
<br>
<br> <!-- =============================== -->
<br> <!-- Required dependencies -->
<br>@@ -376,6 +387,13 @@
<br> <artifactId>camel-jms</artifactId>
<br> <version>${camel-version}</version>
<br> </dependency>
<br>+
<br>+ <dependency>
<br>+ <groupId>org.apache.hadoop.zookeeper</groupId>
<br>+ <artifactId>zookeeper</artifactId>
<br>+ <version>3.0.0</version>
<br>+ <optional>true</optional>
<br>+ </dependency>
<br>
<br> <!-- for the XML parsing -->
<br> <dependency>
<br>@@ -926,6 +944,11 @@
<br> <pluginManagement>
<br> <plugins>
<br> <plugin>
<br>+ <groupId>org.apache.activemq.protobuf</groupId>
<br>+ <artifactId>activemq-protobuf</artifactId>
<br>+ <version>1.0-SNAPSHOT</version>
<br>+ </plugin>
<br>+ <plugin>
<br> <groupId>org.apache.maven.plugins</groupId>
<br> <artifactId>maven-antrun-plugin</artifactId>
<br> <version>1.1</version>
<br><br><br>
tag:www.nabble.com,2006:post-20629187
svn commit: r719706 [3/6] - in /activemq/activemq-blaze: ./ branches/ tags/ trunk/ trunk/src/ trunk/src/main/ trunk/src/main/java/ trunk/src/main/java/org/ trunk/src/main/java/org/apache/ trunk/src/main/java/org/apache/activeblaze/ trunk/src/main/java/...
2008-11-21T12:44:43Z
2008-11-21T12:44:43Z
rajdavies-2
Added: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupChannelImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupChannelImpl.java?rev=719706&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupChannelImpl.java?rev=719706&view=auto</a><br>==============================================================================
<br>--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupChannelImpl.java (added)
<br>+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupChannelImpl.java Fri Nov 21 12:44:40 2008
<br>@@ -0,0 +1,140 @@
<br>+/**
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.activeblaze.coordinated;
<br>+
<br>+import java.net.URI;
<br>+import org.apache.activeblaze.group.BlazeGroupChannelImpl;
<br>+import org.apache.activeblaze.group.Group;
<br>+import org.apache.activeblaze.group.Member;
<br>+import org.apache.activeblaze.group.MemberImpl;
<br>+import org.apache.activeblaze.wire.ElectionMessage;
<br>+import org.apache.activeblaze.wire.MessageType;
<br>+import org.apache.activeblaze.wire.PacketData;
<br>+import org.apache.activemq.protobuf.Buffer;
<br>+import org.apache.commons.logging.Log;
<br>+import org.apache.commons.logging.LogFactory;
<br>+
<br>+/**
<br>+ * A <CODE>BlazeGroupChannel</CODE> enables peer-based point to point communication and maintains a coordinator
<br>+ * (elected leader) for the group
<br>+ *
<br>+ */
<br>+public class BlazeCoordinatedGroupChannelImpl extends BlazeGroupChannelImpl implements BlazeCoordinatedGroupChannel {
<br>+ private static final Log LOG = LogFactory.getLog(BlazeCoordinatedGroupChannelImpl.class);
<br>+ private CoordinatedGroup coordinatedGroup;
<br>+
<br>+ /**
<br>+ * Constructor
<br>+ *
<br>+ * @param name
<br>+ */
<br>+ public BlazeCoordinatedGroupChannelImpl(String name) {
<br>+ super(name);
<br>+ }
<br>+
<br>+ /**
<br>+ * @param l
<br>+ * @throws Exception
<br>+ * @see org.apache.activeblaze.coordinated.BlazeCoordinatedGroupChannel#addCoordinatorChangedListener(org.apache.activeblaze.coordinated.CoordinatorChangedListener)
<br>+ */
<br>+ public void addCoordinatorChangedListener(CoordinatorChangedListener l) throws Exception {
<br>+ init();
<br>+ this.coordinatedGroup.addCoordinatorChangedListener(l);
<br>+ }
<br>+
<br>+ /**
<br>+ * @return
<br>+ * @throws Exception
<br>+ * @see org.apache.activeblaze.coordinated.BlazeCoordinatedGroupChannel#getCoordinator()
<br>+ */
<br>+ public Member getCoordinator() throws Exception {
<br>+ init();
<br>+ return this.coordinatedGroup.getCoordinator();
<br>+ }
<br>+
<br>+ /**
<br>+ * @return
<br>+ * @throws Exception
<br>+ * @see org.apache.activeblaze.coordinated.BlazeCoordinatedGroupChannel#isCoordinator()
<br>+ */
<br>+ public boolean isCoordinator() throws Exception {
<br>+ init();
<br>+ return this.coordinatedGroup.isCoordinatorMatch();
<br>+ }
<br>+
<br>+ /**
<br>+ * @param l
<br>+ * @throws Exception
<br>+ * @see org.apache.activeblaze.coordinated.BlazeCoordinatedGroupChannel#removeMemberChangedListener(org.apache.activeblaze.coordinated.CoordinatorChangedListener)
<br>+ */
<br>+ public void removeCoordinatorChangedListener(CoordinatorChangedListener l) throws Exception {
<br>+ init();
<br>+ this.coordinatedGroup.removeCoordinatorChangedListener(l);
<br>+ }
<br>+
<br>+ /**
<br>+ * @return
<br>+ * @see org.apache.activeblaze.coordinated.BlazeCoordinatedGroupChannel#getCoordinatedGroupConfiguration()
<br>+ */
<br>+ public BlazeCoordinatedGroupConfiguration getCoordinatedGroupConfiguration() {
<br>+ return (BlazeCoordinatedGroupConfiguration) getGroupConfiguration();
<br>+ }
<br>+
<br>+ /**
<br>+ * @param timeout
<br>+ * @return
<br>+ * @throws Exception
<br>+ * @see org.apache.activeblaze.group.BlazeGroupChannel#waitForElection(int)
<br>+ */
<br>+ public boolean waitForElection(int timeout) throws Exception {
<br>+ init();
<br>+ return this.coordinatedGroup.waitForElection(timeout);
<br>+ }
<br>+
<br>+ protected void processData(String id, Buffer correlationId, PacketData data) throws Exception {
<br>+ if (isStarted()) {
<br>+ MessageType type = MessageType.valueOf(data.getType());
<br>+ if (type == MessageType.BLAZE_DATA) {
<br>+ doProcessBlazeData(data);
<br>+ } else if (type == MessageType.MEMBER_DATA) {
<br>+ doProcessMemberData(data);
<br>+ } else if (type.equals(MessageType.ELECTION_MESSAGE)) {
<br>+ doProcessElectionData(id, data);
<br>+ } else {
<br>+ LOG.error("Unknown message type " + data);
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+ protected MemberImpl createLocal(URI uri) throws Exception {
<br>+ return new MemberImpl(getId(), getName(), getCoordinatedGroupConfiguration().getCoordinatorWeight(), uri);
<br>+ }
<br>+
<br>+ protected Group createGroup() {
<br>+ this.coordinatedGroup = new CoordinatedGroup(this);
<br>+ return this.coordinatedGroup;
<br>+ }
<br>+
<br>+ protected void doProcessElectionData(String id, PacketData data) throws Exception {
<br>+ MessageType type = MessageType.ELECTION_MESSAGE;
<br>+ ElectionMessage electionMessage = (ElectionMessage) type.createMessage();
<br>+ Buffer payload = data.getPayload();
<br>+ electionMessage.mergeFramed(payload);
<br>+ CoordinatedGroup group = (CoordinatedGroup) getGroup();
<br>+ group.processElectionMessage(electionMessage, id);
<br>+ }
<br>+}
<br><br>Propchange: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupChannelImpl.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupConfiguration.java
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupConfiguration.java?rev=719706&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupConfiguration.java?rev=719706&view=auto</a><br>==============================================================================
<br>--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupConfiguration.java (added)
<br>+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupConfiguration.java Fri Nov 21 12:44:40 2008
<br>@@ -0,0 +1,77 @@
<br>+/**
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.activeblaze.coordinated;
<br>+
<br>+import org.apache.activeblaze.BlazeConfiguration;
<br>+import org.apache.activeblaze.group.BlazeGroupConfiguration;
<br>+
<br>+/**
<br>+ * Configuration for a BlazeCoordinatedGroupChannel
<br>+ *
<br>+ */
<br>+public class BlazeCoordinatedGroupConfiguration extends BlazeGroupConfiguration{
<br>+ private long coordinatorWeight = 0;
<br>+ private int minimumGroupSize = 1;
<br>+ private long awaitGroupTimeout = getHeartBeatInterval()*2;
<br>+
<br>+
<br>+ /**
<br>+ * @return the coordinatorWeight
<br>+ */
<br>+ public long getCoordinatorWeight() {
<br>+ return this.coordinatorWeight;
<br>+ }
<br>+
<br>+ /**
<br>+ * @param coordinatorWeight the coordinatorWeight to set
<br>+ */
<br>+ public void setCoordinatorWeight(long coordinatorWeight) {
<br>+ this.coordinatorWeight = coordinatorWeight;
<br>+ }
<br>+
<br>+ /**
<br>+ * @return the minimumGroupSize
<br>+ */
<br>+ public int getMinimumGroupSize() {
<br>+ return this.minimumGroupSize;
<br>+ }
<br>+
<br>+ /**
<br>+ * @param minimumGroupSize the minimumGroupSize to set
<br>+ */
<br>+ public void setMinimumGroupSize(int minimumGroupSize) {
<br>+ this.minimumGroupSize = minimumGroupSize;
<br>+ }
<br>+
<br>+ /**
<br>+ * @return the awaitGroupTimeout
<br>+ */
<br>+ public long getAwaitGroupTimeout() {
<br>+ return this.awaitGroupTimeout;
<br>+ }
<br>+
<br>+ /**
<br>+ * @param awaitGroupTimeout the awaitGroupTimeout to set
<br>+ */
<br>+ public void setAwaitGroupTimeout(long awaitGroupTimeout) {
<br>+ this.awaitGroupTimeout = awaitGroupTimeout;
<br>+ }
<br>+
<br>+ protected BlazeConfiguration newInstance() {
<br>+ return new BlazeCoordinatedGroupConfiguration();
<br>+ }
<br>+}
<br><br>Propchange: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/BlazeCoordinatedGroupConfiguration.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatedGroup.java
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatedGroup.java?rev=719706&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatedGroup.java?rev=719706&view=auto</a><br>==============================================================================
<br>--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatedGroup.java (added)
<br>+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatedGroup.java Fri Nov 21 12:44:40 2008
<br>@@ -0,0 +1,283 @@
<br>+/**
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.activeblaze.coordinated;
<br>+
<br>+import java.util.ArrayList;
<br>+import java.util.Collections;
<br>+import java.util.Comparator;
<br>+import java.util.List;
<br>+import java.util.concurrent.CopyOnWriteArrayList;
<br>+import java.util.concurrent.LinkedBlockingQueue;
<br>+import java.util.concurrent.ThreadFactory;
<br>+import java.util.concurrent.ThreadPoolExecutor;
<br>+import java.util.concurrent.TimeUnit;
<br>+import java.util.concurrent.atomic.AtomicBoolean;
<br>+import org.apache.activeblaze.group.AsyncGroupRequest;
<br>+import org.apache.activeblaze.group.Group;
<br>+import org.apache.activeblaze.group.Member;
<br>+import org.apache.activeblaze.group.MemberImpl;
<br>+import org.apache.activeblaze.wire.ElectionMessage;
<br>+import org.apache.activeblaze.wire.ElectionType;
<br>+import org.apache.activeblaze.wire.MemberData;
<br>+import org.apache.activeblaze.wire.MessageType;
<br>+import org.apache.commons.logging.Log;
<br>+import org.apache.commons.logging.LogFactory;
<br>+
<br>+/**
<br>+ * Implementation of Group State
<br>+ *
<br>+ */
<br>+public class CoordinatedGroup extends Group {
<br>+ static final Log LOG = LogFactory.getLog(CoordinatedGroup.class);
<br>+ final BlazeCoordinatedGroupChannelImpl channel;
<br>+ private final BlazeCoordinatedGroupConfiguration configuration;
<br>+ private ThreadPoolExecutor electionExecutor;
<br>+ private MemberImpl coordinator;
<br>+ private List<CoordinatorChangedListener> listeners = new CopyOnWriteArrayList<CoordinatorChangedListener>();
<br>+ final AtomicBoolean electionFinished = new AtomicBoolean(false);
<br>+ private long startTime;
<br>+
<br>+ /**
<br>+ * Constructor
<br>+ *
<br>+ * @param local
<br>+ * @param channel
<br>+ * @param transport
<br>+ * @param config
<br>+ */
<br>+ protected CoordinatedGroup(BlazeCoordinatedGroupChannelImpl channel) {
<br>+ super(channel);
<br>+ this.channel = channel;
<br>+ this.coordinator = this.channel.getLocalMember();
<br>+ this.configuration = channel.getCoordinatedGroupConfiguration();
<br>+ }
<br>+
<br>+ /**
<br>+ * @return
<br>+ * @throws Exception
<br>+ * @see org.apache.activeblaze.Service#start()
<br>+ */
<br>+ public boolean start() throws Exception {
<br>+ boolean result = super.start();
<br>+ if (result) {
<br>+ this.startTime = System.currentTimeMillis();
<br>+ this.electionExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS,
<br>+ new LinkedBlockingQueue<Runnable>(), new ThreadFactory() {
<br>+ public Thread newThread(Runnable runnable) {
<br>+ Thread thread = new Thread(runnable, "Election{" + CoordinatedGroup.this.channel.getId()
<br>+ + "}");
<br>+ thread.setDaemon(true);
<br>+ return thread;
<br>+ }
<br>+ });
<br>+ }
<br>+ return result;
<br>+ }
<br>+
<br>+ /**
<br>+ * @return
<br>+ * @throws Exception
<br>+ * @see org.apache.activeblaze.Service#stop()
<br>+ */
<br>+ public boolean stop() throws Exception {
<br>+ boolean result = super.stop();
<br>+ if (result) {
<br>+ if (this.electionExecutor != null) {
<br>+ this.electionExecutor.shutdownNow();
<br>+ }
<br>+ }
<br>+ return result;
<br>+ }
<br>+
<br>+ /**
<br>+ * @return true if there is elections have finished
<br>+ */
<br>+ public boolean isElectionFinished() {
<br>+ return this.electionFinished.get();
<br>+ }
<br>+
<br>+ void setElectionFinished(boolean flag) {
<br>+ synchronized (this.electionFinished) {
<br>+ this.electionFinished.set(flag);
<br>+ // this.electionFinished.notifyAll();
<br>+ }
<br>+ }
<br>+
<br>+ /**
<br>+ * Process a new member
<br>+ *
<br>+ * @param data
<br>+ * @throws Exception
<br>+ */
<br>+ protected MemberImpl processMember(MemberData data) throws Exception {
<br>+ MemberImpl result = super.processMember(data);
<br>+ if (result != null || (!isElectionFinished() && !data.getId().equals(getLocalMember().getId()))) {
<br>+ election(result, true);
<br>+ }
<br>+ return result;
<br>+ }
<br>+
<br>+ protected void processMemberStopped(MemberImpl member) throws Exception {
<br>+ super.processMemberStopped(member);
<br>+ election(null, false);
<br>+ }
<br>+
<br>+ void election(final Member member, final boolean memberStarted) throws Exception {
<br>+ if (isStarted() && this.electionExecutor != null && !this.electionExecutor.isShutdown()) {
<br>+ synchronized (this.electionFinished) {
<br>+ this.electionFinished.set(false);
<br>+ }
<br>+ if (this.members.size() >= getConfiguration().getMinimumGroupSize()
<br>+ || (getConfiguration().getAwaitGroupTimeout() + this.startTime) < System.currentTimeMillis())
<br>+ synchronized (this.electionExecutor) {
<br>+ // remove any queued election tasks
<br>+ List<Runnable> list = new ArrayList<Runnable>(this.electionExecutor.getQueue());
<br>+ for (Runnable r : list) {
<br>+ ElectionService es = (ElectionService) r;
<br>+ es.stop();
<br>+ this.electionExecutor.remove(es);
<br>+ }
<br>+ }
<br>+ ElectionService es = new ElectionService(this, member, memberStarted);
<br>+ es.start();
<br>+ this.electionExecutor.execute(es);
<br>+ }
<br>+ }
<br>+
<br>+ /**
<br>+ * @return true if the coordinator for the map
<br>+ */
<br>+ protected boolean isCoordinatorMatch() {
<br>+ String coordinatorId = this.coordinator != null ? this.coordinator.getId() : "";
<br>+ return this.channel.getId().equals(coordinatorId);
<br>+ }
<br>+
<br>+ protected MemberImpl getCoordinator() {
<br>+ return this.coordinator;
<br>+ }
<br>+
<br>+ protected void setCoordinator(MemberImpl member) {
<br>+ this.coordinator = member;
<br>+ }
<br>+
<br>+ protected void addCoordinatorChangedListener(CoordinatorChangedListener l) {
<br>+ this.listeners.add(l);
<br>+ }
<br>+
<br>+ /**
<br>+ * Remove a listener for membership changes
<br>+ *
<br>+ * @param l
<br>+ * @throws Exception
<br>+ */
<br>+ protected void removeCoordinatorChangedListener(CoordinatorChangedListener l) {
<br>+ this.listeners.remove(l);
<br>+ }
<br>+
<br>+ protected void fireCoordinatorChanged(MemberImpl newCoordinator) {
<br>+ for (CoordinatorChangedListener l : this.listeners) {
<br>+ l.coordinatorChanged(newCoordinator);
<br>+ }
<br>+ }
<br>+
<br>+ boolean callElection() throws Exception {
<br>+ List<MemberImpl> members = new ArrayList<MemberImpl>(this.members.values());
<br>+ List<MemberImpl> sorted = CoordinatedGroup.sortMemberList(members);
<br>+ AsyncGroupRequest request = new AsyncGroupRequest();
<br>+ boolean doCall = false;
<br>+ for (Member member : sorted) {
<br>+ if (this.channel.getId().equals(member.getId())) {
<br>+ doCall = true;
<br>+ } else if (doCall) {
<br>+ ElectionMessage msg = new ElectionMessage();
<br>+ msg.setMember(this.channel.getLocalMember().getData());
<br>+ msg.setElectionType(ElectionType.ELECTION);
<br>+ this.channel.broadcastMessage(request, msg.type(), msg);
<br>+ }
<br>+ }
<br>+ boolean result = request.isSuccess(this.configuration.getHeartBeatInterval());
<br>+ return result;
<br>+ }
<br>+
<br>+ void processElectionMessage(ElectionMessage msg, String correlationId) throws Exception {
<br>+ MemberImpl from = new MemberImpl(msg.getMember());
<br>+ if (from != null && !from.getId().equals(getLocalMember().getId())) {
<br>+ LOG.debug(getLocalMember()+" Election message "+ msg.getElectionType() + " from " + from);
<br>+ if (msg.getElectionType().equals(ElectionType.ELECTION)) {
<br>+ ElectionMessage reply = new ElectionMessage();
<br>+ reply.setElectionType(ElectionType.ANSWER);
<br>+ reply.setMember(this.channel.getLocalMember().getData());
<br>+ this.channel.sendReply(from, msg.type(), reply, correlationId);
<br>+ election(null, false);
<br>+ } else if (msg.getElectionType().equals(ElectionType.COORDINATOR)) {
<br>+ this.coordinator=from;
<br>+ LOG.debug(getLocalMember()+" Coordinator is "+ from);
<br>+ setElectionFinished(true);
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+ void broadcastElectionType(ElectionType type) throws Exception {
<br>+ if (isStarted()) {
<br>+ ElectionMessage msg = new ElectionMessage();
<br>+ msg.setMember(this.channel.getLocalMember().getData());
<br>+ msg.setElectionType(type);
<br>+ this.channel.broadcastMessage(MessageType.ELECTION_MESSAGE, msg);
<br>+ }
<br>+ }
<br>+
<br>+ boolean waitForElection(int timeout) throws Exception {
<br>+ long deadline = 0;
<br>+ if (timeout > 0) {
<br>+ deadline = System.currentTimeMillis() + timeout;
<br>+ }
<br>+ synchronized (this.electionFinished) {
<br>+ while (isStarted() && !this.electionFinished.get()) {
<br>+ try {
<br>+ this.electionFinished.wait(timeout);
<br>+ } catch (InterruptedException e) {
<br>+ LOG.warn("Interrupted in waitForElection");
<br>+ stop();
<br>+ }
<br>+ if (timeout > 0) {
<br>+ timeout = (int) Math.max(deadline - System.currentTimeMillis(), 0l);
<br>+ }
<br>+ }
<br>+ }
<br>+ return !isStopped() && this.electionFinished.get();
<br>+ }
<br>+
<br>+ protected static List<MemberImpl> sortMemberList(List<MemberImpl> list) {
<br>+ Collections.sort(list, new Comparator<Member>() {
<br>+ public int compare(Member m1, Member m2) {
<br>+ long result = m1.getCoordinatorWeight() - m2.getCoordinatorWeight();
<br>+ if (result == 0) {
<br>+ result = m1.getId().compareTo(m2.getId());
<br>+ }
<br>+ return (int) result;
<br>+ }
<br>+ });
<br>+ return list;
<br>+ }
<br>+
<br>+ /**
<br>+ * @return the configuration
<br>+ */
<br>+ public BlazeCoordinatedGroupConfiguration getConfiguration() {
<br>+ return this.configuration;
<br>+ }
<br>+}
<br><br>Propchange: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatedGroup.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatorChangedListener.java
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatorChangedListener.java?rev=719706&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatorChangedListener.java?rev=719706&view=auto</a><br>==============================================================================
<br>--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatorChangedListener.java (added)
<br>+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatorChangedListener.java Fri Nov 21 12:44:40 2008
<br>@@ -0,0 +1,32 @@
<br>+/**
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.activeblaze.coordinated;
<br>+
<br>+import org.apache.activeblaze.group.Member;
<br>+import org.apache.activeblaze.group.MemberChangedListener;
<br>+
<br>+/**
<br>+ * A listener for coordinator changes to a group
<br>+ *
<br>+ */
<br>+public interface CoordinatorChangedListener extends MemberChangedListener {
<br>+ /**
<br>+ * Fired when a coordinator changes in the group
<br>+ * @param newCoordinator
<br>+ */
<br>+ void coordinatorChanged(Member newCoordinator);
<br>+}
<br><br>Propchange: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/CoordinatorChangedListener.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/ElectionService.java
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/ElectionService.java?rev=719706&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/ElectionService.java?rev=719706&view=auto</a><br>==============================================================================
<br>--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/ElectionService.java (added)
<br>+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/ElectionService.java Fri Nov 21 12:44:40 2008
<br>@@ -0,0 +1,94 @@
<br>+/**
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.activeblaze.coordinated;
<br>+
<br>+import java.util.ArrayList;
<br>+import java.util.Collections;
<br>+import java.util.Comparator;
<br>+import java.util.List;
<br>+import org.apache.activeblaze.BaseService;
<br>+import org.apache.activeblaze.group.Member;
<br>+import org.apache.activeblaze.group.MemberImpl;
<br>+import org.apache.activeblaze.wire.ElectionType;
<br>+import org.apache.commons.logging.Log;
<br>+import org.apache.commons.logging.LogFactory;
<br>+
<br>+/**
<br>+ * Responsible for calling an election amongst the members and deciding a
<br>+ * coordinator
<br>+ *
<br>+ */
<br>+class ElectionService extends BaseService implements Runnable {
<br>+ private static final Log LOG = LogFactory.getLog(ElectionService.class);
<br>+ private final CoordinatedGroup group;
<br>+ private Member member;
<br>+ ElectionService(CoordinatedGroup group,Member member, boolean memberStarted) {
<br>+ this.group=group;
<br>+ this.member = member;
<br>+ }
<br>+
<br>+
<br>+ public void run() {
<br>+ try {
<br>+ doElection();
<br>+ } catch (Exception e) {
<br>+ LOG.error("Failed to run election",e);
<br>+ }
<br>+ }
<br>+
<br>+ void doElection() throws Exception {
<br>+ List<MemberImpl> members = new ArrayList<MemberImpl>(this.group.getMembersImpl());
<br>+ if ((this.member == null || (!this.member.getId().equals(this.group.getId()) || members.size() == this.group.getConfiguration().getMinimumGroupSize()))) {
<br>+
<br>+ // call an election
<br>+ while (!this.group.callElection() && this.group.isStarted() && isStarted())
<br>+ ;
<br>+ if (this.group.isStarted() && isStarted()) {
<br>+
<br>+ this.group.setCoordinator(selectCordinator(members));
<br>+ if (this.group.isCoordinatorMatch()) {
<br>+ this.group.broadcastElectionType(ElectionType.COORDINATOR);
<br>+ }
<br>+ if (!this.group.isElectionFinished() && isStarted()) {
<br>+ //ok - lets just wait for more members to show
<br>+ //we could be the coordinator now - but best to check
<br>+ try {
<br>+ synchronized (this.group.electionFinished) {
<br>+ this.group.electionFinished.wait(this.group.getConfiguration().getHeartBeatInterval() * 2);
<br>+ }
<br>+ } catch (InterruptedException e) {
<br>+ }
<br>+ }
<br>+ if (!this.group.isElectionFinished() && isStarted()) {
<br>+ // we must be the coordinator
<br>+ this.group.setCoordinator(this.group.getLocalMember());
<br>+ this.group.setElectionFinished(true);
<br>+ LOG.debug(this.group.getLocalMember()+" We are the Coordinator ");
<br>+ this.group.broadcastElectionType(ElectionType.COORDINATOR);
<br>+ }
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+ protected MemberImpl selectCordinator(List<MemberImpl> list) throws Exception {
<br>+ List<MemberImpl> sorted = CoordinatedGroup.sortMemberList(list);
<br>+ MemberImpl result = sorted.isEmpty() ? this.group.getLocalMember() : sorted
<br>+ .get(list.size() - 1);
<br>+ return result;
<br>+ }
<br>+
<br>+}
<br><br>Propchange: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/ElectionService.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/package.html
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/package.html?rev=719706&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/package.html?rev=719706&view=auto</a><br>==============================================================================
<br>--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/package.html (added)
<br>+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/coordinated/package.html Fri Nov 21 12:44:40 2008
<br>@@ -0,0 +1,25 @@
<br>+!--
<br>+ Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ contributor license agreements. See the NOTICE file distributed with
<br>+ this work for additional information regarding copyright ownership.
<br>+ The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ (the "License"); you may not use this file except in compliance with
<br>+ the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+ Unless required by applicable law or agreed to in writing, software
<br>+ distributed under the License is distributed on an "AS IS" BASIS,
<br>+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ See the License for the specific language governing permissions and
<br>+ limitations under the License.
<br>+-->
<br>+<html>
<br>+<head>
<br>+</head>
<br>+<body>
<br>+
<br>+Coordinated group messaging
<br>+
<br>+</body>
<br>+</html>
<br>\ No newline at end of file
<br><br>Added: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/AsyncGroupRequest.java
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/AsyncGroupRequest.java?rev=719706&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/AsyncGroupRequest.java?rev=719706&view=auto</a><br>==============================================================================
<br>--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/AsyncGroupRequest.java (added)
<br>+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/AsyncGroupRequest.java Fri Nov 21 12:44:40 2008
<br>@@ -0,0 +1,67 @@
<br>+/**
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.activeblaze.group;
<br>+
<br>+import java.util.HashSet;
<br>+import java.util.Set;
<br>+import org.apache.activemq.protobuf.Buffer;
<br>+
<br>+/**
<br>+ * keep track of multiple requests
<br>+ *
<br>+ */
<br>+ public class AsyncGroupRequest implements RequestCallback {
<br>+ private final Object mutex = new Object();
<br>+
<br>+ private Set<Buffer> requests = new HashSet<Buffer>();
<br>+
<br>+ public void add(Buffer id, SendRequest request) {
<br>+ request.setCallback(this);
<br>+ this.requests.add(id);
<br>+ }
<br>+
<br>+ /**
<br>+ * Wait for requests
<br>+ * @param timeout
<br>+ * @return
<br>+ */
<br>+ public boolean isSuccess(long timeout) {
<br>+ long deadline = System.currentTimeMillis() + timeout;
<br>+ while (!this.requests.isEmpty()) {
<br>+ synchronized (this.mutex) {
<br>+ try {
<br>+ this.mutex.wait(timeout);
<br>+ } catch (InterruptedException e) {
<br>+ break;
<br>+ }
<br>+ }
<br>+ timeout = Math.max(deadline - System.currentTimeMillis(), 0);
<br>+ }
<br>+ return this.requests.isEmpty();
<br>+ }
<br>+
<br>+
<br>+ public void finished(Buffer id) {
<br>+ synchronized(this.mutex) {
<br>+ this.requests.remove(id);
<br>+ if (this.requests.isEmpty()) {
<br>+ this.mutex.notify();
<br>+ }
<br>+ }
<br>+
<br>+ }
<br>+}
<br><br>Propchange: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/AsyncGroupRequest.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java?rev=719706&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java?rev=719706&view=auto</a><br>==============================================================================
<br>--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java (added)
<br>+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java Fri Nov 21 12:44:40 2008
<br>@@ -0,0 +1,193 @@
<br>+/**
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.activeblaze.group;
<br>+
<br>+import java.util.Set;
<br>+import org.apache.activeblaze.BlazeChannel;
<br>+import org.apache.activeblaze.BlazeMessage;
<br>+
<br>+/**
<br>+ * <P>
<br>+ * A <CODE>BlazeGroupChannel</CODE> enables peer-based point to point communication
<br>+ *
<br>+ */
<br>+public interface BlazeGroupChannel extends BlazeChannel {
<br>+ /**
<br>+ * @return the name of this channel
<br>+ */
<br>+ public String getName();
<br>+
<br>+ /**
<br>+ * Send a message to an individual member
<br>+ *
<br>+ * @param member
<br>+ * @param message
<br>+ * @throws Exception
<br>+ */
<br>+ public void send(Member member, BlazeMessage message) throws Exception;
<br>+
<br>+ /**
<br>+ * Send a message to an individual member and wait for a response
<br>+ *
<br>+ * @param member
<br>+ * @param message
<br>+ * @return the response
<br>+ * @throws Exception
<br>+ */
<br>+ public BlazeMessage sendRequest(Member member, BlazeMessage message) throws Exception;
<br>+
<br>+ /**
<br>+ * Send a message to an individual member and wait for a response
<br>+ *
<br>+ * @param member
<br>+ * @param message
<br>+ * @param timeout
<br>+ * time in milliseconds to wait for a response
<br>+ * @return a response of null if timed out
<br>+ * @throws Exception
<br>+ */
<br>+ public BlazeMessage sendRequest(Member member, BlazeMessage message, int timeout) throws Exception;
<br>+
<br>+ /**
<br>+ * Send a message to the group - one Member will be picked to receive the message in a round-robin fashion
<br>+ *
<br>+ * @param destination
<br>+ * @param message
<br>+ * @throws Exception
<br>+ */
<br>+ public void send(String destination, BlazeMessage message) throws Exception;
<br>+
<br>+ /**
<br>+ * Send a message to the group - one Member will be picked to receive the message in a round-robin fashion and wait
<br>+ * for a response
<br>+ *
<br>+ * @param destination
<br>+ * @param message
<br>+ * @return a response
<br>+ * @throws Exception
<br>+ */
<br>+ public BlazeMessage sendRequest(String destination, BlazeMessage message) throws Exception;
<br>+
<br>+ /**
<br>+ * Send a message to the group - one Member will be picked to receive the message in a round-robin fashion and wait
<br>+ * for a response
<br>+ *
<br>+ * @param destination
<br>+ * @param message
<br>+ * @param timeout -
<br>+ * time in milliseconds to wait for a response
<br>+ * @return a response of null if timed out
<br>+ * @throws Exception
<br>+ */
<br>+ public BlazeMessage sendRequest(String destination, BlazeMessage message, int timeout) throws Exception;
<br>+
<br>+ /**
<br>+ * Send a response message to an original message - for request/response
<br>+ *
<br>+ * @param to
<br>+ * the Member to send a response to
<br>+ * @param response
<br>+ * the message to send in a response
<br>+ * @param correlationId
<br>+ * the associated id from the original message
<br>+ * @throws Exception
<br>+ */
<br>+ public void sendReply(Member to, BlazeMessage response, String correlationId) throws Exception;
<br>+
<br>+ /**
<br>+ * @return the inboxListener
<br>+ */
<br>+ public BlazeQueueListener getInboxListener();
<br>+
<br>+ /**
<br>+ * @param inboxListener
<br>+ * the inboxListener to set
<br>+ */
<br>+ public void setInboxListener(BlazeQueueListener inboxListener);
<br>+
<br>+ /**
<br>+ * @return the configuration
<br>+ */
<br>+ public BlazeGroupConfiguration getGroupConfiguration();
<br>+
<br>+ /**
<br>+ * @return a set of the members
<br>+ */
<br>+ public Set<Member> getMembers();
<br>+
<br>+ /**
<br>+ * Get a member by its unique id
<br>+ *
<br>+ * @param id
<br>+ * @return
<br>+ */
<br>+ public Member getMemberById(String id);
<br>+
<br>+ /**
<br>+ * Return a member of the Group with the matching name
<br>+ *
<br>+ * @param name
<br>+ * @return
<br>+ */
<br>+ public Member getMemberByName(String name);
<br>+
<br>+ /**
<br>+ * Will wait for a member to advertise itself if not available
<br>+ * @param name
<br>+ * @param timeout
<br>+ * @return the member or null
<br>+ * @throws InterruptedException
<br>+ */
<br>+ public Member getAndWaitForMemberByName(String name, int timeout) throws InterruptedException;
<br>+
<br>+ /**
<br>+ * @return the local member that represents this <CODE>Group</CODE> instance
<br>+ */
<br>+ public Member getLocalMember();
<br>+
<br>+ /**
<br>+ * Add a listener for membership changes
<br>+ *
<br>+ * @param l
<br>+ */
<br>+ public void addMemberChangedListener(MemberChangedListener l);
<br>+
<br>+ /**
<br>+ * Remove a listener for membership changes
<br>+ *
<br>+ * @param l
<br>+ */
<br>+ public void removeMemberChangedListener(MemberChangedListener l);
<br>+
<br>+ /**
<br>+ * Add a listener for messages
<br>+ *
<br>+ * @param destination
<br>+ * @param l
<br>+ * @throws Exception
<br>+ */
<br>+ public void addBlazeQueueMessageListener(String destination, BlazeQueueListener l) throws Exception;
<br>+
<br>+ /**
<br>+ * Remove a listener for messages
<br>+ *
<br>+ * @param destination
<br>+ * @return the removed listener
<br>+ * @throws Exception
<br>+ */
<br>+ public BlazeQueueListener removeBlazeQueueMessageListener(String destination) throws Exception;
<br>+}
<br><br>Propchange: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelFactory.java
<br>URL: <a href="http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelFactory.java?rev=719706&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelFactory.java?rev=719706&view=auto</a><br>==============================================================================
<br>--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelFactory.java (added)
<br>+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelFactory.java Fri Nov 21 12:44:40 2008
<br>@@ -0,0 +1,60 @@
<br>+/**
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.activeblaze.group;
<br>+
<br>+import org.apache.activeblaze.BlazeChannelFactory;
<br>+
<br>+/**
<br>+ * Factory class for creating <Code>BlazeGroupChannel</CODE>
<br>+ */
<br>+public class BlazeGroupChannelFactory extends BlazeChannelFactory {
<br>+ /**
<br>+ * Default Constructor
<br>+ */
<br>+ &n