geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r468255 - in /geronimo/sandbox/gcache: pom.xml server/pom.xml server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java
Date Fri, 27 Oct 2006 03:55:28 GMT
Author: jgenender
Date: Thu Oct 26 20:55:27 2006
New Revision: 468255

URL: http://svn.apache.org/viewvc?view=rev&rev=468255
Log:
Badd slf4j versions...made em right

Modified:
    geronimo/sandbox/gcache/pom.xml
    geronimo/sandbox/gcache/server/pom.xml
    geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java
    geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java

Modified: geronimo/sandbox/gcache/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gcache/pom.xml?view=diff&rev=468255&r1=468254&r2=468255
==============================================================================
--- geronimo/sandbox/gcache/pom.xml (original)
+++ geronimo/sandbox/gcache/pom.xml Thu Oct 26 20:55:27 2006
@@ -17,7 +17,7 @@
     </scm>
 
     <modules>
-        <module>openwire</module>
+        <!--module>openwire</module-->
         <module>client</module>
         <module>server</module>
     </modules>
@@ -49,7 +49,7 @@
             <dependency>
                 <groupId>backport-util-concurrent</groupId>
                 <artifactId>backport-util-concurrent</artifactId>
-                <version>2.0_01_pd</version>
+                <version>2.2</version>
             </dependency>
 
             <dependency>
@@ -61,7 +61,7 @@
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
-                <version>1.2.9</version>
+                <version>1.2.8</version>
             </dependency>
 
             <dependency>
@@ -82,6 +82,13 @@
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-core</artifactId>
                 <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.0</version>
+                <scope>provided</scope>
             </dependency>
 
         </dependencies>

Modified: geronimo/sandbox/gcache/server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gcache/server/pom.xml?view=diff&rev=468255&r1=468254&r2=468255
==============================================================================
--- geronimo/sandbox/gcache/server/pom.xml (original)
+++ geronimo/sandbox/gcache/server/pom.xml Thu Oct 26 20:55:27 2006
@@ -32,11 +32,9 @@
         </dependency>
         
         <dependency>
-      		<groupId>org.slf4j</groupId>
-      		<artifactId>nlog4j</artifactId>
-      		<version>1.2.25</version>
-      		<scope>provided</scope>
-    	</dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.testng</groupId>

Modified: geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java?view=diff&rev=468255&r1=468254&r2=468255
==============================================================================
--- geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java
(original)
+++ geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java
Thu Oct 26 20:55:27 2006
@@ -24,6 +24,7 @@
 import org.apache.geronimo.gcache.CacheInfoHolder;
 import org.apache.geronimo.gcache.transports.TransportService;
 import org.apache.mina.common.IoAcceptor;
+import org.apache.mina.common.ThreadModel;
 import org.apache.mina.filter.LoggingFilter;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.transport.socket.nio.SocketAcceptor;
@@ -105,6 +106,7 @@
         SocketAcceptorConfig cfg = new SocketAcceptorConfig();
         cfg.setReuseAddress( true );
         
+        cfg.setThreadModel( ThreadModel.MANUAL );
 	//If we requested logging, add that too
         if (enableLogging){
             cfg.getFilterChain().addLast( "logFilter", new LoggingFilter() );

Modified: geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java?view=diff&rev=468255&r1=468254&r2=468255
==============================================================================
--- geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java
(original)
+++ geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java
Thu Oct 26 20:55:27 2006
@@ -119,7 +119,7 @@
 
         byte recBuf[] = new byte[Constants.HEADER_SIZE];
 
-	    socket.setSoTimeout(2000);
+//	    socket.setSoTimeout(2000);
         InputStream is = socket.getInputStream();
         int read = is.read(recBuf);
         assert read == Constants.HEADER_SIZE;



Mime
View raw message