Merge pull request Azure#4 from gcheng/dev

Dev
joostdenijs · Aug 21, 2012 · af16f0e · af16f0e
2 parents 1215618 + a823f08
commit af16f0e
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 8 deletions.
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/Exports.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/Exports.java
@@ -15,6 +15,10 @@
 package com.microsoft.windowsazure.services.media;
 
 import com.microsoft.windowsazure.services.core.Builder;
+import com.microsoft.windowsazure.services.media.implementation.OAuthContract;
+import com.microsoft.windowsazure.services.media.implementation.OAuthFilter;
+import com.microsoft.windowsazure.services.media.implementation.OAuthRestProxy;
+import com.microsoft.windowsazure.services.media.implementation.OAuthTokenManager;
 
 public class Exports implements Builder.Exports {
 

diff --git a/...dowsazure/services/media/ActiveToken.java → ...ces/media/implementation/ActiveToken.java b/...dowsazure/services/media/ActiveToken.java → ...ces/media/implementation/ActiveToken.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.windowsazure.services.media;
+package com.microsoft.windowsazure.services.media.implementation;
 
 import java.util.Date;
 

diff --git a/...wsazure/services/media/OAuthContract.java → ...s/media/implementation/OAuthContract.java b/...wsazure/services/media/OAuthContract.java → ...s/media/implementation/OAuthContract.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.windowsazure.services.media;
+package com.microsoft.windowsazure.services.media.implementation;
 
 import java.net.URI;
 

diff --git a/...dowsazure/services/media/OAuthFilter.java → ...ces/media/implementation/OAuthFilter.java b/...dowsazure/services/media/OAuthFilter.java → ...ces/media/implementation/OAuthFilter.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.microsoft.windowsazure.services.media;
+package com.microsoft.windowsazure.services.media.implementation;
 
 import java.net.URISyntaxException;
 

diff --git a/...sazure/services/media/OAuthRestProxy.java → .../media/implementation/OAuthRestProxy.java b/...sazure/services/media/OAuthRestProxy.java → .../media/implementation/OAuthRestProxy.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.microsoft.windowsazure.services.media;
+package com.microsoft.windowsazure.services.media.implementation;
 
 import java.io.IOException;
 import java.net.URI;

diff --git a/...ure/services/media/OAuthTokenManager.java → ...dia/implementation/OAuthTokenManager.java b/...ure/services/media/OAuthTokenManager.java → ...dia/implementation/OAuthTokenManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.windowsazure.services.media;
+package com.microsoft.windowsazure.services.media.implementation;
 
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/...re/services/media/OAuthTokenResponse.java → ...ia/implementation/OAuthTokenResponse.java b/...re/services/media/OAuthTokenResponse.java → ...ia/implementation/OAuthTokenResponse.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.windowsazure.services.media;
+package com.microsoft.windowsazure.services.media.implementation;
 
 import org.codehaus.jackson.annotate.JsonProperty;
 

diff --git a/.../media/OAuthRestProxyIntegrationTest.java → ...tation/OAuthRestProxyIntegrationTest.java b/.../media/OAuthRestProxyIntegrationTest.java → ...tation/OAuthRestProxyIntegrationTest.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.microsoft.windowsazure.services.media;
+package com.microsoft.windowsazure.services.media.implementation;
 
 import static org.junit.Assert.*;
 
@@ -21,6 +21,7 @@
 import org.junit.Test;
 
 import com.microsoft.windowsazure.services.core.Configuration;
+import com.microsoft.windowsazure.services.media.MediaConfiguration;
 import com.sun.jersey.api.client.Client;
 
 public class OAuthRestProxyIntegrationTest {

diff --git a/...services/media/OAuthTokenManagerTest.java → ...implementation/OAuthTokenManagerTest.java b/...services/media/OAuthTokenManagerTest.java → ...implementation/OAuthTokenManagerTest.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.microsoft.windowsazure.services.media;
+package com.microsoft.windowsazure.services.media.implementation;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;