Adapted Spring Social Showcase to use new <social:connected> JSP tag.

spring-social-showcase/pom.xml

@@ -9,9 +9,9 @@
 	<version>1.0.0</version>
 	<properties>
 		<java-version>1.6</java-version>
-		<org.springframework.social-version>1.0.1.BUILD-SNAPSHOT</org.springframework.social-version>
-		<org.springframework.social.facebook-version>1.0.1.BUILD-SNAPSHOT</org.springframework.social.facebook-version>
-		<org.springframework.social.twitter-version>1.0.1.BUILD-SNAPSHOT</org.springframework.social.twitter-version>
+		<org.springframework.social-version>1.0.2.BUILD-SNAPSHOT</org.springframework.social-version>
+		<org.springframework.social.facebook-version>1.0.2.BUILD-SNAPSHOT</org.springframework.social.facebook-version>
+		<org.springframework.social.twitter-version>1.0.2.BUILD-SNAPSHOT</org.springframework.social.twitter-version>
 		<org.springframework-version>3.1.0.RELEASE</org.springframework-version>
 		<org.springframework.security-version>3.1.0.RELEASE</org.springframework.security-version>
 		<org.slf4j-version>1.6.1</org.slf4j-version>

spring-social-showcase/src/main/java/org/springframework/social/showcase/config/WebMvcConfig.java

@@ -22,10 +22,8 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
 import org.springframework.social.connect.ConnectionRepository;
-import org.springframework.social.showcase.ConnectedToHandlerInterceptor;
 import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.view.UrlBasedViewResolver;
@@ -43,10 +41,6 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
 	@Inject
 	private ConnectionRepository connectionRepository;
 
-	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(new ConnectedToHandlerInterceptor(connectionRepository));		
-	}
-
 	@Bean
 	public ViewResolver viewResolver() {
 		UrlBasedViewResolver viewResolver = new UrlBasedViewResolver();

spring-social-showcase/src/main/webapp/WEB-INF/layouts/menu.jsp

@@ -1,10 +1,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://www.springframework.org/tags" prefix="s" %>
+<%@ taglib uri="http://www.springframework.org/spring-social/social/tags" prefix="social" %>
 
 <h4><a href="<c:url value="/connect"/>">Connections</a></h4>
 
 <h4><a href="<c:url value="/twitter"/>">Twitter</a></h4>
-<c:if test="${connectedToTwitter}">
+<social:connected provider="twitter">
 <ul class="menu">
 	<li><a href="<c:url value="/twitter"/>">User Profile</a></li>
 	<li><a href="<c:url value="/twitter/timeline"/>">Timeline</a></li>
@@ -13,14 +14,14 @@
 	<li><a href="<c:url value="/twitter/messages"/>">Messages</a></li>
 	<li><a href="<c:url value="/twitter/trends/daily"/>">Daily Trends</a></li>
 </ul>
-</c:if>
+</social:connected>
 
 <h4><a href="<c:url value="/facebook"/>">Facebook</a></h4>
-<c:if test="${connectedToFacebook}">
+<social:connected provider="facebook">
 <ul class="menu">
 	<li><a href="<c:url value="/facebook"/>">User Profile</a></li>
 	<li><a href="<c:url value="/facebook/feed"/>">Feed</a></li>
 	<li><a href="<c:url value="/facebook/friends"/>">Friends</a></li>
 	<li><a href="<c:url value="/facebook/albums"/>">Albums</a></li>
 </ul>
-</c:if>
+</social:connected>