updated to spring social latest snapshot in prep for m2 release

spring-attic · Feb 9, 2011 · 89937de · 89937de
1 parent acd52f5
commit 89937de
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,9 +16,10 @@
 	<version>1.0.0-BUILD-SNAPSHOT</version>
 	<properties>
 		<java-version>1.6</java-version>
-		<org.springframework-version>3.1.0.BUILD-SNAPSHOT</org.springframework-version>
-		<org.springframework.security-version>3.0.5.RELEASE</org.springframework.security-version>
-		<org.springframework.integration-version>2.0.2.RELEASE</org.springframework.integration-version>		
+		<org.springframework-version>3.1.0.BUILD-SNAPSHOT</org.springframework-version>		
+		<org.springframework.security-version>3.0.5.RELEASE</org.springframework.security-version>		
+		<org.springframework.integration-version>2.0.2.RELEASE</org.springframework.integration-version>
+		<org.springframework.social-version>1.0.0.BUILD-SNAPSHOT</org.springframework.social-version>			
 		<org.aspectj-version>1.6.9</org.aspectj-version>
 		<org.slf4j-version>1.6.1</org.slf4j-version>
 	</properties>
@@ -106,17 +107,37 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-mail</artifactId>
 			<version>${org.springframework.integration-version}</version>
+		</dependency>				
+		<dependency>
+			<groupId>org.springframework.mobile</groupId>
+			<artifactId>spring-mobile-device</artifactId>
+        	<version>1.0.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-core</artifactId>
-        	<version>1.0.0.M1</version>
+        	<version>${org.springframework.social-version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.mobile</groupId>
-			<artifactId>spring-mobile-device</artifactId>
-        	<version>1.0.0.M3</version>
+			<groupId>org.springframework.social</groupId>
+			<artifactId>spring-social-facebook</artifactId>
+        	<version>${org.springframework.social-version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.social</groupId>
+			<artifactId>spring-social-twitter</artifactId>
+        	<version>${org.springframework.social-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.social</groupId>
+			<artifactId>spring-social-linkedin</artifactId>
+        	<version>${org.springframework.social-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.social</groupId>
+			<artifactId>spring-social-tripit</artifactId>
+        	<version>${org.springframework.social-version}</version>
+		</dependency>						
 
 		<!-- Aspect J -->
 		<dependency>

diff --git a/.../java/com/springsource/greenhouse/config/AnnotationMethodHandlerAdapterPostProcessor.java b/.../java/com/springsource/greenhouse/config/AnnotationMethodHandlerAdapterPostProcessor.java
@@ -23,7 +23,7 @@
 import org.springframework.format.datetime.joda.JodaTimeContextHolder;
 import org.springframework.mobile.device.DeviceWebArgumentResolver;
 import org.springframework.security.core.Authentication;
-import org.springframework.social.facebook.FacebookWebArgumentResolver;
+import org.springframework.social.facebook.web.FacebookWebArgumentResolver;
 import org.springframework.web.bind.support.WebArgumentResolver;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;

diff --git a/src/main/java/com/springsource/greenhouse/connect/providers/FacebookConnectController.java b/src/main/java/com/springsource/greenhouse/connect/providers/FacebookConnectController.java
@@ -15,16 +15,14 @@
  */
 package com.springsource.greenhouse.connect.providers;
 
-import java.io.IOException;
-
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.security.core.Authentication;
-import org.springframework.social.facebook.FacebookAccessToken;
 import org.springframework.social.facebook.FacebookLink;
 import org.springframework.social.facebook.FacebookOperations;
-import org.springframework.social.facebook.FacebookUserId;
+import org.springframework.social.facebook.web.FacebookAccessToken;
+import org.springframework.social.facebook.web.FacebookUserId;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -94,12 +92,13 @@ private void postToWall(FacebookOperations api, Account account) {
 	}
 
 	private void useFacebookProfilePicture(FacebookOperations api, Account account, String facebookUserId) {
-		try {
-			byte[] imageBytes = api.getProfilePicture(facebookUserId);
-	        profilePictureService.saveProfilePicture(account.getId(), imageBytes);
-		} catch (IOException e) {
-			FlashMap.setWarningMessage("Greenhouse was unable to use your Facebook profile picture.");
-		}
+		// TODO uncomment when available in Spring Social
+		// try {
+			//String pictureUrl = api.getProfilePictureUrl();
+	        //profilePictureService.saveProfilePicture(account.getId(), pictureUrl);
+		//} catch (IOException e) {
+		//	FlashMap.setWarningMessage("Greenhouse was unable to use your Facebook profile picture.");
+		//}
 	}
 
 }
diff --git a/src/main/java/com/springsource/greenhouse/connect/providers/LinkedInServiceProvider.java b/src/main/java/com/springsource/greenhouse/connect/providers/LinkedInServiceProvider.java
@@ -20,8 +20,8 @@
 
 import com.springsource.greenhouse.connect.AbstractServiceProvider;
 import com.springsource.greenhouse.connect.AccountConnectionRepository;
-import com.springsource.greenhouse.connect.ServiceProviderParameters;
 import com.springsource.greenhouse.connect.OAuthToken;
+import com.springsource.greenhouse.connect.ServiceProviderParameters;
 
 /**
  * LinkedIn ServiceProvider implementation.

diff --git a/src/main/java/com/springsource/greenhouse/connect/providers/TripItServiceProvider.java b/src/main/java/com/springsource/greenhouse/connect/providers/TripItServiceProvider.java
@@ -20,8 +20,8 @@
 
 import com.springsource.greenhouse.connect.AbstractServiceProvider;
 import com.springsource.greenhouse.connect.AccountConnectionRepository;
-import com.springsource.greenhouse.connect.ServiceProviderParameters;
 import com.springsource.greenhouse.connect.OAuthToken;
+import com.springsource.greenhouse.connect.ServiceProviderParameters;
 
 /**
  * TripIt ServiceProvider implementation.

diff --git a/src/main/java/com/springsource/greenhouse/home/GlobalExceptionResolver.java b/src/main/java/com/springsource/greenhouse/home/GlobalExceptionResolver.java
@@ -21,7 +21,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.social.core.AccountNotConnectedException;
+import org.springframework.social.AccountNotConnectedException;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.ModelAndView;

diff --git a/src/main/java/com/springsource/greenhouse/invite/InviteController.java b/src/main/java/com/springsource/greenhouse/invite/InviteController.java
@@ -21,8 +21,8 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
-import org.springframework.social.facebook.FacebookUserId;
-import org.springframework.social.facebook.FacebookWebArgumentResolver;
+import org.springframework.social.facebook.web.FacebookUserId;
+import org.springframework.social.facebook.web.FacebookWebArgumentResolver;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;

diff --git a/src/main/java/com/springsource/greenhouse/signin/FacebookSigninController.java b/src/main/java/com/springsource/greenhouse/signin/FacebookSigninController.java
@@ -17,10 +17,10 @@
 
 import javax.inject.Inject;
 
-import org.springframework.social.facebook.FacebookAccessToken;
 import org.springframework.social.facebook.FacebookOperations;
 import org.springframework.social.facebook.FacebookProfile;
 import org.springframework.social.facebook.FacebookTemplate;
+import org.springframework.social.facebook.web.FacebookAccessToken;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -30,8 +30,8 @@
 import com.springsource.greenhouse.account.AccountRepository;
 import com.springsource.greenhouse.account.AccountUtils;
 import com.springsource.greenhouse.account.SignInNotFoundException;
-import com.springsource.greenhouse.connect.ServiceProvider;
 import com.springsource.greenhouse.connect.NoSuchAccountConnectionException;
+import com.springsource.greenhouse.connect.ServiceProvider;
 
 /**
  * UI Controller that allows you to signin with your Facebook account, if your local member account has been connected to Facebook.