Fix for Issue 4 (DoUnlock NPEs on concurrent Mac/non-Mac client access)

.gitignore

@@ -0,0 +1,11 @@
+bin/
+target/
+
+# Gradle
+.gradle
+build
+
+# Eclipse
+.classpath
+.project
+.settings

build.gradle

@@ -13,157 +13,71 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-archivesBaseName = 'webdav-servlet'
-project.group = 'net.sf.webdav-servlet'
-project.version = '2.1-dev'
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'eclipse'
 
-usePlugin('war')
-usePlugin('jetty')
+archivesBaseName = 'webdav-servlet'
+group = 'net.sf.webdav-servlet'
+version = '2.0.2.JACKGENE-SNAPSHOT'
 
 sourceCompatibility = 1.5
 targetCompatibility = 1.5
 
-dependencies {
-    addMavenRepo()
+repositories {
+  if (rootProject.hasProperty('repositories.MAVEN_CENTRAL_MIRROR_URL')) {
+    maven {
+      url getProperty('repositories.MAVEN_CENTRAL_MIRROR_URL')
+    }
+  } else {
+    mavenCentral()
+  }
+}
 
-    providedCompile "javax.servlet:servlet-api:2.4"
+dependencies {
+    compile "javax.servlet:servlet-api:2.4"
 
     compile "org.slf4j:slf4j-api:1.4.3"
-    compile "org.slf4j:slf4j-log4j12:1.4.3"
-    compile "log4j:log4j:1.2.12"
     testCompile "junit:junit:4.4"
     testCompile "org.jmock:jmock:2.4.0"
     testCompile "org.springframework:spring-webmvc:2.5.2"
     testCompile "org.springframework:spring-mock:2.0.7"
-
-    addConfiguration("jettyRuntime")
-    jettyRuntime "org.mortbay.jetty:jsp-2.1:6.1.14", "org.mortbay.jetty:jetty-annotations:6.1.14"
-}
-
-defaultTasks "help"
-
-createTask ('help') {
-  println " "
-  println "available goals:"
-  println "  clean \t\tcleans the build folder"
-  println "  test \t\t\truns the test suite"
-  println "  eclipse \t\tcreates eclipse project files"
-  println "  jettyRun \t\tstarts with jetty webserver"
-  println " "
-  println "useful flags :"
-  println "  -Dskip.test \t\tskip execution of tests"
-  println " "
-  println "examples"
-  println "  ./gradlew clean dists -Dskip.test \tbuilds the distribution and skip the tests"
-}
-
-createTask('wrapper', type: Wrapper).configure {
-  urlRoot = 'http://dist.codehaus.org/gradle/'
-  gradleVersion = '0.5'
-  jarPath = 'build-libs'
+    testRuntime "org.slf4j:slf4j-log4j12:1.4.3"
 }
 
 test {
   include '**/*Test.class'
   exclude '**/net/sf/webdav/testutil/**/*Test.class'  
 }
 
-String jettyArtifactVersion = 'jetty-6.1.14'
-File jettyDistribution = new File(buildDir, jettyArtifactVersion)
-
-libs {
-	archive_jar.enabled=true
-
-	jar(classifier: 'sources') {
-		fileSet(dir: 'src/main/java')
-	}
-
-	jar(classifier: 'javadoc') {
-		fileSet(dir: new File(buildDir, "docs/javadoc"))
-	}
+task sourcesJar(type: Jar, dependsOn: classes) {
+  classifier = 'sources'
+  from sourceSets.main.allSource
 }
-
-archive_javadoc_jar.dependsOn('javadoc')
-
-dists {
-	zip() {
-		String zipRoot = "$archivesBaseName-${project.version}"
-		zipFileSet(dir: new File(buildDir, jettyArtifactVersion), prefix: zipRoot)
-	}
+task javadocJar(type: Jar, dependsOn: javadoc) {
+  classifier = 'javadoc'
+  from javadoc.destinationDir
 }
-
-archive_zip.doFirst() {
-	ant.unzip(src: new File("build-libs", jettyArtifactVersion+".zip"), dest: buildDir)
-
-	ant.delete(dir: new File(jettyDistribution, 'patches'))
-	ant.delete(dir: new File(jettyDistribution, 'modules'))
-	ant.delete(dir: new File(jettyDistribution, 'jxr'))
-	ant.delete(dir: new File(jettyDistribution, 'javadoc'))
-	ant.delete(dir: new File(jettyDistribution, 'extras'))
-	ant.delete(dir: new File(jettyDistribution, 'distribution'))
-	ant.delete(dir: new File(jettyDistribution, 'contrib'))
-	ant.delete(dir: new File(jettyDistribution, 'examples'))
-	ant.delete(dir: new File(jettyDistribution, 'contexts'))
-	ant.delete(dir: new File(jettyDistribution, 'webapps'))
-	ant.delete(file: new File(jettyDistribution, 'pom.xml'))
-	ant.delete(file: new File(jettyDistribution, 'README.txt'))
-	ant.delete(file: new File(jettyDistribution, 'VERSION.txt'))
-
-	ant.mkdir(dir: new File(jettyDistribution, 'contexts'))
-	ant.mkdir(dir: new File(jettyDistribution, 'webapps'))
-
-	ant.unzip(src: archive_war.archivePath, dest: new File(jettyDistribution, 'webapps/ROOT'))
-
-	ant.copy(file: 'src/main/scripts/start.sh', todir: jettyDistribution)
+artifacts {
+  archives sourcesJar
+  archives javadocJar
 }
 
-
-jettyRun {
-    contextPath = '/'
-    scanIntervalSeconds = 2
-    useTestClasspath = true
-    connectors = configure(new org.mortbay.jetty.nio.SelectChannelConnector()) {
-    port = 8088
-    maxIdleTime = 60000
+if (rootProject.hasProperty('uploadArchives.my.edu.clhs.baseRepositoryUrl')) {
+  uploadArchives {
+    ext.BASE_REPOSITORY_URL = getProperty('uploadArchives.my.edu.clhs.baseRepositoryUrl')
+    repositories {
+      mavenDeployer {
+        repository(url: "${BASE_REPOSITORY_URL}/release")
+        snapshotRepository(url: "${BASE_REPOSITORY_URL}/snapshot")
+        pom.whenConfigured { pom ->
+          pom.dependencies.removeAll { dep ->
+            dep.groupId == 'javax.servlet' && dep.artifactId == 'servlet-api'
+          }
+        }
+      }
+    }
+  }
 }
-}.doFirst { jettyRun ->
-    jettyRun.additionalRuntimeJars = dependencies.jettyRuntime.resolve() as List
-}
-
 
-createTask('android-webapp', dependsOn:'compile') {
-	File generatedClasses = new File(buildDir, 'generated-classes')
-	def webappClassPath = dependencies.resolve("compile");
-	def excludeArtifacts = ['servlet-api'];
-	webappClassPath.each {jarFile ->
-		excludeArtifacts.each {excludeArtifact ->
-	    	if (jarFile.toString().indexOf(excludeArtifact) == -1) {
-	        	ant.unzip(src: jarFile, dest: generatedClasses)
-	      	}
-		}
-	}
-
-	File androidWebapp = new File(buildDir, 'android-webapp/exploded')
-	androidWebapp.mkdirs();
-	File androidWebAppLib = new File(androidWebapp, "WEB-INF/lib");
-	androidWebAppLib.mkdirs();
-
-	String dxPath = System.getProperty("dxTool");
-	String argument1 = '--dex'
-	String argument2 = '--core-library'
-	String argument3 = '--output='+new File(androidWebAppLib, "classes.zip").getAbsolutePath();
-	String argument4 = '--positions=lines'
-	String argument5 = new File(buildDir, "classes").getAbsolutePath();
-	String argument6 = new File(buildDir, "generated-classes").getAbsolutePath();
-
-	def command = """${dxPath} ${argument1} ${argument2} ${argument3} ${argument4} ${argument5} ${argument6}"""// Create the String
-	println command
-	def proc = command.execute()
-	proc.waitFor()
-
-	ant.copy(file: 'src/main/webapp/WEB-INF/web.xml', todir: new File(androidWebapp, "WEB-INF"))
-	ant.war(destfile: new File(buildDir, "android-webapp/webdav-servlet.war"), basedir: androidWebapp, webxml: 'src/main/webapp/WEB-INF/web.xml')
-
-
-}
+task wrapper(type: Wrapper)

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Feb 03 21:09:06 PST 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip