Update to faster xml

.gitignore

@@ -1,4 +1,4 @@
-.classpath
-.project
-.settings
 /target
+/.settings
+/.classpath
+/.project

pom.xml

@@ -5,63 +5,79 @@
     <artifactId>oss-parent</artifactId>
     <version>7</version>
   </parent>
-  <groupId>com.cribbstechnologies.clients</groupId>
+  <groupId>org.testobject</groupId>
   <artifactId>mandrillClient</artifactId>
-  <version>0.0.2-SNAPSHOT</version>
+  <version>0.0.4</version>
   <packaging>jar</packaging>
   <name>Java Mandrill Wrapper</name>
   <description>A Java wrapper for Mandrill</description>
   <url>https://github.com/cribbstechnologies/Java-Mandrill-Wrapper</url>
 
-  <developers>
-    <developer>
-      <name>Brian Cribbs</name>
-      <organization>Cribbs Technologies</organization>
-      <organizationUrl>http://www.cribbstechnologies.com/</organizationUrl>
-      <email>[email protected]</email>
-      <roles>
-        <role>Committer</role>
-      </roles>
-    </developer>
-  </developers>
-
-  <scm>
-    <url>scm:git:[email protected]:cribbstechnologies/Java-Mandrill-Wrapper.git</url>
-    <connection>scm:git:[email protected]:cribbstechnologies/Java-Mandrill-Wrapper.git</connection>
-    <developerConnection>scm:git:[email protected]:cribbstechnologies/Java-Mandrill-Wrapper.git
-    </developerConnection>
-  </scm>
-
-  <dependencies>
-  	<dependency>
-		<groupId>org.apache.httpcomponents</groupId>
-		<artifactId>httpclient</artifactId>
-		<version>4.1.1</version>
-	</dependency>
-	<dependency>
-		<groupId>junit</groupId>
-		<artifactId>junit</artifactId>
-		<version>4.10</version>
-		<scope>test</scope>
-	</dependency>
-	<dependency>
-		<groupId>org.codehaus.jackson</groupId>
-		<artifactId>jackson-mapper-asl</artifactId>
-		<version>1.9.4</version>
-	</dependency>
-	<dependency>
-		<groupId>org.mockito</groupId>
-		<artifactId>mockito-all</artifactId>
-		<version>1.8.4</version>
-		<scope>test</scope>
-	</dependency>
-	<dependency>
-		<groupId>commons-io</groupId>
-		<artifactId>commons-io</artifactId>
-		<version>2.0</version>
-		<scope>test</scope>
-	</dependency>
-
-
-  </dependencies>
+	<developers>
+		<developer>
+			<name>Brian Cribbs</name>
+			<organization>Cribbs Technologies</organization>
+			<organizationUrl>http://www.cribbstechnologies.com/</organizationUrl>
+			<email>[email protected]</email>
+			<roles>
+				<role>Committer</role>
+			</roles>
+		</developer>
+	</developers>
+
+	<distributionManagement>
+		<!-- use the following if you're not using a snapshot version. -->
+		<repository>
+			<id>nexus</id>
+			<url>http://nexus.testobject.org/nexus/content/repositories/org.testobject.external</url>
+		</repository>
+		<!-- use the following if you ARE using a snapshot version. -->
+		<snapshotRepository>
+			<id>nexus</id>
+			<url>http://nexus.testobject.org/nexus/content/repositories/org.testobject.external</url>
+		</snapshotRepository>
+	</distributionManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.10</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.8.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.0</version>
+			<scope>test</scope>
+		</dependency>
+
+
+	</dependencies>
 </project>

src/main/java/com/cribbstechnologies/clients/mandrill/model/MandrillMessage.java

@@ -14,10 +14,12 @@ public class MandrillMessage {
 	private boolean track_clicks=false;
 	private boolean auto_text=false;
 	private boolean url_strip_qs=false;
+	private String bcc_address;
 	private String[] tags = new String[0];
 	private String[] google_analytics_domains = new String[0];
 	private String[] google_analytics_campaign = new String[0];
     private List<MergeVar> global_merge_vars;
+
     List<MessageMergeVars> merge_vars;
 
 	private Map<String, String> headers;
@@ -135,11 +137,19 @@ public void setGlobal_merge_vars(List<MergeVar> global_merge_vars) {
         this.global_merge_vars = global_merge_vars;
     }
 
-    public List<MessageMergeVars> getMerge_vars() {
+	public List<MessageMergeVars> getMerge_vars() {
         return merge_vars;
     }
 
     public void setMerge_vars(List<MessageMergeVars> merge_vars) {
         this.merge_vars = merge_vars;
     }
+
+	public void setBcc_address(String bcc_address) {
+		this.bcc_address = bcc_address;
+	}
+
+	public String getBcc_address() {
+		return bcc_address;
+	}
 }

src/main/java/com/cribbstechnologies/clients/mandrill/model/MandrillResponse.java

@@ -1,6 +1,6 @@
 package com.cribbstechnologies.clients.mandrill.model;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class MandrillResponse {

src/main/java/com/cribbstechnologies/clients/mandrill/model/MandrillTemplatedMessageRequest.java

@@ -7,6 +7,15 @@ public class MandrillTemplatedMessageRequest extends BaseMandrillRequest {
 	String template_name;
 	List<TemplateContent >template_content;
 	MandrillMessage message;
+	String send_at;
+
+	public String getSend_at() {
+		return send_at;
+	}
+
+	public void setSend_at(String send_at) {
+		this.send_at = send_at;
+	}
 
 	public String getTemplate_name() {
 		return template_name;

src/main/java/com/cribbstechnologies/clients/mandrill/model/response/message/MessageResponse.java

@@ -1,15 +1,16 @@
 package com.cribbstechnologies.clients.mandrill.model.response.message;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import com.cribbstechnologies.clients.mandrill.model.response.BaseMandrillResponse;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class MessageResponse extends BaseMandrillResponse {
 
-	String email; 
+	String email;
 	String status;
-    String _id;
-    String rejectReason;
+	String _id;
+	String rejectReason;
 
 	public String getEmail() {
 		return email;
@@ -27,11 +28,11 @@ public void setStatus(String status) {
 		this.status = status;
 	}
 
-    public String get_id() {
-        return _id;
-    }
+	public String get_id() {
+		return _id;
+	}
 
-    public void set_id(String _id) {
+	public void set_id(String _id) {
         this._id = _id;
     }
 

src/main/java/com/cribbstechnologies/clients/mandrill/model/response/templates/TemplateResponse.java

@@ -1,7 +1,8 @@
 package com.cribbstechnologies.clients.mandrill.model.response.templates;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+
 import com.cribbstechnologies.clients.mandrill.model.response.BaseMandrillResponse;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown=true)
 public class TemplateResponse extends BaseMandrillResponse {

src/main/java/com/cribbstechnologies/clients/mandrill/model/response/users/PingResponse.java

@@ -1,8 +1,9 @@
 package com.cribbstechnologies.clients.mandrill.model.response.users;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import com.cribbstechnologies.clients.mandrill.model.response.BaseMandrillResponse;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class PingResponse extends BaseMandrillResponse {
 

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillMessagesRequest.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.codehaus.jackson.type.TypeReference;
+
 
 import com.cribbstechnologies.clients.mandrill.exception.RequestFailedException;
 import com.cribbstechnologies.clients.mandrill.model.MandrillMessageRequest;
@@ -11,6 +11,7 @@
 import com.cribbstechnologies.clients.mandrill.model.response.BaseMandrillAnonymousListResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.message.MessageResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.message.SendMessageResponse;
+import com.fasterxml.jackson.core.type.TypeReference;
 
 /**
  * This class holds various functions for the Mandrill Messages API

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequest.java

@@ -6,15 +6,16 @@
 import java.net.MalformedURLException;
 import java.util.List;
 
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+
 
 import com.cribbstechnologies.clients.mandrill.exception.RequestFailedException;
 import com.cribbstechnologies.clients.mandrill.model.BaseMandrillRequest;
@@ -126,5 +127,4 @@ public void setHttpClient(HttpClient httpClient) {
     public void setObjectMapper(ObjectMapper objectMapper) {
         this.objectMapper = objectMapper;
     }
-
 }

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillTagsRequest.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.codehaus.jackson.type.TypeReference;
+
 
 import com.cribbstechnologies.clients.mandrill.exception.RequestFailedException;
 import com.cribbstechnologies.clients.mandrill.model.BaseMandrillRequest;
@@ -13,6 +13,7 @@
 import com.cribbstechnologies.clients.mandrill.model.response.tags.TagListResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.tags.TagSeriesResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.tags.TagWithTime;
+import com.fasterxml.jackson.core.type.TypeReference;
 
 public class MandrillTagsRequest {
 

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillTemplatesRequest.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.codehaus.jackson.type.TypeReference;
+
 
 import com.cribbstechnologies.clients.mandrill.exception.RequestFailedException;
 import com.cribbstechnologies.clients.mandrill.model.BaseMandrillRequest;
@@ -12,6 +12,7 @@
 import com.cribbstechnologies.clients.mandrill.model.response.BaseMandrillAnonymousListResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.templates.TemplateListResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.templates.TemplateResponse;
+import com.fasterxml.jackson.core.type.TypeReference;
 
 public class MandrillTemplatesRequest {
 

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillUrlsRequest.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.codehaus.jackson.type.TypeReference;
+
 
 import com.cribbstechnologies.clients.mandrill.exception.RequestFailedException;
 import com.cribbstechnologies.clients.mandrill.model.BaseMandrillRequest;
@@ -12,6 +12,7 @@
 import com.cribbstechnologies.clients.mandrill.model.response.BaseMandrillAnonymousListResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.urls.UrlListResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.urls.UrlResponse;
+import com.fasterxml.jackson.core.type.TypeReference;
 
 public class MandrillUrlsRequest {
 

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillUsersRequest.java

@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.codehaus.jackson.type.TypeReference;
-
 import com.cribbstechnologies.clients.mandrill.exception.RequestFailedException;
 import com.cribbstechnologies.clients.mandrill.model.BaseMandrillRequest;
 import com.cribbstechnologies.clients.mandrill.model.MandrillRequestWithDomain;
@@ -18,6 +16,7 @@
 import com.cribbstechnologies.clients.mandrill.model.response.users.UsersInfoResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.users.UsersSendersResponse;
 import com.cribbstechnologies.clients.mandrill.model.response.users.VerifyResponse;
+import com.fasterxml.jackson.core.type.TypeReference;
 
 /**
  *