Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit c6fd8bf

Browse files
omar01omar01
committed
Changing namespace and client name
1 parent a385165 commit c6fd8bf

14 files changed

+81
-81
lines changed

‎build.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<project name="memcached" default="package" basedir=".">
33

44
<property name="project.title" value="java memcached client" />
5-
<property name="code.dir" value="src/com/meetup/memcached" />
5+
<property name="code.dir" value="src/com/danga/MemCached" />
66
<property name="doc.dir" value="doc" />
77
<property name="src.dir" value="src" />
88
<property name="build.dir" value="classes" />
9-
9+
1010
<property environment="env"/>
1111
<property file="build.properties"/>
1212
<property name="project" value="memcached"/>
@@ -44,12 +44,12 @@
4444
<target name="setup">
4545
<mkdir dir="memcached-${ver}"/>
4646
<mkdir dir="memcached-${ver}/javadocs"/>
47-
<mkdir dir="memcached-${ver}/src/com/meetup/memcached"/>
47+
<mkdir dir="memcached-${ver}/src/com/danga/MemCached"/>
4848
<mkdir dir="memcached-${ver}/classes"/>
4949
<mkdir dir="memcached-${ver}/doc"/>
5050

5151
<!-- copy source -->
52-
<copy todir="memcached-${ver}/src/com/meetup/memcached">
52+
<copy todir="memcached-${ver}/src/com/danga/MemCached">
5353
<fileset dir="${code.dir}" defaultexcludes="true" excludes="**/*.xml **/*.swp **/*.swo"/>
5454
</copy>
5555

@@ -67,13 +67,13 @@
6767

6868
<!-- if logger is log4j then need to filter to make sure import exists -->
6969
<target name="log4j" if="log4j" depends="clean, setup">
70-
<replace dir="memcached-${ver}/src/com/meetup/memcached" token="//import org.apache.log4j.Logger;" value="import org.apache.log4j.Logger;">
70+
<replace dir="memcached-${ver}/src/com/danga/MemCached" token="//import org.apache.log4j.Logger;" value="import org.apache.log4j.Logger;">
7171
<include name="**/*.java"/>
7272
</replace>
7373
</target>
7474

7575
<target name="logger" unless="log4j" depends="clean, setup">
76-
<replace dir="memcached-${ver}/src/com/meetup/memcached" token="import org.apache.log4j.Logger;" value="//import org.apache.log4j.Logger;">
76+
<replace dir="memcached-${ver}/src/com/danga/MemCached" token="import org.apache.log4j.Logger;" value="//import org.apache.log4j.Logger;">
7777
<include name="**/*.java"/>
7878
</replace>
7979
</target>
@@ -86,7 +86,7 @@
8686

8787
<javadoc sourcepath="memcached-${ver}/src"
8888
destdir="memcached-${ver}/javadocs"
89-
packagenames= "com.meetup.*"
89+
packagenames= "com.danga.*"
9090
author= "true"
9191
private="true"
9292
version="true"
@@ -97,7 +97,7 @@
9797
doctitle="&lt;h1&gt;${project.title} documentation (Version ${ver})&lt;/h1&gt;"
9898
bottom="Copyright &#169; 2005 - greg whalin">
9999
</javadoc>
100-
</target>
100+
</target>
101101

102102
<!-- compilation target for packeging operations -->
103103
<target name="pkg-compile" depends="clean, setup, log4j, logger">

‎src/com/meetup/memcached/ByteBufArrayInputStream.java‎ renamed to ‎src/com/danga/MemCached/ByteBufArrayInputStream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @author greg whalin <[email protected]>
1717
*/
18-
package com.meetup.memcached;
18+
package com.danga.MemCached;
1919

2020
import java.io.ByteArrayOutputStream;
2121
import java.io.IOException;

‎src/com/meetup/memcached/ContextObjectInputStream.java‎ renamed to ‎src/com/danga/MemCached/ContextObjectInputStream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @author Vin Chawla <[email protected]>
2222
*/
23-
package com.meetup.memcached;
23+
package com.danga.MemCached;
2424

2525
import java.util.*;
2626
import java.util.zip.*;

‎src/com/meetup/memcached/ErrorHandler.java‎ renamed to ‎src/com/danga/MemCached/ErrorHandler.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,54 +19,54 @@
1919
*
2020
* @author Dan Zivkovic <[email protected]>
2121
*/
22-
package com.meetup.memcached;
22+
package com.danga.MemCached;
2323

2424
public interface ErrorHandler {
2525

2626
/**
2727
* Called for errors thrown during initialization.
2828
*/
29-
public void handleErrorOnInit( final MemcachedClient client ,
29+
public void handleErrorOnInit( final MemCachedClient client ,
3030
final Throwable error );
3131

3232
/**
33-
* Called for errors thrown during {@link MemcachedClient#get(String)} and related methods.
33+
* Called for errors thrown during {@link MemCachedClient#get(String)} and related methods.
3434
*/
35-
public void handleErrorOnGet( final MemcachedClient client ,
35+
public void handleErrorOnGet( final MemCachedClient client ,
3636
final Throwable error ,
3737
final String cacheKey );
3838

3939
/**
40-
* Called for errors thrown during {@link MemcachedClient#getMulti(String)} and related methods.
40+
* Called for errors thrown during {@link MemCachedClient#getMulti(String)} and related methods.
4141
*/
42-
public void handleErrorOnGet( final MemcachedClient client ,
42+
public void handleErrorOnGet( final MemCachedClient client ,
4343
final Throwable error ,
4444
final String[] cacheKeys );
4545

4646
/**
47-
* Called for errors thrown during {@link MemcachedClient#set(String,Object)} and related methods.
47+
* Called for errors thrown during {@link MemCachedClient#set(String,Object)} and related methods.
4848
*/
49-
public void handleErrorOnSet( final MemcachedClient client ,
49+
public void handleErrorOnSet( final MemCachedClient client ,
5050
final Throwable error ,
5151
final String cacheKey );
5252

5353
/**
54-
* Called for errors thrown during {@link MemcachedClient#delete(String)} and related methods.
54+
* Called for errors thrown during {@link MemCachedClient#delete(String)} and related methods.
5555
*/
56-
public void handleErrorOnDelete( final MemcachedClient client ,
56+
public void handleErrorOnDelete( final MemCachedClient client ,
5757
final Throwable error ,
5858
final String cacheKey );
5959

6060
/**
61-
* Called for errors thrown during {@link MemcachedClient#flushAll()} and related methods.
61+
* Called for errors thrown during {@link MemCachedClient#flushAll()} and related methods.
6262
*/
63-
public void handleErrorOnFlush( final MemcachedClient client ,
63+
public void handleErrorOnFlush( final MemCachedClient client ,
6464
final Throwable error );
6565

6666
/**
67-
* Called for errors thrown during {@link MemcachedClient#stats()} and related methods.
67+
* Called for errors thrown during {@link MemCachedClient#stats()} and related methods.
6868
*/
69-
public void handleErrorOnStats( final MemcachedClient client ,
69+
public void handleErrorOnStats( final MemCachedClient client ,
7070
final Throwable error );
7171

7272
} // interface

‎src/com/meetup/memcached/LineInputStream.java‎ renamed to ‎src/com/danga/MemCached/LineInputStream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @author greg whalin <[email protected]>
1717
*/
18-
package com.meetup.memcached;
18+
package com.danga.MemCached;
1919

2020
import java.io.IOException;
2121

‎src/com/meetup/memcached/Logger.java‎ renamed to ‎src/com/danga/MemCached/Logger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @author Greg Whalin <[email protected]>
1717
*/
18-
package com.meetup.memcached;
18+
package com.danga.MemCached;
1919

2020
import java.util.*;
2121

‎src/com/meetup/memcached/MemcachedClient.java‎ renamed to ‎src/com/danga/MemCached/MemCachedClient.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @author Greg Whalin <[email protected]>
1717
*/
18-
package com.meetup.memcached;
18+
package com.danga.MemCached;
1919

2020
import java.util.*;
2121
import java.util.zip.*;
@@ -154,11 +154,11 @@
154154
* @author Vin Chawla <[email protected]>
155155
* @version 1.5
156156
*/
157-
public class MemcachedClient {
157+
public class MemCachedClient {
158158

159159
// logger
160160
private static Logger log =
161-
Logger.getLogger( MemcachedClient.class.getName() );
161+
Logger.getLogger( MemCachedClient.class.getName() );
162162

163163
// return codes
164164
private static final String VALUE = "VALUE"; // start of value line from server
@@ -222,7 +222,7 @@ public class MemcachedClient {
222222
/**
223223
* Creates a new instance of MemCachedClient.
224224
*/
225-
public MemcachedClient() {
225+
public MemCachedClient() {
226226
init();
227227
}
228228

@@ -232,7 +232,7 @@ public MemcachedClient() {
232232
*
233233
* @param poolName name of SockIOPool
234234
*/
235-
public MemcachedClient( String poolName ) {
235+
public MemCachedClient( String poolName ) {
236236
this.poolName = poolName;
237237
init();
238238
}
@@ -243,7 +243,7 @@ public MemcachedClient( String poolName ) {
243243
*
244244
* @param classLoader ClassLoader object.
245245
*/
246-
public MemcachedClient( ClassLoader classLoader ) {
246+
public MemCachedClient( ClassLoader classLoader ) {
247247
this.classLoader = classLoader;
248248
init();
249249
}
@@ -256,7 +256,7 @@ public MemcachedClient( ClassLoader classLoader ) {
256256
* @param classLoader ClassLoader object.
257257
* @param errorHandler ErrorHandler object.
258258
*/
259-
public MemcachedClient( ClassLoader classLoader, ErrorHandler errorHandler ) {
259+
public MemCachedClient( ClassLoader classLoader, ErrorHandler errorHandler ) {
260260
this.classLoader = classLoader;
261261
this.errorHandler = errorHandler;
262262
init();
@@ -271,7 +271,7 @@ public MemcachedClient( ClassLoader classLoader, ErrorHandler errorHandler ) {
271271
* @param errorHandler ErrorHandler object.
272272
* @param poolName SockIOPool name
273273
*/
274-
public MemcachedClient( ClassLoader classLoader, ErrorHandler errorHandler, String poolName ) {
274+
public MemCachedClient( ClassLoader classLoader, ErrorHandler errorHandler, String poolName ) {
275275
this.classLoader = classLoader;
276276
this.errorHandler = errorHandler;
277277
this.poolName = poolName;
@@ -2066,10 +2066,10 @@ else if ( line.startsWith( ERROR ) || line.startsWith( CLIENT_ERROR ) || line.st
20662066
protected final class NIOLoader {
20672067
protected Selector selector;
20682068
protected int numConns = 0;
2069-
protected MemcachedClient mc;
2069+
protected MemCachedClient mc;
20702070
protected Connection[] conns;
20712071

2072-
public NIOLoader( MemcachedClient mc ) {
2072+
public NIOLoader( MemCachedClient mc ) {
20732073
this.mc = mc;
20742074
}
20752075

@@ -2258,7 +2258,7 @@ public void doMulti( boolean asString, Map<String, StringBuilder> sockKeys, Stri
22582258
private void handleError( Throwable e, String[] keys ) {
22592259
// if we have an errorHandler, use its hook
22602260
if ( errorHandler != null )
2261-
errorHandler.handleErrorOnGet( MemcachedClient.this, e, keys );
2261+
errorHandler.handleErrorOnGet( MemCachedClient.this, e, keys );
22622262

22632263
// exception thrown
22642264
log.error( "++++ exception thrown while getting from cache on getMulti" );

‎src/com/meetup/memcached/NativeHandler.java‎ renamed to ‎src/com/danga/MemCached/NativeHandler.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @author Greg Whalin <[email protected]>
1717
*/
18-
package com.meetup.memcached;
18+
package com.danga.MemCached;
1919

2020
import java.util.Date;
2121
import org.apache.log4j.Logger;
@@ -128,43 +128,43 @@ public static boolean isHandled( Object value ) {
128128
public static int getMarkerFlag( Object value ) {
129129

130130
if ( value instanceof Byte )
131-
return MemcachedClient.MARKER_BYTE;
131+
return MemCachedClient.MARKER_BYTE;
132132

133133
if ( value instanceof Boolean )
134-
return MemcachedClient.MARKER_BOOLEAN;
134+
return MemCachedClient.MARKER_BOOLEAN;
135135

136136
if ( value instanceof Integer )
137-
return MemcachedClient.MARKER_INTEGER;
137+
return MemCachedClient.MARKER_INTEGER;
138138

139139
if ( value instanceof Long )
140-
return MemcachedClient.MARKER_LONG;
140+
return MemCachedClient.MARKER_LONG;
141141

142142
if ( value instanceof Character )
143-
return MemcachedClient.MARKER_CHARACTER;
143+
return MemCachedClient.MARKER_CHARACTER;
144144

145145
if ( value instanceof String )
146-
return MemcachedClient.MARKER_STRING;
146+
return MemCachedClient.MARKER_STRING;
147147

148148
if ( value instanceof StringBuffer )
149-
return MemcachedClient.MARKER_STRINGBUFFER;
149+
return MemCachedClient.MARKER_STRINGBUFFER;
150150

151151
if ( value instanceof Float )
152-
return MemcachedClient.MARKER_FLOAT;
152+
return MemCachedClient.MARKER_FLOAT;
153153

154154
if ( value instanceof Short )
155-
return MemcachedClient.MARKER_SHORT;
155+
return MemCachedClient.MARKER_SHORT;
156156

157157
if ( value instanceof Double )
158-
return MemcachedClient.MARKER_DOUBLE;
158+
return MemCachedClient.MARKER_DOUBLE;
159159

160160
if ( value instanceof Date )
161-
return MemcachedClient.MARKER_DATE;
161+
return MemCachedClient.MARKER_DATE;
162162

163163
if ( value instanceof StringBuilder )
164-
return MemcachedClient.MARKER_STRINGBUILDER;
164+
return MemCachedClient.MARKER_STRINGBUILDER;
165165

166166
if ( value instanceof byte[] )
167-
return MemcachedClient.MARKER_BYTEARR;
167+
return MemCachedClient.MARKER_BYTEARR;
168168

169169
return -1;
170170
}
@@ -318,43 +318,43 @@ public static Object decode( byte[] b, int flag ) throws Exception {
318318
return null;
319319

320320

321-
if ( ( flag & MemcachedClient.MARKER_BYTE ) == MemcachedClient.MARKER_BYTE )
321+
if ( ( flag & MemCachedClient.MARKER_BYTE ) == MemCachedClient.MARKER_BYTE )
322322
return decodeByte( b );
323323

324-
if ( ( flag & MemcachedClient.MARKER_BOOLEAN ) == MemcachedClient.MARKER_BOOLEAN )
324+
if ( ( flag & MemCachedClient.MARKER_BOOLEAN ) == MemCachedClient.MARKER_BOOLEAN )
325325
return decodeBoolean( b );
326326

327-
if ( ( flag & MemcachedClient.MARKER_INTEGER ) == MemcachedClient.MARKER_INTEGER )
327+
if ( ( flag & MemCachedClient.MARKER_INTEGER ) == MemCachedClient.MARKER_INTEGER )
328328
return decodeInteger( b );
329329

330-
if ( ( flag & MemcachedClient.MARKER_LONG ) == MemcachedClient.MARKER_LONG )
330+
if ( ( flag & MemCachedClient.MARKER_LONG ) == MemCachedClient.MARKER_LONG )
331331
return decodeLong( b );
332332

333-
if ( ( flag & MemcachedClient.MARKER_CHARACTER ) == MemcachedClient.MARKER_CHARACTER )
333+
if ( ( flag & MemCachedClient.MARKER_CHARACTER ) == MemCachedClient.MARKER_CHARACTER )
334334
return decodeCharacter( b );
335335

336-
if ( ( flag & MemcachedClient.MARKER_STRING ) == MemcachedClient.MARKER_STRING )
336+
if ( ( flag & MemCachedClient.MARKER_STRING ) == MemCachedClient.MARKER_STRING )
337337
return decodeString( b );
338338

339-
if ( ( flag & MemcachedClient.MARKER_STRINGBUFFER ) == MemcachedClient.MARKER_STRINGBUFFER )
339+
if ( ( flag & MemCachedClient.MARKER_STRINGBUFFER ) == MemCachedClient.MARKER_STRINGBUFFER )
340340
return decodeStringBuffer( b );
341341

342-
if ( ( flag & MemcachedClient.MARKER_FLOAT ) == MemcachedClient.MARKER_FLOAT )
342+
if ( ( flag & MemCachedClient.MARKER_FLOAT ) == MemCachedClient.MARKER_FLOAT )
343343
return decodeFloat( b );
344344

345-
if ( ( flag & MemcachedClient.MARKER_SHORT ) == MemcachedClient.MARKER_SHORT )
345+
if ( ( flag & MemCachedClient.MARKER_SHORT ) == MemCachedClient.MARKER_SHORT )
346346
return decodeShort( b );
347347

348-
if ( ( flag & MemcachedClient.MARKER_DOUBLE ) == MemcachedClient.MARKER_DOUBLE )
348+
if ( ( flag & MemCachedClient.MARKER_DOUBLE ) == MemCachedClient.MARKER_DOUBLE )
349349
return decodeDouble( b );
350350

351-
if ( ( flag & MemcachedClient.MARKER_DATE ) == MemcachedClient.MARKER_DATE )
351+
if ( ( flag & MemCachedClient.MARKER_DATE ) == MemCachedClient.MARKER_DATE )
352352
return decodeDate( b );
353353

354-
if ( ( flag & MemcachedClient.MARKER_STRINGBUILDER ) == MemcachedClient.MARKER_STRINGBUILDER )
354+
if ( ( flag & MemCachedClient.MARKER_STRINGBUILDER ) == MemCachedClient.MARKER_STRINGBUILDER )
355355
return decodeStringBuilder( b );
356356

357-
if ( ( flag & MemcachedClient.MARKER_BYTEARR ) == MemcachedClient.MARKER_BYTEARR )
357+
if ( ( flag & MemCachedClient.MARKER_BYTEARR ) == MemCachedClient.MARKER_BYTEARR )
358358
return decodeByteArr( b );
359359

360360
return null;

‎src/com/meetup/memcached/NestedIOException.java‎ renamed to ‎src/com/danga/MemCached/NestedIOException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @author Kevin A. Burton <[email protected]>
1717
*/
18-
package com.meetup.memcached;
18+
package com.danga.MemCached;
1919

2020
import java.io.*;
2121

‎src/com/meetup/memcached/SockIOPool.java‎ renamed to ‎src/com/danga/MemCached/SockIOPool.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @author greg whalin <[email protected]>
1717
*/
18-
package com.meetup.memcached;
18+
package com.danga.MemCached;
1919

2020
import java.security.MessageDigest;
2121
import java.security.NoSuchAlgorithmException;

0 commit comments

Comments
 (0)