[seam-commits] [seam/social] ed2021: Merge branch 'release/3.1.0.Beta3' into develop

[noreply at github.com]

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

  Commit: ed202110e61cf0f71de074513e0f30fdc2466cef
      https://github.com/seam/social/commit/ed202110e61cf0f71de074513e0f30fdc2466cef
  Author: Shane Bryzak <sbryzak at gmail.com>
  Date:   2011-10-02 (Sun, 02 Oct 2011)

  Changed paths:
    M docs/pom.xml
  M examples/web-client/pom.xml
  M services/facebook/pom.xml
  M services/linkedin/pom.xml
  M services/twitter/pom.xml

  Log Message:
  -----------
  Merge branch 'release/3.1.0.Beta3' into develop


  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


  Commit: 4b02a15d864e319c8fa7b398901f01624e1f7655
      https://github.com/seam/social/commit/4b02a15d864e319c8fa7b398901f01624e1f7655
  Author: Shane Bryzak <sbryzak at gmail.com>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M docs/pom.xml
  A docs/src/main/assembly/assembly.xml

  Log Message:
  -----------
  use standard module configuration for documentation, added assembly for distribution


  Commit: 9fd6495731391362fb93bbcb1314abbca387f027
      https://github.com/seam/social/commit/9fd6495731391362fb93bbcb1314abbca387f027
  Author: Shane Bryzak <sbryzak at gmail.com>
  Date:   2011-10-04 (Tue, 04 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:
  -----------
  Merge branch 'develop' of github.com:seam/social into develop


  Commit: 18ced5a439126708fe3bf29d85f648d6a77e998b
      https://github.com/seam/social/commit/18ced5a439126708fe3bf29d85f648d6a77e998b
  Author: Tomas Remes <tremes at redhat.com>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M examples/web-client/src/test/java/org/jboss/seam/social/examples/webclient/ftest/SocialTest.java

  Log Message:
  -----------
  update


  Commit: 780b8b92dedd07175c16366cc25f660944997f9d
      https://github.com/seam/social/commit/780b8b92dedd07175c16366cc25f660944997f9d
  Author: Tomas Remes <tremes at redhat.com>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M examples/web-client/pom.xml
  M examples/web-client/src/main/resources/META-INF/seam-beans.xml
  M examples/web-client/src/test/java/org/jboss/seam/social/examples/webclient/ftest/SocialTest.java
  A examples/web-client/src/test/resources/arquillian.xml
  R examples/web-client/src/test/resources/ftests.xml

  Log Message:
  -----------
  ftest migration to drone


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Corrected parent pom to build services module and web example


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

  Changed paths:
    R services/twitter/src/test/java/org/jboss/seam/social/test/TwitterTest.java
  A services/twitter/src/test/java/org/jboss/seam/social/twitter/test/TwitterTest.java

  Log Message:
  -----------
  Correcting deprecated shrinkwap method in Arquillian tests


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

  Changed paths:
    A impl/src/test/java/org/jboss/seam/social/MultiServicesManagerImplTest.java

  Log Message:
  -----------
  Added test for MultiServicesManagerImpl


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

  Changed paths:
    M docs/pom.xml
  A docs/src/main/assembly/assembly.xml
  M examples/web-client/pom.xml
  M examples/web-client/src/main/resources/META-INF/seam-beans.xml
  M examples/web-client/src/test/java/org/jboss/seam/social/examples/webclient/ftest/SocialTest.java
  A examples/web-client/src/test/resources/arquillian.xml
  R examples/web-client/src/test/resources/ftests.xml

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


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

  Changed paths:
    M api/src/main/java/org/jboss/seam/social/MultiServicesManager.java
  M impl/src/main/java/org/jboss/seam/social/MultiServicesManagerImpl.java
  R impl/src/test/java/org/jboss/seam/social/JsonMapperTest.java
  R impl/src/test/java/org/jboss/seam/social/MultiServicesManagerImplTest.java
  A impl/src/test/java/org/jboss/seam/social/test/JsonMapperTest.java
  A impl/src/test/java/org/jboss/seam/social/test/MultiServicesManagerImplTest.java

  Log Message:
  -----------
  Test refactoring and new tests


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

  Changed paths:
    M api/src/main/java/org/jboss/seam/social/oauth/ConfigureOAuth.java

  Log Message:
  -----------
  api key and secret become mandatory in @ConfigureOauth


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

  Changed paths:
    M examples/web-client/src/main/java/org/jboss/seam/social/examples/webclient/SocialClient.java
  M examples/web-client/src/main/webapp/WEB-INF/fragments/facebook.xhtml
  M examples/web-client/src/main/webapp/WEB-INF/fragments/linkedin.xhtml
  M examples/web-client/src/main/webapp/WEB-INF/fragments/twitter.xhtml
  M examples/web-client/src/main/webapp/callback.xhtml
  M examples/web-client/src/main/webapp/timeline.xhtml

  Log Message:
  -----------
  producing current service named bean in webclient : simplifying code and
xhtml pages


  Commit: 9e4c4b2308bc4635eb3187e491789f3eb2ace2d8
      https://github.com/seam/social/commit/9e4c4b2308bc4635eb3187e491789f3eb2ace2d8
  Author: Shane Bryzak <sbryzak at gmail.com>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  update parent, bom versions


  Commit: f1ae79bba53c462ac59fee23ad0bdb53baa8c9d0
      https://github.com/seam/social/commit/f1ae79bba53c462ac59fee23ad0bdb53baa8c9d0
  Author: Shane Bryzak <sbryzak at gmail.com>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M api/pom.xml
  M dist/pom.xml
  M docs/pom.xml
  M examples/web-client/pom.xml
  M impl/pom.xml
  M pom.xml
  M services/facebook/pom.xml
  M services/linkedin/pom.xml
  M services/twitter/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release 3.1.0.Beta4


  Commit: b30406501b0baca76d2c3bb6f7f67667e786cb5c
      https://github.com/seam/social/commit/b30406501b0baca76d2c3bb6f7f67667e786cb5c
  Author: Shane Bryzak <sbryzak at gmail.com>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M api/pom.xml
  M dist/pom.xml
  M docs/pom.xml
  M examples/web-client/pom.xml
  M impl/pom.xml
  M pom.xml
  M services/facebook/pom.xml
  M services/linkedin/pom.xml
  M services/twitter/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: 98826eebe484504c81a95f1b4504980fa27e8c26
      https://github.com/seam/social/commit/98826eebe484504c81a95f1b4504980fa27e8c26
  Author: Shane Bryzak <sbryzak at gmail.com>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M api/src/main/java/org/jboss/seam/social/MultiServicesManager.java
  M api/src/main/java/org/jboss/seam/social/oauth/ConfigureOAuth.java
  M docs/pom.xml
  A docs/src/main/assembly/assembly.xml
  M examples/web-client/pom.xml
  M examples/web-client/src/main/java/org/jboss/seam/social/examples/webclient/SocialClient.java
  M examples/web-client/src/main/resources/META-INF/seam-beans.xml
  M examples/web-client/src/main/webapp/WEB-INF/fragments/facebook.xhtml
  M examples/web-client/src/main/webapp/WEB-INF/fragments/linkedin.xhtml
  M examples/web-client/src/main/webapp/WEB-INF/fragments/twitter.xhtml
  M examples/web-client/src/main/webapp/callback.xhtml
  M examples/web-client/src/main/webapp/timeline.xhtml
  M examples/web-client/src/test/java/org/jboss/seam/social/examples/webclient/ftest/SocialTest.java
  A examples/web-client/src/test/resources/arquillian.xml
  R examples/web-client/src/test/resources/ftests.xml
  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/test/JsonMapperTest.java
  A impl/src/test/java/org/jboss/seam/social/test/MultiServicesManagerImplTest.java
  M pom.xml
  R services/twitter/src/test/java/org/jboss/seam/social/test/TwitterTest.java
  A services/twitter/src/test/java/org/jboss/seam/social/twitter/test/TwitterTest.java

  Log Message:
  -----------
  Merge branch 'release/3.1.0.Beta4'


Compare: https://github.com/seam/social/compare/987b1b5...98826ee