From 8935523ff8f8fe1785a66de6e4b337c2b152bad2 Mon Sep 17 00:00:00 2001
From: Chris Tavares <ctavares@microsoft.com>
Date: Fri, 17 Aug 2012 15:32:16 -0700
Subject: [PATCH] Moving oauth filters to implementation directory

---
 .../com/microsoft/windowsazure/services/media/Exports.java    | 4 ++++
 .../services/media/{ => implementation}/ActiveToken.java      | 2 +-
 .../services/media/{ => implementation}/OAuthContract.java    | 2 +-
 .../services/media/{ => implementation}/OAuthFilter.java      | 2 +-
 .../services/media/{ => implementation}/OAuthRestProxy.java   | 2 +-
 .../media/{ => implementation}/OAuthTokenManager.java         | 2 +-
 .../media/{ => implementation}/OAuthTokenResponse.java        | 2 +-
 .../{ => implementation}/OAuthRestProxyIntegrationTest.java   | 3 ++-
 .../media/{ => implementation}/OAuthTokenManagerTest.java     | 2 +-
 9 files changed, 13 insertions(+), 8 deletions(-)
 rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/{ => implementation}/ActiveToken.java (95%)
 rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/{ => implementation}/OAuthContract.java (95%)
 rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/{ => implementation}/OAuthFilter.java (97%)
 rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/{ => implementation}/OAuthRestProxy.java (98%)
 rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/{ => implementation}/OAuthTokenManager.java (98%)
 rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/{ => implementation}/OAuthTokenResponse.java (96%)
 rename microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/{ => implementation}/OAuthRestProxyIntegrationTest.java (93%)
 rename microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/{ => implementation}/OAuthTokenManagerTest.java (98%)

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
index 2a9cd99c4b38c..a981bbde293b0 100644
--- 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/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/ActiveToken.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/ActiveToken.java
similarity index 95%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/ActiveToken.java
rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/ActiveToken.java
index 2be96a410507a..e3c5561f7b77f 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/ActiveToken.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/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/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthContract.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthContract.java
similarity index 95%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthContract.java
rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthContract.java
index b74216823c308..7e81549642f7e 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthContract.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/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/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthFilter.java
similarity index 97%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthFilter.java
rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthFilter.java
index 3fa9f48bc74ec..3b2e45a363b67 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthFilter.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/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/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthRestProxy.java
similarity index 98%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthRestProxy.java
rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthRestProxy.java
index 9ab60ed9115ce..a51eae7e82c3b 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthRestProxy.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/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/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthTokenManager.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthTokenManager.java
similarity index 98%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthTokenManager.java
rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthTokenManager.java
index 77f2b020a2cd7..9a5ffcf59afb3 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthTokenManager.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/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/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthTokenResponse.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthTokenResponse.java
similarity index 96%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthTokenResponse.java
rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/OAuthTokenResponse.java
index 95a9dae61f674..42974fb52e3f5 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/OAuthTokenResponse.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/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/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/OAuthRestProxyIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/implementation/OAuthRestProxyIntegrationTest.java
similarity index 93%
rename from microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/OAuthRestProxyIntegrationTest.java
rename to microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/implementation/OAuthRestProxyIntegrationTest.java
index 1b05d54794c3a..da1153cae4015 100644
--- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/OAuthRestProxyIntegrationTest.java
+++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/implementation/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/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/OAuthTokenManagerTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/implementation/OAuthTokenManagerTest.java
similarity index 98%
rename from microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/OAuthTokenManagerTest.java
rename to microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/implementation/OAuthTokenManagerTest.java
index 241d2ecc91e57..2cbbc85d50854 100644
--- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/OAuthTokenManagerTest.java
+++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/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.*;