Author: ieb
Date: Thu Jul 24 08:07:13 2008
New Revision: 679433
URL: http://svn.apache.org/viewvc?rev=679433&view=rev
Log:
opensocial.oauth was binding to core.oauth via DeligatedPrincipal, moved
into opensocial.oauth
Added:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/DelegatedPrincipal.java
- copied, changed from r679392,
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.java
Removed:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java?rev=679433&r1=679432&r2=679433&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
Thu Jul 24 08:07:13 2008
@@ -21,6 +21,7 @@
import org.apache.shindig.common.SecurityTokenDecoder;
import org.apache.shindig.common.SecurityTokenException;
import org.apache.shindig.common.servlet.GuiceServletContextListener;
+import org.apache.shindig.social.opensocial.oauth.DelegatedPrincipal;
import org.apache.shindig.social.opensocial.oauth.OAuthConsumerStore;
import org.apache.shindig.social.opensocial.oauth.OAuthTokenPrincipalMapper;
import org.apache.shindig.social.opensocial.oauth.OAuthTokenStore;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.java?rev=679433&r1=679432&r2=679433&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.java
Thu Jul 24 08:07:13 2008
@@ -18,6 +18,7 @@
package org.apache.shindig.social.core.oauth;
import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.social.opensocial.oauth.DelegatedPrincipal;
public class GadgetSecurityTokenPrincipal extends DelegatedPrincipal {
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.java?rev=679433&r1=679432&r2=679433&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.java
Thu Jul 24 08:07:13 2008
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.core.oauth;
+import org.apache.shindig.social.opensocial.oauth.DelegatedPrincipal;
+
public class RequestorIdPrincipal extends DelegatedPrincipal {
private String container;
Copied:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/DelegatedPrincipal.java
(from r679392,
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/DelegatedPrincipal.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/DelegatedPrincipal.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.java&r1=679392&r2=679433&rev=679433&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/DelegatedPrincipal.java
Thu Jul 24 08:07:13 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.core.oauth;
+package org.apache.shindig.social.opensocial.oauth;
import java.security.Principal;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java?rev=679433&r1=679432&r2=679433&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java
Thu Jul 24 08:07:13 2008
@@ -17,7 +17,6 @@
*/
package org.apache.shindig.social.opensocial.oauth;
-import org.apache.shindig.social.core.oauth.DelegatedPrincipal;
import net.oauth.OAuthMessage;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java?rev=679433&r1=679432&r2=679433&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java
Thu Jul 24 08:07:13 2008
@@ -18,7 +18,7 @@
package org.apache.shindig.social.core.oauth;
import org.apache.shindig.social.core.oauth.BasicOAuthTokenPrincipalMapper;
-import org.apache.shindig.social.core.oauth.DelegatedPrincipal;
+import org.apache.shindig.social.opensocial.oauth.DelegatedPrincipal;
import junit.framework.TestCase;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java?rev=679433&r1=679432&r2=679433&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java
Thu Jul 24 08:07:13 2008
@@ -22,8 +22,8 @@
import org.apache.shindig.common.crypto.Crypto;
import org.apache.shindig.social.EasyMockTestCase;
import org.apache.shindig.social.core.oauth.AuthenticationServletFilter;
-import org.apache.shindig.social.core.oauth.DelegatedPrincipal;
import org.apache.shindig.social.core.oauth.RequestorIdPrincipal;
+import org.apache.shindig.social.opensocial.oauth.DelegatedPrincipal;
import org.apache.shindig.social.opensocial.oauth.OAuthConsumerStore;
import org.apache.shindig.social.opensocial.oauth.OAuthPrincipal;
import org.apache.shindig.social.opensocial.oauth.OAuthTokenPrincipalMapper;
