[seam-commits] [seam/social] 2ea8cd: Added Mockito support and first Test on JsonMapper

[noreply at github.com]

  Branch: refs/heads/develop
  Home:   https://github.com/seam/social

  Commit: 2ea8cd1d286c29bf85f54b90c73478b1f43bad59
      https://github.com/seam/social/commit/2ea8cd1d286c29bf85f54b90c73478b1f43bad59
  Author: Antoine Sabot-Durand <antoine at sabot-durand.net>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M impl/pom.xml
  M impl/src/main/java/org/jboss/seam/social/MultiServicesManagerImpl.java
  M impl/src/main/java/org/jboss/seam/social/SeamSocialExtension.java
  A impl/src/test/java/org/jboss/seam/social/JsonMapperTest.java

  Log Message:
  -----------
  Added Mockito support and first Test on JsonMapper


  Commit: dbba80408e46c9f00ec8aa5d5d7485a74b21e3c6
      https://github.com/seam/social/commit/dbba80408e46c9f00ec8aa5d5d7485a74b21e3c6
  Author: Antoine Sabot-Durand <antoine at sabot-durand.net>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M docs/pom.xml
  M examples/web-client/pom.xml
  M examples/web-client/src/main/java/org/jboss/seam/social/examples/webclient/SocialClient.java
  M impl/pom.xml
  M impl/src/main/java/org/jboss/seam/social/OAuthServiceBase.java
  M impl/src/main/java/org/jboss/seam/social/SeamSocialExtension.java
  M pom.xml
  M services/facebook/pom.xml
  M services/facebook/src/main/java/org/jboss/seam/social/facebook/jackson/FacebookJackson.java
  M services/linkedin/pom.xml
  M services/twitter/pom.xml
  M services/twitter/src/main/java/org/jboss/seam/social/twitter/jackson/TwitterJackson.java
  M services/twitter/src/test/java/org/jboss/seam/social/test/TwitterTest.java
  M services/twitter/src/test/resources/META-INF/beans.xml

  Log Message:
  -----------
  Merge branch 'develop' of github.com:seam/social into develop

Conflicts:
	impl/pom.xml


  Commit: 9dd61bc5711fc1243322702192fda4584a020590
      https://github.com/seam/social/commit/9dd61bc5711fc1243322702192fda4584a020590
  Author: Antoine Sabot-Durand <antoine at sabot-durand.net>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M impl/pom.xml

  Log Message:
  -----------
  Added the right Junit dependy in pom to allow test to run


Compare: https://github.com/seam/social/compare/ed20211...9dd61bc