Merge pull request #41 from h0nIg/versionsupdate

magro · magro · commit 6873277abec7 · 2014-04-28T20:40:26.000+02:00
updated tomcat/couchbase/memcached versions
diff --git a/core/pom.xml b/core/pom.xml
@@ -14,7 +14,7 @@
 	<description>The msm core, provides java serialization strategy.</description>
 
 	<properties>
-		<tomcat-version>7.0.40</tomcat-version>
+		<tomcat-version>7.0.53</tomcat-version>
 	</properties>
 	
 	<dependencies>
@@ -45,13 +45,13 @@
 		<dependency>
 			<groupId>net.spy</groupId>
 			<artifactId>spymemcached</artifactId>
-			<version>2.10.2</version>
+			<version>2.11.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.couchbase.client</groupId>
 			<artifactId>couchbase-client</artifactId>
-			<version>1.2.2</version>
+			<version>1.4.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<!-- Needed if used with membase via http -->
diff --git a/core/src/main/java/de/javakaffee/web/msm/SuffixBasedNodeLocator.java b/core/src/main/java/de/javakaffee/web/msm/SuffixBasedNodeLocator.java
@@ -28,6 +28,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import net.spy.memcached.MemcachedConnection;
 
 import net.spy.memcached.MemcachedNode;
 import net.spy.memcached.NodeLocator;
@@ -329,6 +330,15 @@ public long lastReadDelta() {
         public void completedRead() {
           throw new UnsupportedOperationException();
         }
-    }
 
+        @Override
+        public MemcachedConnection getConnection() {
+          throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void setConnection(MemcachedConnection mc) {
+          throw new UnsupportedOperationException();
+        }
+    }
 }
diff --git a/core/src/main/java/de/javakaffee/web/msm/SuffixLocatorBinaryConnectionFactory.java b/core/src/main/java/de/javakaffee/web/msm/SuffixLocatorBinaryConnectionFactory.java
@@ -118,7 +118,8 @@ public MemcachedNode createMemcachedNode(final SocketAddress sa,
             createWriteOperationQueue(),
             createOperationQueue(),
             getOpQueueMaxBlockTime(),
-            doAuth, defaultOpTimeout);
+            doAuth, defaultOpTimeout,
+            getAuthWaitTime(), this);
     }
 
     @Override
diff --git a/core/src/test/java/de/javakaffee/web/msm/RequestTrackingHostValveTest.java b/core/src/test/java/de/javakaffee/web/msm/RequestTrackingHostValveTest.java
@@ -178,7 +178,8 @@ public final void testRequestFinishedShouldBeInvokedForIgnoredResources() throws
 
     protected abstract void setupGetResponseSetCookieHeadersExpectations(Response response, String[] result);
 
-    private String generateCookieString(final Cookie cookie) {
+    @Nonnull
+    protected String generateCookieString(final Cookie cookie) {
         final StringBuffer sb = new StringBuffer();
         ServerCookie.appendCookieValue
                 (sb, cookie.getVersion(), cookie.getName(), cookie.getValue(),
diff --git a/pom.xml b/pom.xml
@@ -203,7 +203,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tomcat-version>6.0.37</tomcat-version>
+		<tomcat-version>6.0.39</tomcat-version>
 		<slf4j-version>1.5.8</slf4j-version>
 		<hibernate-core-version>3.3.2.GA</hibernate-core-version>
 		<couchbasemock-version>0.5-69e953bd</couchbasemock-version>
@@ -251,7 +251,7 @@
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>
-				<version>4.1.1</version>
+				<version>4.3</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
diff --git a/samples/pom.xml b/samples/pom.xml
@@ -22,7 +22,7 @@
 	</modules>
 
 	<properties>
-		<tomcat-version>7.0.40</tomcat-version>
+		<tomcat-version>7.0.53</tomcat-version>
 	</properties>
 
 	<dependencies>
@@ -94,7 +94,7 @@
 						<version>${project.version}</version>
 					</dependency>
 					<!-- <dependency> <groupId>net.spy</groupId> <artifactId>spymemcached</artifactId> 
-						<version>2.10.2</version> <scope>compile</scope> </dependency> -->
+						<version>2.11.1</version> <scope>compile</scope> </dependency> -->
 				</dependencies>
 			</plugin>
 		</plugins>
diff --git a/tomcat6/pom.xml b/tomcat6/pom.xml
@@ -14,7 +14,7 @@
 	<description>The msm tomcat6 specific implementation.</description>
 	
 	<properties>
-		<tomcat-version>6.0.37</tomcat-version>
+		<tomcat-version>6.0.39</tomcat-version>
 	</properties>
 	
 	<dependencies>
diff --git a/tomcat7/pom.xml b/tomcat7/pom.xml
@@ -14,7 +14,7 @@
 	<description>The msm tomcat7 specific implementation.</description>
 
 	<properties>
-		<tomcat-version>7.0.40</tomcat-version>
+		<tomcat-version>7.0.53</tomcat-version>
 	</properties>
 
 	<dependencies>
diff --git a/tomcat8/pom.xml b/tomcat8/pom.xml
@@ -12,7 +12,7 @@
 	<description>The msm tomcat8 specific implementation.</description>
 
 	<properties>
-		<tomcat-version>8.0.0-RC10</tomcat-version>
+		<tomcat-version>8.0.5</tomcat-version>
 	</properties>
 
 	<dependencies>
diff --git a/tomcat8/src/test/java/de/javakaffee/web/msm/RequestTrackingHostValveT8Test.java b/tomcat8/src/test/java/de/javakaffee/web/msm/RequestTrackingHostValveT8Test.java
@@ -1,10 +1,13 @@
 package de.javakaffee.web.msm;
 
 import org.apache.catalina.connector.Response;
+import org.apache.tomcat.util.http.SetCookieSupport;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;
 import java.util.Collection;
+import javax.annotation.Nonnull;
+import javax.servlet.http.Cookie;
 
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
@@ -22,4 +25,9 @@ protected String[] getSetCookieHeaders(final Response response) {
         final Collection<String> result = response.getHeaders("Set-Cookie");
         return result.toArray(new String[result.size()]);
     }
+
+    @Nonnull
+    protected String generateCookieString(final Cookie cookie) {
+        return SetCookieSupport.generateHeader(cookie);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ public MemcachedNode createMemcachedNode(final SocketAddress sa,`
`118`	`118`	`createWriteOperationQueue(),`
`119`	`119`	`createOperationQueue(),`
`120`	`120`	`getOpQueueMaxBlockTime(),`
`121`		`- doAuth, defaultOpTimeout);`
	`121`	`+ doAuth, defaultOpTimeout,`
	`122`	`+ getAuthWaitTime(), this);`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`@Override`