Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #79 from gcheng/configupdate

stop adding https to media service uri.
  • Loading branch information...
commit 88d06de11c2f86e285c89d825922388260fc7dc5 2 parents 69d8659 + 69aa511
Albert Cheng authored
View
22 ...azure-api/src/main/java/com/microsoft/windowsazure/services/media/MediaConfiguration.java
@@ -55,8 +55,8 @@
* Creates a media service configuration using the specified media service base URI, OAUTH URI,
* client ID, and client secret.
*
- * @param mediaServiceBaseUri
- * A <code>String</code> object that represents the media service base URI.
+ * @param mediaServiceUri
+ * A <code>String</code> object that represents the media service URI.
*
* @param oAuthUri
* A <code>String</code> object that represents the OAUTH URI.
@@ -75,9 +75,9 @@
* <code>MediaService</code> class.
*
*/
- public static Configuration configureWithOAuthAuthentication(String mediaServiceBaseUri, String oAuthUri,
+ public static Configuration configureWithOAuthAuthentication(String mediaServiceUri, String oAuthUri,
String clientId, String clientSecret, String scope) {
- return configureWithOAuthAuthentication(null, Configuration.getInstance(), mediaServiceBaseUri, oAuthUri,
+ return configureWithOAuthAuthentication(null, Configuration.getInstance(), mediaServiceUri, oAuthUri,
clientId, clientSecret, scope);
}
@@ -88,8 +88,8 @@ public static Configuration configureWithOAuthAuthentication(String mediaService
* @param configuration
* A previously instantiated <code>Configuration</code> object.
*
- * @param mediaServiceBaseUri
- * A <code>String</code> object that represents the base URI of Media service.
+ * @param mediaServiceUri
+ * A <code>String</code> object that represents the URI of media service.
*
* @param oAuthUri
* A <code>String</code> object that represents the URI of OAuth service.
@@ -109,7 +109,7 @@ public static Configuration configureWithOAuthAuthentication(String mediaService
*
*/
public static Configuration configureWithOAuthAuthentication(Configuration configuration,
- String mediaServiceBaseUri, String oAuthUri, String clientId, String clientSecret, String scope) {
+ String mediaServiceUri, String oAuthUri, String clientId, String clientSecret, String scope) {
return configureWithOAuthAuthentication(null, configuration, mediaServiceBaseUri, oAuthUri, clientId,
clientSecret, scope);
}
@@ -124,8 +124,8 @@ public static Configuration configureWithOAuthAuthentication(Configuration confi
* @param configuration
* A previously instantiated <code>Configuration</code> object.
*
- * @param mediaServiceBaseUri
- * A <code>String</code> object that represents the base URI of media service.
+ * @param mediaServiceUri
+ * A <code>String</code> object that represents the URI of media service.
*
* @param oAuthUri
* A <code>String</code> object that represents the URI of OAUTH service.
@@ -145,7 +145,7 @@ public static Configuration configureWithOAuthAuthentication(Configuration confi
*
*/
public static Configuration configureWithOAuthAuthentication(String profile, Configuration configuration,
- String mediaServiceBaseUri, String oAuthUri, String clientId, String clientSecret, String scope) {
+ String mediaServiceUri, String oAuthUri, String clientId, String clientSecret, String scope) {
if (profile == null) {
profile = "";
@@ -154,7 +154,7 @@ else if (profile.length() != 0 && !profile.endsWith(".")) {
profile = profile + ".";
}
- configuration.setProperty(profile + URI, "https://" + mediaServiceBaseUri);
+ configuration.setProperty(profile + URI, mediaServiceUri);
configuration.setProperty(profile + OAUTH_URI, oAuthUri);
configuration.setProperty(profile + OAUTH_CLIENT_ID, clientId);
configuration.setProperty(profile + OAUTH_CLIENT_SECRET, clientSecret);

0 comments on commit 88d06de

Please sign in to comment.
Something went wrong with that request. Please try again.