diff --git a/.classpath b/.classpath deleted file mode 100644 index 27aa3c0e8..000000000 --- a/.classpath +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index e2edc5c0a..f78b9b761 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,11 @@ .settings +.classpath +.project cobertura.ser +lib/ivy* target/ reports/ +build/ junit* *.iml *~ \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index df56570b5..000000000 --- a/.project +++ /dev/null @@ -1,12 +0,0 @@ - - spymemcached - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - diff --git a/LICENSE.txt b/LICENSE.txt index 010cb4a9e..1e15ff490 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,5 @@ -Copyright (c) 2006-2009 Dustin Sallings +Copyright (c) 2006-2009 Dustin Sallings +Copyright (c) 2009-2011 Couchbase, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/build.xml b/build.xml new file mode 100644 index 000000000..d9bfca02a --- /dev/null +++ b/build.xml @@ -0,0 +1,583 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + You need Apache Ivy 2.0 or later from http://ant.apache.org/ + It could not be loaded from ${ivy_repo_url} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Testing against ${server.type} + IPV4 address ${server.address_v4} + IPV6 address ${server.address_v6} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildfile b/buildfile deleted file mode 100644 index 8722e2a9d..000000000 --- a/buildfile +++ /dev/null @@ -1,117 +0,0 @@ -# -*- mode: ruby -*- -# Generated by Buildr 1.2.10, change to your liking -# Version number for this release -VERSION_NUMBER = `git describe`.strip -# Version number for the next release -NEXT_VERSION = VERSION_NUMBER -# Group identifier for your projects -GROUP = "spy" -COPYRIGHT = "2006-2011 Dustin Sallings, Matt Ingenthron" - -PROJECT_NAME = "spymemcached" - -TEST_SERVER_V4 = ENV['SPYMC_TEST_SERVER_V4'] || "127.0.0.1" -TEST_SERVER_V6 = ENV['SPYMC_TEST_SERVER_V6'] || ENV['SPYMC_TEST_SERVER_V4'] || "::1" - -SERVER_TYPE=ENV['SPYMC_SERVER_TYPE'] || "memcached" - -puts "Using server at ipv4 #{TEST_SERVER_V4}" -puts "Using server at ipv6 #{TEST_SERVER_V6}" -puts "Server is type #{SERVER_TYPE}" - -def compute_released_verions - h = {} - `git tag`.reject{|i| i =~ /pre|rc/}.map{|v| v.strip}.each do |v| - a=v.split('.') - h[a[0..1].join('.')] = v - end - require 'set' - rv = Set.new h.values - rv << VERSION_NUMBER - rv -end - -RELEASED_VERSIONS=compute_released_verions.sort.reverse - -# Specify Maven 2.0 remote repositories here, like this: -repositories.release_to = 'sftp://ingenthr@cb-web01.couchbase.com/var/www/domains/membase.org/files/htdocs/maven2' -repositories.remote << "http://www.ibiblio.org/maven2/" -repositories.remote << "http://bleu.west.spy.net/~dustin/m2repo/" -repositories.remote << "https://repository.jboss.org/nexus/content/repositories/releases/" - -require 'buildr/java/emma' - -plugins=[ - 'spy:m1compat:rake:1.0', - 'spy:site:rake:1.2.4', - 'spy:git_tree_version:rake:1.0', - 'spy:build_info:rake:1.1.1' -] - -plugins.each do |spec| - artifact(spec).tap do |plugin| - plugin.invoke - load plugin.name - end -end - -desc "Java memcached client" -define "spymemcached" do - - test.options[:java_args] = "-ea" - test.include "*Test" - if SERVER_TYPE == 'memcached' then - test.exclude '*VBucketMemcachedClientTest', '*BucketMonitorTest', - '*ConfigurationProviderHTTPTest', '*CouchbaseClientTest', - '*MembaseClientTest' - end - if SERVER_TYPE == 'membase' then - test.exclude '*CouchbaseClientTest' - end - test.using :fork=>:each, :properties=>{ 'server.address_v4'=>TEST_SERVER_V4, - 'server.address_v6'=>TEST_SERVER_V6, - 'server.type'=>SERVER_TYPE } - - TREE_VER=tree_version - puts "Tree version is #{TREE_VER}" - - project.version = VERSION_NUMBER - project.group = GROUP - compile.options.target = '1.5' - manifest["Implementation-Vendor"] = COPYRIGHT - manifest['Copyright'] = COPYRIGHT - compile.with "log4j:log4j:jar:1.2.15", "jmock:jmock:jar:1.2.0", - "junit:junit:jar:4.7", "org.jboss.netty:netty:jar:3.1.5.GA", - "org.springframework:spring-beans:jar:3.0.3.RELEASE", - "org.codehaus.jettison:jettison:jar:1.1", - "commons-codec:commons-codec:jar:1.5", - "org.easymock:easymock:jar:2.4", - "org.easymock:easymockclassextension:jar:2.4", - "junit-addons:junit-addons:jar:1.4", - "cglib:cglib:jar:2.2.2", "asm:asm:jar:3.3.1", - "org.apache.httpcomponents:httpcore:jar:4.1.1", - "org.apache.httpcomponents:httpcore-nio:jar:4.1.1" - - # Gen build - gen_build_info "net.spy.memcached", "git" - compile.from "target/generated-src" - resources.from "target/generated-rsrc" - - package(:jar).with :manifest => - manifest.merge("Main-Class" => "net.spy.memcached.BuildInfo") - - package :sources - package :javadoc - javadoc.using(:windowtitle => "javadocs for spymemcached #{TREE_VER}", - :doctitle => "Javadocs for spymemcached #{TREE_VER}", - :use => true, - :charset => 'utf-8', - :overview => 'src/main/java/net/spy/memcached/overview.html', - :group => { 'Core' => 'net.spy.memcached' }, - :link => 'http://java.sun.com/j2se/1.5.0/docs/api/') - - emma.exclude 'net.spy.memcached.test.*' - emma.exclude 'net.spy.memcached.BuildInfo' - -end -# vim: syntax=ruby et ts=2 diff --git a/etc/checkstyle-java-header.txt b/etc/checkstyle-java-header.txt new file mode 100644 index 000000000..14cbec5b3 --- /dev/null +++ b/etc/checkstyle-java-header.txt @@ -0,0 +1,21 @@ +^/\*\*$ +(^ \* Copyright \(C\) \d{4}+-\d{4}+ [a-zA-Z,. ]+$)+ +^ \*$ +^ \* Permission is hereby granted, free of charge, to any person obtaining a copy$ +^ \* of this software and associated documentation files \(the "Software"\), to deal$ +^ \* in the Software without restriction, including without limitation the rights$ +^ \* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell$ +^ \* copies of the Software, and to permit persons to whom the Software is$ +^ \* furnished to do so, subject to the following conditions:$ +^ \*$ +^ \* The above copyright notice and this permission notice shall be included in$ +^ \* all copies or substantial portions of the Software.$ +^ \*$ +^ \* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR$ +^ \* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,$ +^ \* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE$ +^ \* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER$ +^ \* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING$ +^ \* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALING$ +^ \* IN THE SOFTWARE.$ +^ \*/$ \ No newline at end of file diff --git a/etc/checkstyle-noframes.xsl b/etc/checkstyle-noframes.xsl new file mode 100644 index 000000000..ab887d6e0 --- /dev/null +++ b/etc/checkstyle-noframes.xsl @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +

CheckStyle Audit

Designed for use with CheckStyle and Ant.
+
+ + + +
+ + + +
+ + + +
+ + + +
+ + +

Files

+ + + + + + + + + + + + + + +
NameErrors
+
+ + + +

File

+ + + + + + + + + + + + + + +
Error DescriptionLine
+ Back to top +
+ + +

Summary

+ + + + + + + + + + + + +
FilesErrors
+
+ + + + a + b + + +
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml new file mode 100644 index 000000000..e2bea2e29 --- /dev/null +++ b/etc/checkstyle.xml @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ivy.xml b/ivy.xml new file mode 100644 index 000000000..85a3b5ab1 --- /dev/null +++ b/ivy.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml new file mode 100644 index 000000000..5424fb786 --- /dev/null +++ b/ivy/ivysettings.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ivy/libraries.properties b/ivy/libraries.properties new file mode 100644 index 000000000..23ef262f7 --- /dev/null +++ b/ivy/libraries.properties @@ -0,0 +1,41 @@ +# Copyright (c) 2009-2011 Couchbase, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is furnished to do +# so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +checkstyle.version=5.0 + +findbugs.version=1.3.9 + +ivy.version=2.2.0 +mvn.version=2.0.10 + +asm.version=3.3.1 +cglib.version=2.2.2 +commons-codec.version=1.5 +easymock.version=2.4 +easymock-extension.version=2.4 +httpcore.version=4.1.1 +httpcore-nio.version=4.1.1 +jettison.version=1.1 +jmock.version=1.2.0 +junit.version=4.7 +junit-addons.version=1.4 +log4j.version=1.2.15 +netty.version=3.1.5.GA +spring-beans.version=3.0.3.RELEASE diff --git a/ivy/spymemcached.xml b/ivy/spymemcached.xml new file mode 100644 index 000000000..1c3033f8f --- /dev/null +++ b/ivy/spymemcached.xml @@ -0,0 +1,64 @@ + + + + + + + + Spymemcached + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/ant-contrib-1.0b3.jar b/lib/ant-contrib-1.0b3.jar new file mode 100644 index 000000000..062537661 Binary files /dev/null and b/lib/ant-contrib-1.0b3.jar differ diff --git a/lib/ant-eclipse-1.0-jvm1.2.jar b/lib/ant-eclipse-1.0-jvm1.2.jar new file mode 100644 index 000000000..8630b5db1 Binary files /dev/null and b/lib/ant-eclipse-1.0-jvm1.2.jar differ