JGroups 3.0 upgrade.

Convert tests from EasyMock to Mockito.

git-svn-id: https://ha-jdbc.svn.sourceforge.net/svnroot/ha-jdbc/trunk@2516 882a69a1-a10d-0410-8702-ae3607fe02de

Author: pferraro

pom.xml

@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
-			<version>2.0.1</version>
+			<version>2.0.2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -73,14 +73,14 @@
 		<dependency>
 			<groupId>org.jgroups</groupId>
 			<artifactId>jgroups</artifactId>
-			<version>2.12.1.Final</version>
+			<version>3.0.0.Beta1</version>
 			<optional>true</optional>
 		</dependency>
 		<!-- Optional logging dependencies -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.6.1</version>
+			<version>1.6.2</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -92,20 +92,21 @@
 		<dependency>
 			<groupId>org.jboss.logging</groupId>
 			<artifactId>jboss-logging</artifactId>
-			<version>3.0.0.Beta5</version>
+			<version>3.0.0.GA</version>
 			<optional>true</optional>
 		</dependency>
 		<!-- Optional state manager dependencies -->
 		<dependency>
 			<groupId>com.sleepycat</groupId>
 			<artifactId>je</artifactId>
-			<version>4.1.7</version>
+			<version>4.1.10</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.tmatesoft.sqljet</groupId>
 			<artifactId>sqljet</artifactId>
 			<version>1.0.4</version>
+			<!--version>1.0.7</version-->
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -125,35 +126,36 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.8.2</version>
+			<version>4.9</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>3.0</version>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.9.0-rc1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.0.0</version>
+			<version>2.2.4</version>
+			<!--version>2.2.5</version-->
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.3.154</version>
+			<version>1.3.159</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
-			<version>10.7.1.1</version>
+			<version>10.8.1.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	
+
 	<build>
 		<resources>
 			<resource>
@@ -171,7 +173,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.0</version>
+				<version>1.0.1</version>
 				<configuration>
 					<rules>
 						<requireJavaVersion>
@@ -240,7 +242,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>3.0-beta-3</version>
+				<version>3.0</version>
 				<configuration>
 					<reportPlugins>
 						<plugin>
@@ -299,7 +301,8 @@
 					<dependency>
 						<groupId>org.apache.maven.doxia</groupId>
 						<artifactId>doxia-module-docbook-simple</artifactId>
-						<version>1.1.5-SNAPSHOT</version>
+						<version>1.2</version>
+						<!--version>1.1.5-SNAPSHOT</version-->
 					</dependency>
 				</dependencies>
 			</plugin>
@@ -314,27 +317,27 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>2.3.1</version>
+					<version>2.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-changes-plugin</artifactId>
-					<version>2.4</version>
+					<version>2.6</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jxr-plugin</artifactId>
-					<version>2.2</version>
+					<version>2.3</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.7</version>
+					<version>2.8</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>findbugs-maven-plugin</artifactId>
-					<version>2.3.1</version>
+					<version>2.3.2</version>
 				</plugin>
 				<plugin>
 					<groupId>com.googlecode.fluido-skin</groupId>

src/main/java/net/sf/hajdbc/distributed/Command.java

@@ -34,18 +34,4 @@ public interface Command<R, C> extends Serializable
 	 * @return the result of this command.
 	 */
 	R execute(C context);
-	
-	/**
-	 * Unmarshals the rpc response to the expected execution result type.
-	 * @param object the rpc response
-	 * @return the execution result
-	 */
-	R unmarshalResult(Object object);
-	
-	/**
-	 * Marshals the execution result to a suitable rpc response.
-	 * @param result the execution result
-	 * @return the rpc response
-	 */
-	Object marshalResult(R result);
 }

src/main/java/net/sf/hajdbc/distributed/CommandDispatcher.java

@@ -56,4 +56,10 @@ public interface CommandDispatcher<C> extends Lifecycle
 	 * @return the local member.
 	 */
 	Member getLocal();
+	
+	/**
+	 * Returns the group coordinator.
+	 * @return the group coordinator.
+	 */
+	Member getCoordinator();
 }

src/main/java/net/sf/hajdbc/distributed/Stateful.java

@@ -17,6 +17,10 @@
  */
 package net.sf.hajdbc.distributed;
 
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
 /**
  * Used by the command dispatcher to handle state transfer between members.
  * 
@@ -28,11 +32,11 @@ public interface Stateful
 	 * Returns the state of this object.
 	 * @return the current state.
 	 */
-	byte[] getState();
+	void readState(ObjectInput input) throws IOException, ClassNotFoundException;
 
 	/**
 	 * Sets the state of this object.
 	 * @param state the state
 	 */
-	void setState(byte[] state);
+	void writeState(ObjectOutput output) throws IOException;
 }