merge message stuff in

Author: Doug Black

src/main/java/com/twilio/sdk/examples/RestExamples.java

@@ -10,7 +10,7 @@
 import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.TwilioRestResponse;
 import com.twilio.sdk.resource.factory.CallFactory;
-import com.twilio.sdk.resource.factory.SmsFactory;
+import com.twilio.sdk.resource.factory.MessageFactory;
 import com.twilio.sdk.resource.instance.Account;
 import com.twilio.sdk.resource.instance.AvailablePhoneNumber;
 import com.twilio.sdk.resource.instance.Call;
@@ -80,14 +80,14 @@ public static void main(String[] args) throws TwilioRestException {
 		Call call = callFactory.create(callParams);
 		System.out.println(call.getSid());
 
-		// Send an sms
-		SmsFactory smsFactory = mainAccount.getSmsFactory();
-		Map<String, String> smsParams = new HashMap<String, String>();
-		smsParams.put("To", "5105551212"); // Replace with a valid phone number
-		smsParams.put("From", "(510) 555-1212"); // Replace with a valid phone
-													// number in your account
-		smsParams.put("Body", "This is a test message!");
-		smsFactory.create(smsParams);
+		// Send an sms (using the new messages endpoint)
+		MessageFactory messageFactory = mainAccount.getMessageFactory();
+		List<NameValuePair> messageParams = new ArrayList<NameValuePair>();
+		messageParams.add(new BasicNameValuePair("To", "5105551212")); // Replace with a valid phone number
+		messageParams.add(new BasicNameValuePair("From", "(510) 555-1212")); // Replace with a valid phone
+		// number in your account
+		messageParams.add(new BasicNameValuePair("Body", "This is a test message!"));
+		messageFactory.create(messageParams);
 
 		// Search for available phone numbers & then buy a random phone number
 		AvailablePhoneNumberList phoneNumbers = mainAccount

src/main/java/com/twilio/sdk/resource/InstanceResource.java

@@ -148,4 +148,5 @@ protected Date parseDate(String inDate) {
 			return null;
 		}
 	}
+
 }

src/main/java/com/twilio/sdk/resource/factory/MessageFactory.java

@@ -0,0 +1,24 @@
+package com.twilio.sdk.resource.factory;
+
+import java.util.Map;
+import java.util.List;
+
+import com.twilio.sdk.TwilioRestException;
+import com.twilio.sdk.resource.instance.Message;
+import org.apache.http.NameValuePair;
+
+// TODO: Auto-generated Javadoc
+/**
+ * A factory for creating Message objects.
+ */
+public interface MessageFactory {
+
+	/**
+	 * Creates the message.
+	 *
+	 * @param params the params list
+	 * @return the message
+	 * @throws TwilioRestException
+   */
+	public Message create(List<NameValuePair> params) throws TwilioRestException;
+}