Skip to content

Commit

Permalink
rename package and class name to more sane values
Browse files Browse the repository at this point in the history
  • Loading branch information
gwhalin committed Mar 17, 2008
1 parent 7bc9c54 commit 06960ed
Show file tree
Hide file tree
Showing 14 changed files with 122 additions and 123 deletions.
70 changes: 35 additions & 35 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="java_memcached" default="package" basedir=".">
<project name="memcached" default="package" basedir=".">

<property name="project.title" value="java memcached client" />
<property name="code.dir" value="src/com/danga/MemCached" />
<property name="code.dir" value="src/com/whalin/memcached" />
<property name="doc.dir" value="doc" />
<property name="src.dir" value="src" />
<property name="build.dir" value="classes" />

<property environment="env"/>
<property file="build.properties"/>
<property name="project" value="java_memcached"/>
<property name="project" value="memcached"/>

<path id="project.class.path">
<pathelement path = "lib/log4j.jar"/>
Expand All @@ -18,75 +18,75 @@
<!-- package release -->
<!-- ant package -Dver=release_1.3 -Dlog4j=1 -->
<target name="package" depends="clean, setup, log4j, logger, pkg-compile, jar, javadoc">
<tar tarfile="java_memcached-${ver}.tar.gz" basedir="." includes="java_memcached-${ver}/**" compression="gzip"/>
<zip destfile="java_memcached-${ver}.zip" basedir="." includes="java_memcached-${ver}/**"/>
<copy file="java_memcached-${ver}/java_memcached-${ver}.jar" todir="."/>
<tar tarfile="memcached-${ver}.tar.gz" basedir="." includes="memcached-${ver}/**" compression="gzip"/>
<zip destfile="memcached-${ver}.zip" basedir="." includes="memcached-${ver}/**"/>
<copy file="memcached-${ver}/memcached-${ver}.jar" todir="."/>

<checksum file="java_memcached-${ver}.tar.gz"/>
<checksum file="java_memcached-${ver}.zip"/>
<checksum file="java_memcached-${ver}.jar"/>
<delete dir="java_memcached-${ver}" />
<checksum file="memcached-${ver}.tar.gz"/>
<checksum file="memcached-${ver}.zip"/>
<checksum file="memcached-${ver}.jar"/>
<delete dir="memcached-${ver}" />

<tar tarfile="java_memcached-${ver}.tar" basedir="." includes="java_memcached-${ver}.*"/>
<tar tarfile="memcached-${ver}.tar" basedir="." includes="memcached-${ver}.*"/>
</target>

<target name="clean">
<delete dir="${build.dir}"/>
<delete dir="java_memcached-${ver}" />
<delete file="java_memcached-${ver}.tar.gz"/>
<delete file="java_memcached-${ver}.zip"/>
<delete file="java_memcached-${ver}.jar"/>
<delete file="java_memcached-${ver}.tar.gz.MD5"/>
<delete file="java_memcached-${ver}.zip.MD5"/>
<delete file="java_memcached-${ver}.jar.MD5"/>
<delete dir="memcached-${ver}" />
<delete file="memcached-${ver}.tar.gz"/>
<delete file="memcached-${ver}.zip"/>
<delete file="memcached-${ver}.jar"/>
<delete file="memcached-${ver}.tar.gz.MD5"/>
<delete file="memcached-${ver}.zip.MD5"/>
<delete file="memcached-${ver}.jar.MD5"/>
</target>

<target name="setup">
<mkdir dir="java_memcached-${ver}"/>
<mkdir dir="java_memcached-${ver}/javadocs"/>
<mkdir dir="java_memcached-${ver}/src/com/danga/MemCached"/>
<mkdir dir="java_memcached-${ver}/classes"/>
<mkdir dir="java_memcached-${ver}/doc"/>
<mkdir dir="memcached-${ver}"/>
<mkdir dir="memcached-${ver}/javadocs"/>
<mkdir dir="memcached-${ver}/src/com/whalin/memcached"/>
<mkdir dir="memcached-${ver}/classes"/>
<mkdir dir="memcached-${ver}/doc"/>

<!-- copy source -->
<copy todir="java_memcached-${ver}/src/com/danga/MemCached">
<copy todir="memcached-${ver}/src/com/whalin/memcached">
<fileset dir="${code.dir}" defaultexcludes="true" excludes="**/*.xml **/*.swp **/*.swo"/>
</copy>

<!-- copy doc dir -->
<copy todir="java_memcached-${ver}/doc">
<copy todir="memcached-${ver}/doc">
<fileset dir="${doc.dir}" defaultexcludes="true" excludes="**/*.swp **/*.swo"/>
</copy>

<!-- copy license to root -->
<copy file="${doc.dir}/LICENSE.txt" todir="java_memcached-${ver}"/>
<copy file="${doc.dir}/LICENSE.txt" todir="memcached-${ver}"/>

<!-- copy changelog to root -->
<copy file="${doc.dir}/CHANGELOG.txt" todir="java_memcached-${ver}"/>
<copy file="${doc.dir}/CHANGELOG.txt" todir="memcached-${ver}"/>
</target>

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

<target name="logger" unless="log4j" depends="clean, setup">
<replace dir="java_memcached-${ver}/src/com/danga/MemCached" token="import org.apache.log4j.Logger;" value="//import org.apache.log4j.Logger;">
<replace dir="memcached-${ver}/src/com/whalin/memcached" token="import org.apache.log4j.Logger;" value="//import org.apache.log4j.Logger;">
<include name="**/*.java"/>
</replace>
</target>

<!-- javadocs -->
<target name="javadoc" depends="clean, setup, log4j, logger">
<delete>
<fileset dir="java_memcached-${ver}/javadocs" />
<fileset dir="memcached-${ver}/javadocs" />
</delete>

<javadoc sourcepath="java_memcached-${ver}/src"
destdir="java_memcached-${ver}/javadocs"
packagenames= "com.danga.*"
<javadoc sourcepath="memcached-${ver}/src"
destdir="memcached-${ver}/javadocs"
packagenames= "com.whalin.*"
author= "true"
private="true"
version="true"
Expand All @@ -101,13 +101,13 @@

<!-- compilation target for packeging operations -->
<target name="pkg-compile" depends="clean, setup, log4j, logger">
<javac debug="yes" srcdir="java_memcached-${ver}/src" destdir="java_memcached-${ver}/classes" deprecation="true">
<javac debug="yes" srcdir="memcached-${ver}/src" destdir="memcached-${ver}/classes" deprecation="true">
<classpath refid="project.class.path"/>
</javac>
</target>

<target name="jar" depends="pkg-compile">
<jar compress="yes" jarfile="java_memcached-${ver}/java_memcached-${ver}.jar" basedir="java_memcached-${ver}/classes"/>
<jar compress="yes" jarfile="memcached-${ver}/memcached-${ver}.jar" basedir="memcached-${ver}/classes"/>
</target>

<!-- compilation target -->
Expand Down
2 changes: 1 addition & 1 deletion src/com/whalin/memcached/ByteBufArrayInputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @author greg whalin <[email protected]>
* @version 2.0
*/
package com.danga.MemCached;
package com.whalin.memcached;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion src/com/whalin/memcached/ContextObjectInputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @author Vin Chawla <[email protected]>
* @version 2.0
*/
package com.danga.MemCached;
package com.whalin.memcached;

import java.util.*;
import java.util.zip.*;
Expand Down
2 changes: 1 addition & 1 deletion src/com/whalin/memcached/ErrorHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* @author Dan Zivkovic <[email protected]>
* @version 2.0
*/
package com.danga.MemCached;
package com.whalin.memcached;

public interface ErrorHandler {

Expand Down
2 changes: 1 addition & 1 deletion src/com/whalin/memcached/LineInputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* @author greg whalin <[email protected]>
* @version 2.0
*/
package com.danga.MemCached;
package com.whalin.memcached;

import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion src/com/whalin/memcached/Logger.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* @author Greg Whalin <[email protected]>
* @version 2.0
*/
package com.danga.MemCached;
package com.whalin.memcached;

import java.util.*;

Expand Down
48 changes: 24 additions & 24 deletions src/com/whalin/memcached/MemCachedClient.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* MemCached client for Java
* Memcached client for Java
* Copyright (c) 2008 Greg Whalin
* All rights reserved.
*
Expand All @@ -17,7 +17,7 @@
* @author Greg Whalin <[email protected]>
* @version 2.0
*/
package com.danga.MemCached;
package com.whalin.memcached;

import java.util.*;
import java.util.zip.*;
Expand Down Expand Up @@ -45,7 +45,7 @@
* Some examples of use follow.<br/>
* <h3>To create cache client object and set params:</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
*
* // compression is enabled by default
* mc.setCompressEnable(true);
Expand All @@ -59,14 +59,14 @@
* </pre>
* <h3>To store an object:</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String key = "cacheKey1";
* Object value = SomeClass.getObject();
* mc.set(key, value);
* </pre>
* <h3>To store an object using a custom server hashCode:</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String key = "cacheKey1";
* Object value = SomeClass.getObject();
* Integer hash = new Integer(45);
Expand All @@ -80,20 +80,20 @@
* </ul>
* <h3>To delete a cache entry:</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String key = "cacheKey1";
* mc.delete(key);
* </pre>
* <h3>To delete a cache entry using a custom hash code:</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String key = "cacheKey1";
* Integer hash = new Integer(45);
* mc.delete(key, hashCode);
* </pre>
* <h3>To store a counter and then increment or decrement that counter:</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String key = "counterKey";
* mc.storeCounter(key, new Integer(100));
* System.out.println("counter after adding 1: " mc.incr(key));
Expand All @@ -103,7 +103,7 @@
* </pre>
* <h3>To store a counter and then increment or decrement that counter with custom hash:</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String key = "counterKey";
* Integer hash = new Integer(45);
* mc.storeCounter(key, new Integer(100), hash);
Expand All @@ -114,38 +114,38 @@
* </pre>
* <h3>To retrieve an object from the cache:</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String key = "key";
* Object value = mc.get(key);
* </pre>
* <h3>To retrieve an object from the cache with custom hash:</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String key = "key";
* Integer hash = new Integer(45);
* Object value = mc.get(key, hash);
* </pre>
* <h3>To retrieve an multiple objects from the cache</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String[] keys = { "key", "key1", "key2" };
* Map&lt;Object&gt; values = mc.getMulti(keys);
* </pre>
* <h3>To retrieve an multiple objects from the cache with custom hashing</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* String[] keys = { "key", "key1", "key2" };
* Integer[] hashes = { new Integer(45), new Integer(32), new Integer(44) };
* Map&lt;Object&gt; values = mc.getMulti(keys, hashes);
* </pre>
* <h3>To flush all items in server(s)</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* mc.flushAll();
* </pre>
* <h3>To get stats from server(s)</h3>
* <pre>
* MemCachedClient mc = new MemCachedClient();
* MemcachedClient mc = new MemcachedClient();
* Map stats = mc.stats();
* </pre>
*
Expand All @@ -156,7 +156,7 @@
* @author Vin Chawla <[email protected]>
* @version 1.5
*/
public class MemCachedClient {
public class MemcachedClient {

// logger
private static Logger log =
Expand Down Expand Up @@ -224,7 +224,7 @@ public class MemCachedClient {
/**
* Creates a new instance of MemCachedClient.
*/
public MemCachedClient() {
public MemcachedClient() {
init();
}

Expand All @@ -234,7 +234,7 @@ public MemCachedClient() {
*
* @param poolName name of SockIOPool
*/
public MemCachedClient( String poolName ) {
public MemcachedClient( String poolName ) {
this.poolName = poolName;
init();
}
Expand All @@ -245,7 +245,7 @@ public MemCachedClient( String poolName ) {
*
* @param classLoader ClassLoader object.
*/
public MemCachedClient( ClassLoader classLoader ) {
public MemcachedClient( ClassLoader classLoader ) {
this.classLoader = classLoader;
init();
}
Expand All @@ -258,7 +258,7 @@ public MemCachedClient( ClassLoader classLoader ) {
* @param classLoader ClassLoader object.
* @param errorHandler ErrorHandler object.
*/
public MemCachedClient( ClassLoader classLoader, ErrorHandler errorHandler ) {
public MemcachedClient( ClassLoader classLoader, ErrorHandler errorHandler ) {
this.classLoader = classLoader;
this.errorHandler = errorHandler;
init();
Expand All @@ -273,7 +273,7 @@ public MemCachedClient( ClassLoader classLoader, ErrorHandler errorHandler ) {
* @param errorHandler ErrorHandler object.
* @param poolName SockIOPool name
*/
public MemCachedClient( ClassLoader classLoader, ErrorHandler errorHandler, String poolName ) {
public MemcachedClient( ClassLoader classLoader, ErrorHandler errorHandler, String poolName ) {
this.classLoader = classLoader;
this.errorHandler = errorHandler;
this.poolName = poolName;
Expand Down Expand Up @@ -2041,10 +2041,10 @@ else if ( line.startsWith( ERROR ) || line.startsWith( CLIENT_ERROR ) || line.st
protected final class NIOLoader {
protected Selector selector;
protected int numConns = 0;
protected MemCachedClient mc;
protected MemcachedClient mc;
protected Connection[] conns;

public NIOLoader( MemCachedClient mc ) {
public NIOLoader( MemcachedClient mc ) {
this.mc = mc;
}

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

// exception thrown
log.error( "++++ exception thrown while getting from cache on getMulti" );
Expand Down
Loading

0 comments on commit 06960ed

Please sign in to comment.