Added basic Campaign, Template support plus added some minor improvements

.gitignore

@@ -7,3 +7,13 @@ target/
 **/*.iml
 **/.idea
 bin/
+
+mailjimp-core/src/test/resources/mailjimp-test.properties
+
+mailjimp-core/src/test/resources/mailjimp.properties
+
+.project
+
+.settings/org.eclipse.core.resources.prefs
+
+.settings/org.eclipse.m2e.core.prefs

README.markdown

@@ -2,6 +2,10 @@
 
 #### About
 
+This fork is adapted from the original.  My goal is to add in some missing service calls surrounding templates and campaigns.
+
+#### Original About.
+
 MailJimp is a MailChimp library built in Java intended for use within Maven-enabled Spring-based applications.  MailJimp was tested against version 1.3 of the MailChimp API though most of the methods will work with version 1.2. (But I really don't know why you would use it ;)
 The Maven part is not mandatory, of course - feel free to download the source and build yourself the library.  The Spring part is also not mandatory, as long as you deploy the library in a container that understands the `@PostConstruct` annotation, or you manually invoke `MailJimpService::init()` after construction.
 

mailjimp-core/pom.xml

@@ -4,7 +4,7 @@
   <name>MailChimp Java API - Core Components</name>
 
   <parent>
-    <groupId>net.mailjimp</groupId>
+    <groupId>ca.morningstar.mailjimp</groupId>
     <artifactId>mailjimp-parent</artifactId>
     <version>0.4-SNAPSHOT</version>
   </parent>
@@ -60,4 +60,5 @@
       <version>2.1</version>
     </dependency>
   </dependencies>
+  <groupId>ca.morningstar.mailjimp</groupId>
 </project>

mailjimp-core/src/main/java/mailjimp/dom/MailJimpConstants.java

@@ -32,4 +32,23 @@ public interface MailJimpConstants extends Serializable {
   String           MERGE_EMAIL_TYPE = "EMAIL_TYPE";
   String           MERGE_GROUPINGS  = "GROUPINGS";
   String           MERGE_GROUPS     = "groups";
+
+  // Campaign Consts
+
+  final String			CAMPAIGNTYPE_REGULAR = "regular";
+  final String			CAMPAIGNTYPE_PLAINTEXT = "plaintext";
+  final String			CAMPAIGNTYPE_ABSPLIT = "absplit";
+  final String			CAMPAIGNTYPE_RSS = "rss";
+  final String			CAMPAIGNTYPE_AUTO = "auto";
+
+  final String 			CAMPAIGNSTATUS_SENT = "sent";
+  final String 			CAMPAIGNSTATUS_SAVE = "save";
+  final String 			CAMPAIGNSTATUS_PAUSED = "paused";
+  final String 			CAMPAIGNSTATUS_SCHEDULE = "schedule";
+  final String 			CAMPAIGNSTATUS_SENDING = "sending";
+
+  final String 			CAMPAIGNMEMBER_STATUS_SENT = "sent";
+  final String			CAMPAIGNMEMBER_STATUS_HARDBOUNCE = "hard";
+  final String			CAMPAIGNMEMBER_STATUS_SOFTBOUNCE = "soft";
+  final String			CAMPAIGNMEMBER_STATUS_ALL = "";
 }

mailjimp-core/src/main/java/mailjimp/dom/request/MailJimpRequest.java

@@ -20,7 +20,7 @@
 import java.io.Serializable;
 
 public abstract class MailJimpRequest implements Serializable {
-  protected String apikey;
+protected String apikey;
 
   protected MailJimpRequest(String apikey) {
     this.apikey = apikey;

mailjimp-core/src/main/java/mailjimp/dom/request/NamedBoolean.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2011 Tim Gilbert
+ *
+ * This file is part of MailJimp and forked MailJimp under https://github.com/knaak/MailJimp
+ *
+ * MailJimp is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * MailJimp is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with MailJimp.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package mailjimp.dom.request;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class NamedBoolean {
+
+	@JsonProperty
+	private String name;
+
+	@JsonProperty
+	private Boolean value;
+
+	public NamedBoolean(String name, Boolean value)
+	{
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Boolean getValue() {
+		return value;
+	}
+
+	public void setValue(Boolean value) {
+		this.value = value;
+	}
+
+
+}

mailjimp-core/src/main/java/mailjimp/dom/request/campaign/CampaignCreateRequest.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2011 Michael Laccetti and Tim Gilbert
+ *
+ * This file is part of MailJimp and forked MailJimp under https://github.com/knaak/MailJimp
+ *
+ * MailJimp is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * MailJimp is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with MailJimp.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package mailjimp.dom.request.campaign;
+
+import java.util.HashMap;
+
+import mailjimp.dom.request.MailJimpRequest;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class CampaignCreateRequest extends MailJimpRequest {
+
+	@JsonProperty
+	private String type;
+
+	@JsonProperty
+	HashMap<String,Object> options;
+
+	@JsonProperty
+	HashMap<String,String> content;
+
+
+	public CampaignCreateRequest(String apikey, String type, HashMap<String,Object> options,HashMap<String,String> content) {
+		super(apikey);
+
+		this.type = type;
+		this.options = options;
+		this.content = content;
+	}
+
+	static public HashMap<String,Object> buildOptions(String listId, String campaignName, String subject,  String fromEmail, String fromName, String toName, String googleUA)
+	{
+		HashMap<String,Object> options = new HashMap<String,Object>();
+
+		options.put("list_id", listId);
+		options.put("title", campaignName);
+		options.put("subject", subject);
+		options.put("from_email",fromEmail);
+		options.put("from_name",fromName);
+		options.put("to_name",toName);
+
+		if (googleUA != null)
+		{
+			HashMap<String,String> googleua = new HashMap<String,String>(1);
+			googleua.put("google", googleUA);		
+			options.put("analytics", googleua);
+		}
+
+		return options;
+	}
+
+	static public HashMap<String,String> buildContentFromString(String html, String text)
+	{
+		HashMap<String,String> content = new HashMap<String,String>();
+		content.put("html", html);
+		content.put("text", text);
+		return content;
+
+	}
+
+	static public HashMap<String,String> buildContentFromUrl(String url)
+	{
+		HashMap<String,String> content = new HashMap<String,String>();
+		content.put("url", url);
+		return content;		
+	}
+
+	static public HashMap<String,String> buildContentFromArchive(String archiveBase64, String archiveType)
+	{
+		HashMap<String,String> content = new HashMap<String,String>();
+		content.put("archive", archiveBase64);
+		content.put("archive_type", archiveType);
+		return content;		
+	}
+
+
+
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public HashMap<String, Object> getOptions() {
+		return options;
+	}
+
+	public void setOptions(HashMap<String, Object> options) {
+		this.options = options;
+	}
+
+	public HashMap<String, String> getContent() {
+		return content;
+	}
+
+	public void setContent(HashMap<String, String> content) {
+		this.content = content;
+	}
+}

mailjimp-core/src/main/java/mailjimp/dom/request/campaign/CampaignDeleteRequest.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2011 Michael Laccetti and Tim Gilbert
+ *
+ * This file is part of MailJimp and forked MailJimp under https://github.com/knaak/MailJimp
+ *
+ * MailJimp is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * MailJimp is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with MailJimp.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package mailjimp.dom.request.campaign;
+
+import mailjimp.dom.request.MailJimpRequest;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class CampaignDeleteRequest extends MailJimpRequest {
+
+
+	@JsonProperty("cid")
+	private String campaignId;	
+
+	public CampaignDeleteRequest(String apikey, String campaignId) {
+		super(apikey);
+		this.campaignId = campaignId;
+
+	}
+
+	public String getCampaignId() {
+		return campaignId;
+	}
+
+	public void setCampaignId(String campaignId) {
+		this.campaignId = campaignId;
+	}
+
+}