Merge branch 'staging.eol'

Author: Ben Pedrick

src/main/java/com/opentok/api/API_Config.java

@@ -13,8 +13,6 @@ public class API_Config {
 
 	public static final String API_SECRET = "91e6f7609074be23b40747a4651ba5a7";
 
-	public static final String API_URL = "http://staging.tokbox.com/hl";
-	// Uncomment this line when you launch your app
-	// public static final String API_URL = "https://api.opentok.com/hl";
+	public static final String API_URL = "https://api.opentok.com";
 }
 

src/main/java/com/opentok/api/OpenTokSDK.java

@@ -69,8 +69,8 @@ public String generate_token(String session_id, String role, Long expire_time, S
 		if(expire_time != null) {
 		    if(expire_time < System.currentTimeMillis() / 1000)
 				throw new OpenTokException("Expire time must be in the future");
-		    if(expire_time > (System.currentTimeMillis() / 1000 + 604800))
-				throw new OpenTokException("Expire time must be in the next 7 days");
+		    if(expire_time > (System.currentTimeMillis() / 1000 + 2592000))
+				throw new OpenTokException("Expire time must be in the next 30 days");
 			data_string_builder.append("&expire_time=");
 			data_string_builder.append(expire_time);
 		}