[infinispan-commits] Infinispan SVN: r1386 - in trunk/server/memcached/src: main/java/org/infinispan/server/memcached and 3 other directories.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-01-18 10:45:27 -0500 (Mon, 18 Jan 2010)
New Revision: 1386

Added:
   trunk/server/memcached/src/main/resources/memcached.bat
Modified:
   trunk/server/memcached/src/main/java/org/infinispan/server/core/netty/NettyServerBootstrap.java
   trunk/server/memcached/src/main/java/org/infinispan/server/memcached/TextServer.java
   trunk/server/memcached/src/test/java/org/infinispan/server/memcached/StatsTest.java
   trunk/server/memcached/src/test/java/org/infinispan/server/memcached/test/MemcachedTestingUtil.java
Log:
[ISPN-173] (Build memcached server module) Fixed testsuite, added .bat script.

Modified: trunk/server/memcached/src/main/java/org/infinispan/server/core/netty/NettyServerBootstrap.java
===================================================================
--- trunk/server/memcached/src/main/java/org/infinispan/server/core/netty/NettyServerBootstrap.java	2010-01-18 11:49:39 UTC (rev 1385)
+++ trunk/server/memcached/src/main/java/org/infinispan/server/core/netty/NettyServerBootstrap.java	2010-01-18 15:45:27 UTC (rev 1386)
@@ -98,7 +98,7 @@
 
    @Override
    public void stop() {
-   // We *pause* the acceptor so no new connections are made
+      // We *pause* the acceptor so no new connections are made
       ChannelGroupFuture future = serverChannels.unbind().awaitUninterruptibly();
       if (!future.isCompleteSuccess()) {
          log.warn("Server channel group did not completely unbind");

Modified: trunk/server/memcached/src/main/java/org/infinispan/server/memcached/TextServer.java
===================================================================
--- trunk/server/memcached/src/main/java/org/infinispan/server/memcached/TextServer.java	2010-01-18 11:49:39 UTC (rev 1385)
+++ trunk/server/memcached/src/main/java/org/infinispan/server/memcached/TextServer.java	2010-01-18 15:45:27 UTC (rev 1386)
@@ -55,10 +55,6 @@
    private final int workerThreads;
    private final ScheduledExecutorService scheduler;
    private ServerBootstrap bootstrap;
-   private ExecutorService masterExecutor;
-   private ExecutorService workerExecutor;
-   private final AtomicInteger masterThreadNumber = new AtomicInteger(1);
-   private final AtomicInteger workerThreadNumber = new AtomicInteger(1);
 
    public TextServer(String host, int port, String configFile, int masterThreads, int workerThreads) throws IOException {
       this(host, port, configFile == null 

Added: trunk/server/memcached/src/main/resources/memcached.bat
===================================================================
--- trunk/server/memcached/src/main/resources/memcached.bat	                        (rev 0)
+++ trunk/server/memcached/src/main/resources/memcached.bat	2010-01-18 15:45:27 UTC (rev 1386)
@@ -0,0 +1,13 @@
+ at echo off
+
+setlocal enabledelayedexpansion
+
+set LIB=
+for %%f in (..\lib\*.jar) do set LIB=!LIB!;%%f
+for %%f in (..\modules\memcached\lib\*.jar) do set LIB=!LIB!;%%f
+rem echo libs: %LIB%
+
+set CP=%LIB%;..\infinispan-core.jar;..\modules\memcached\infinispan-server-memcached.jar;%CP%
+
+java -classpath "%CP%" org.infinispan.server.memcached.Main %1 %2 %3 %4 %5 %6 %7
+:fileEnd
\ No newline at end of file

Modified: trunk/server/memcached/src/test/java/org/infinispan/server/memcached/StatsTest.java
===================================================================
--- trunk/server/memcached/src/test/java/org/infinispan/server/memcached/StatsTest.java	2010-01-18 11:49:39 UTC (rev 1385)
+++ trunk/server/memcached/src/test/java/org/infinispan/server/memcached/StatsTest.java	2010-01-18 15:45:27 UTC (rev 1386)
@@ -56,7 +56,7 @@
 
    @Override
    protected CacheManager createCacheManager() throws Exception {
-      cacheManager = TestCacheManagerFactory.createJmxEnabledCacheManager(JMX_DOMAIN);
+      cacheManager = TestCacheManagerFactory.createCacheManagerEnforceJmxDomain(JMX_DOMAIN);
       server = MemcachedTestingUtil.createMemcachedTextServer(cacheManager.getCache());
       server.start();
       client = createMemcachedClient(60000, server.getPort());

Modified: trunk/server/memcached/src/test/java/org/infinispan/server/memcached/test/MemcachedTestingUtil.java
===================================================================
--- trunk/server/memcached/src/test/java/org/infinispan/server/memcached/test/MemcachedTestingUtil.java	2010-01-18 11:49:39 UTC (rev 1385)
+++ trunk/server/memcached/src/test/java/org/infinispan/server/memcached/test/MemcachedTestingUtil.java	2010-01-18 15:45:27 UTC (rev 1386)
@@ -75,7 +75,7 @@
             return timeout;
          }
       };
-      return new MemcachedClient(d, Arrays.asList(new InetSocketAddress[]{new InetSocketAddress(port)}));
+      return new MemcachedClient(d, Arrays.asList(new InetSocketAddress[]{new InetSocketAddress(HOST, port)}));
    }
 
    public static TextServer createMemcachedTextServer(Cache cache) throws IOException {