mavenized things.

bvision · Apr 18, 2013 · b53f0c2 · b53f0c2
1 parent b3f6fe0
commit b53f0c2
Show file tree

Hide file tree

Showing 116 changed files with 416 additions and 213 deletions.
diff --git a/.classpath b/.classpath
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="src" output="target/classes" path="src/main/java">
+                <attributes>
+                        <attribute name="optional" value="true"/>
+                        <attribute name="maven.pomderived" value="true"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+                <attributes>
+                        <attribute name="optional" value="true"/>
+                        <attribute name="maven.pomderived" value="true"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+                <attributes>
+                        <attribute name="maven.pomderived" value="true"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+                <attributes>
+                        <attribute name="maven.pomderived" value="true"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<projectDescription>
+  <name>sardine</name>
+  <comment>An easy to use webdav client for java.</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.m2e.core.maven2Builder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.m2e.core.maven2Nature</nature>
+  </natures>
+</projectDescription>
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,156 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.github.lookfirst</groupId>
+    <artifactId>sardine</artifactId>
+    <packaging>jar</packaging>
+    <version>2.0</version>
+    <description>An easy to use webdav client for java</description>
+    <name>Sardine WEBDAV client</name>
+    <url>https://github.com/lookfirst/sardine</url>
+    <licenses>
+        <license>
+            <name>Apache 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            	<version>3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            	<version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.googlecode.sardine.Version</mainClass>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            	<version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+            	<version>2.5.2</version>
+                <configuration>
+                    <instrumentation>
+                        <excludes>
+                            <!-- Generated class -->
+                            <exclude>com/googlecode/sardine/model/*.class</exclude>
+                            <!-- not interested in ant commands -->
+                            <exclude>com/googlecode/sardine/ant/*.class</exclude>
+                            <exclude>com/googlecode/sardine/ant/command/*.class</exclude>
+                        </excludes>
+                    </instrumentation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>instrument</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.2.3</version>
+        </dependency>
+
+        <!-- JAXB is not included in JDK 5. -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.1.12</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+
+        <!-- ant and junit must be defined as provided for a succesful compile. -->
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.9.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- test utilities -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.9.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+        	<groupId>org.slf4j</groupId>
+        	<artifactId>slf4j-api</artifactId>
+        	<version>1.7.5</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/src/com/googlecode/sardine/DavAce.java → src/main/java/com/github/sardine/DavAce.java b/src/com/googlecode/sardine/DavAce.java → src/main/java/com/github/sardine/DavAce.java
@@ -1,11 +1,11 @@
-package com.googlecode.sardine;
+package com.github.sardine;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.googlecode.sardine.model.*;
-import com.googlecode.sardine.util.SardineUtil;
+import com.github.sardine.model.*;
+import com.github.sardine.util.SardineUtil;
 
 /**
  * An Access control element (ACE) either grants or denies a particular set of (non-

diff --git a/src/com/googlecode/sardine/DavAcl.java → src/main/java/com/github/sardine/DavAcl.java b/src/com/googlecode/sardine/DavAcl.java → src/main/java/com/github/sardine/DavAcl.java
@@ -1,11 +1,11 @@
-package com.googlecode.sardine;
+package com.github.sardine;
 
-import com.googlecode.sardine.model.Ace;
-import com.googlecode.sardine.model.Acl;
-import com.googlecode.sardine.model.Group;
-import com.googlecode.sardine.model.Owner;
-import com.googlecode.sardine.model.Propstat;
-import com.googlecode.sardine.model.Response;
+import com.github.sardine.model.Ace;
+import com.github.sardine.model.Acl;
+import com.github.sardine.model.Group;
+import com.github.sardine.model.Owner;
+import com.github.sardine.model.Propstat;
+import com.github.sardine.model.Response;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/com/googlecode/sardine/DavPrincipal.java → ...java/com/github/sardine/DavPrincipal.java b/src/com/googlecode/sardine/DavPrincipal.java → ...java/com/github/sardine/DavPrincipal.java
@@ -1,6 +1,6 @@
-package com.googlecode.sardine;
+package com.github.sardine;
 
-import com.googlecode.sardine.model.Principal;
+import com.github.sardine.model.Principal;
 
 import javax.xml.namespace.QName;
 

diff --git a/src/com/googlecode/sardine/DavResource.java → .../java/com/github/sardine/DavResource.java b/src/com/googlecode/sardine/DavResource.java → .../java/com/github/sardine/DavResource.java
@@ -5,17 +5,17 @@
  * License for the specific language governing permissions and limitations under the License.
  */
 
-package com.googlecode.sardine;
+package com.github.sardine;
 
-import com.googlecode.sardine.model.Creationdate;
-import com.googlecode.sardine.model.Getcontentlength;
-import com.googlecode.sardine.model.Getcontenttype;
-import com.googlecode.sardine.model.Getetag;
-import com.googlecode.sardine.model.Getlastmodified;
-import com.googlecode.sardine.model.Propstat;
-import com.googlecode.sardine.model.Resourcetype;
-import com.googlecode.sardine.model.Response;
-import com.googlecode.sardine.util.SardineUtil;
+import com.github.sardine.model.Creationdate;
+import com.github.sardine.model.Getcontentlength;
+import com.github.sardine.model.Getcontenttype;
+import com.github.sardine.model.Getetag;
+import com.github.sardine.model.Getlastmodified;
+import com.github.sardine.model.Propstat;
+import com.github.sardine.model.Resourcetype;
+import com.github.sardine.model.Response;
+import com.github.sardine.util.SardineUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;

diff --git a/src/com/googlecode/sardine/Sardine.java → ...main/java/com/github/sardine/Sardine.java b/src/com/googlecode/sardine/Sardine.java → ...main/java/com/github/sardine/Sardine.java
@@ -1,4 +1,4 @@
-package com.googlecode.sardine;
+package com.github.sardine;
 
 import javax.xml.namespace.QName;
 import java.io.IOException;

diff --git a/...om/googlecode/sardine/SardineFactory.java → ...va/com/github/sardine/SardineFactory.java b/...om/googlecode/sardine/SardineFactory.java → ...va/com/github/sardine/SardineFactory.java
@@ -1,6 +1,6 @@
-package com.googlecode.sardine;
+package com.github.sardine;
 
-import com.googlecode.sardine.impl.SardineImpl;
+import com.github.sardine.impl.SardineImpl;
 
 import java.net.ProxySelector;
 

diff --git a/src/com/googlecode/sardine/Version.java → ...main/java/com/github/sardine/Version.java b/src/com/googlecode/sardine/Version.java → ...main/java/com/github/sardine/Version.java
@@ -1,4 +1,4 @@
-package com.googlecode.sardine;
+package com.github.sardine;
 
 /**
  * Provides version information from the manifest.

diff --git a/src/com/googlecode/sardine/ant/Command.java → .../java/com/github/sardine/ant/Command.java b/src/com/googlecode/sardine/ant/Command.java → .../java/com/github/sardine/ant/Command.java
@@ -1,4 +1,4 @@
-package com.googlecode.sardine.ant;
+package com.github.sardine.ant;
 
 import org.apache.tools.ant.ProjectComponent;
 

diff --git a/...m/googlecode/sardine/ant/SardineTask.java → ...a/com/github/sardine/ant/SardineTask.java b/...m/googlecode/sardine/ant/SardineTask.java → ...a/com/github/sardine/ant/SardineTask.java
@@ -1,19 +1,19 @@
-package com.googlecode.sardine.ant;
+package com.github.sardine.ant;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 
-import com.googlecode.sardine.Sardine;
-import com.googlecode.sardine.SardineFactory;
-import com.googlecode.sardine.ant.command.Copy;
-import com.googlecode.sardine.ant.command.CreateDirectory;
-import com.googlecode.sardine.ant.command.Delete;
-import com.googlecode.sardine.ant.command.Exists;
-import com.googlecode.sardine.ant.command.Move;
-import com.googlecode.sardine.ant.command.Put;
+import com.github.sardine.Sardine;
+import com.github.sardine.SardineFactory;
+import com.github.sardine.ant.command.Copy;
+import com.github.sardine.ant.command.CreateDirectory;
+import com.github.sardine.ant.command.Delete;
+import com.github.sardine.ant.command.Exists;
+import com.github.sardine.ant.command.Move;
+import com.github.sardine.ant.command.Put;
 
 /**
  * Controller for the Sardine ant Task

diff --git a/.../googlecode/sardine/ant/command/Copy.java → .../com/github/sardine/ant/command/Copy.java b/.../googlecode/sardine/ant/command/Copy.java → .../com/github/sardine/ant/command/Copy.java
@@ -1,6 +1,6 @@
-package com.googlecode.sardine.ant.command;
+package com.github.sardine.ant.command;
 
-import com.googlecode.sardine.ant.Command;
+import com.github.sardine.ant.Command;
 
 import java.io.IOException;
 

diff --git a/.../sardine/ant/command/CreateDirectory.java → .../sardine/ant/command/CreateDirectory.java b/.../sardine/ant/command/CreateDirectory.java → .../sardine/ant/command/CreateDirectory.java
@@ -1,6 +1,6 @@
-package com.googlecode.sardine.ant.command;
+package com.github.sardine.ant.command;
 
-import com.googlecode.sardine.ant.Command;
+import com.github.sardine.ant.Command;
 
 import java.io.IOException;
 

diff --git a/...ooglecode/sardine/ant/command/Delete.java → ...om/github/sardine/ant/command/Delete.java b/...ooglecode/sardine/ant/command/Delete.java → ...om/github/sardine/ant/command/Delete.java
@@ -1,6 +1,6 @@
-package com.googlecode.sardine.ant.command;
+package com.github.sardine.ant.command;
 
-import com.googlecode.sardine.ant.Command;
+import com.github.sardine.ant.Command;
 
 import java.io.IOException;
 

diff --git a/...ooglecode/sardine/ant/command/Exists.java → ...om/github/sardine/ant/command/Exists.java b/...ooglecode/sardine/ant/command/Exists.java → ...om/github/sardine/ant/command/Exists.java
@@ -1,6 +1,6 @@
-package com.googlecode.sardine.ant.command;
+package com.github.sardine.ant.command;
 
-import com.googlecode.sardine.ant.Command;
+import com.github.sardine.ant.Command;
 
 import java.io.IOException;
 

diff --git a/.../googlecode/sardine/ant/command/Move.java → .../com/github/sardine/ant/command/Move.java b/.../googlecode/sardine/ant/command/Move.java → .../com/github/sardine/ant/command/Move.java
@@ -1,6 +1,6 @@
-package com.googlecode.sardine.ant.command;
+package com.github.sardine.ant.command;
 
-import com.googlecode.sardine.ant.Command;
+import com.github.sardine.ant.Command;
 
 import java.io.IOException;
 

diff --git a/...m/googlecode/sardine/ant/command/Put.java → ...a/com/github/sardine/ant/command/Put.java b/...m/googlecode/sardine/ant/command/Put.java → ...a/com/github/sardine/ant/command/Put.java
@@ -1,6 +1,6 @@
-package com.googlecode.sardine.ant.command;
+package com.github.sardine.ant.command;
 
-import com.googlecode.sardine.ant.Command;
+import com.github.sardine.ant.Command;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;

diff --git a/...ode/sardine/ant/command/package-info.java → ...hub/sardine/ant/command/package-info.java b/...ode/sardine/ant/command/package-info.java → ...hub/sardine/ant/command/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Ant task comamnds.
  */
-package com.googlecode.sardine.ant.command;
+package com.github.sardine.ant.command;
diff --git a/.../googlecode/sardine/ant/package-info.java → .../com/github/sardine/ant/package-info.java b/.../googlecode/sardine/ant/package-info.java → .../com/github/sardine/ant/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Ant task support.
  */
-package com.googlecode.sardine.ant;
+package com.github.sardine.ant;
diff --git a/...om/googlecode/sardine/ant/sardinetask.xml → ...va/com/github/sardine/ant/sardinetask.xml b/...om/googlecode/sardine/ant/sardinetask.xml → ...va/com/github/sardine/ant/sardinetask.xml