From 2f0c8ff946d42073b4af5fc6fb0b0e7e25db9c66 Mon Sep 17 00:00:00 2001 From: Ricardo Franco Date: Fri, 16 Jan 2015 15:17:05 -0200 Subject: [PATCH] split project in two silhouette and testkit --- build.sbt | 129 ------------------ project/Build.scala | 22 +++ project/BuildSettings.scala | 127 +++++++++++++++++ project/Dependencies.scala | 31 +++++ project/Helper.scala | 44 ------ project/build.properties | 2 +- .../mohiva/play/silhouette/test/Fakes.scala | 0 .../mohiva/play/silhouette/test/package.scala | 0 silhouette-testkit/build.sbt | 9 ++ .../play/silhouette/test/FakesSpec.scala | 0 .../play/silhouette/api/Authenticator.scala | 0 .../play/silhouette/api/Authorization.scala | 0 .../play/silhouette/api/Environment.scala | 0 .../mohiva/play/silhouette/api/EventBus.scala | 0 .../mohiva/play/silhouette/api/Identity.scala | 0 .../mohiva/play/silhouette/api/Logger.scala | 0 .../mohiva/play/silhouette/api/Provider.scala | 0 .../play/silhouette/api/SecuredSettings.scala | 0 .../play/silhouette/api/Silhouette.scala | 0 .../mohiva/play/silhouette/api/Token.scala | 0 .../exceptions/AccessDeniedException.scala | 0 .../exceptions/AuthenticationException.scala | 0 .../api/exceptions/SilhouetteException.scala | 0 .../silhouette/api/exceptions/package.scala | 0 .../mohiva/play/silhouette/api/package.scala | 0 .../api/services/AuthInfoService.scala | 0 .../api/services/AuthenticatorService.scala | 0 .../api/services/AvatarService.scala | 0 .../api/services/IdentityService.scala | 0 .../api/services/TokenService.scala | 0 .../silhouette/api/services/package.scala | 0 .../play/silhouette/api/util/Base64.scala | 0 .../play/silhouette/api/util/CacheLayer.scala | 0 .../play/silhouette/api/util/Clock.scala | 0 .../silhouette/api/util/Credentials.scala | 0 .../api/util/DefaultActionHandler.scala | 0 .../api/util/FingerprintGenerator.scala | 0 .../play/silhouette/api/util/HTTPLayer.scala | 0 .../silhouette/api/util/IDGenerator.scala | 0 .../silhouette/api/util/PasswordHasher.scala | 0 .../api/util/RequestExtractor.scala | 0 .../play/silhouette/api/util/package.scala | 0 .../mohiva/play/silhouette/impl/User.scala | 0 .../BearerTokenAuthenticator.scala | 0 .../authenticators/CookieAuthenticator.scala | 0 .../authenticators/DummyAuthenticator.scala | 0 .../authenticators/JWTAuthenticator.scala | 0 .../authenticators/SessionAuthenticator.scala | 0 .../impl/authenticators/package.scala | 0 .../silhouette/impl/daos/AuthInfoDAO.scala | 0 .../impl/daos/AuthenticatorDAO.scala | 0 .../impl/daos/CacheAuthenticatorDAO.scala | 0 .../impl/daos/DelegableAuthInfoDAO.scala | 0 .../play/silhouette/impl/daos/package.scala | 0 .../ProfileRetrievalException.scala | 0 .../impl/exceptions/StateException.scala | 0 .../silhouette/impl/exceptions/package.scala | 0 .../mohiva/play/silhouette/impl/package.scala | 0 .../impl/providers/BasicAuthProvider.scala | 0 .../impl/providers/CredentialsProvider.scala | 0 .../impl/providers/OAuth1Provider.scala | 0 .../impl/providers/OAuth2Provider.scala | 0 .../impl/providers/SocialProvider.scala | 0 .../providers/oauth1/LinkedInProvider.scala | 0 .../providers/oauth1/TwitterProvider.scala | 0 .../impl/providers/oauth1/XingProvider.scala | 0 .../oauth1/services/PlayOAuth1Service.scala | 0 .../providers/oauth2/DropboxProvider.scala | 0 .../providers/oauth2/FacebookProvider.scala | 0 .../providers/oauth2/FoursquareProvider.scala | 0 .../providers/oauth2/GitHubProvider.scala | 0 .../providers/oauth2/GoogleProvider.scala | 0 .../providers/oauth2/InstagramProvider.scala | 0 .../providers/oauth2/LinkedInProvider.scala | 0 .../impl/providers/oauth2/VKProvider.scala | 0 .../providers/oauth2/state/CookieState.scala | 0 .../providers/oauth2/state/DummyState.scala | 0 .../silhouette/impl/providers/package.scala | 0 .../services/DelegableAuthInfoService.scala | 0 .../impl/services/GravatarService.scala | 0 .../silhouette/impl/services/package.scala | 0 .../impl/util/BCryptPasswordHasher.scala | 0 .../util/DefaultFingerprintGenerator.scala | 0 .../silhouette/impl/util/PlayCacheLayer.scala | 0 .../impl/util/SecureRandomIDGenerator.scala | 0 .../play/silhouette/impl/util/package.scala | 0 .../com/mohiva/play/silhouette/package.scala | 0 silhouette/build.sbt | 15 ++ {conf => silhouette/conf}/application.conf | 0 {conf => silhouette/conf}/build-jvm-opts | 0 {conf => silhouette/conf}/messages | 0 {test => silhouette/test}/Helpers.scala | 0 .../play/silhouette/api/EventBusSpec.scala | 0 .../silhouette/api/SecuredSettingsSpec.scala | 0 .../play/silhouette/api/SilhouetteSpec.scala | 15 +- .../play/silhouette/api/util/Base64Spec.scala | 0 .../play/silhouette/api/util/ClockSpec.scala | 0 .../api/util/DefaultActionHandlerSpec.scala | 0 .../api/util/PlayHTTPLayerSpec.scala | 0 .../api/util/RequestExtractorSpec.scala | 0 .../BearerTokenAuthenticatorSpec.scala | 0 .../CookieAuthenticatorSpec.scala | 0 .../DummyAuthenticatorSpec.scala | 0 .../authenticators/JWTAuthenticatorSpec.scala | 0 .../SessionAuthenticatorSpec.scala | 0 .../impl/daos/CacheAuthenticatorDAOSpec.scala | 0 .../providers/BasicAuthProviderSpec.scala | 0 .../providers/CredentialsProviderSpec.scala | 0 .../impl/providers/OAuth1ProviderSpec.scala | 0 .../impl/providers/OAuth2ProviderSpec.scala | 0 .../impl/providers/SocialProviderSpec.scala | 0 .../custom/FacebookProviderSpec.scala | 0 .../oauth1/LinkedInProviderSpec.scala | 0 .../oauth1/TwitterProviderSpec.scala | 0 .../providers/oauth1/XingProviderSpec.scala | 0 .../services/PlayOAuth1ServiceSpec.scala | 0 .../oauth2/DropboxProviderSpec.scala | 0 .../oauth2/FacebookProviderSpec.scala | 0 .../oauth2/FoursquareProviderSpec.scala | 0 .../providers/oauth2/GitHubProviderSpec.scala | 0 .../providers/oauth2/GoogleProviderSpec.scala | 0 .../oauth2/InstagramProviderSpec.scala | 0 .../oauth2/LinkedInProviderSpec.scala | 0 .../providers/oauth2/VKProviderSpec.scala | 0 .../oauth2/state/CookieStateSpec.scala | 0 .../oauth2/state/DummyStateSpec.scala | 0 .../DelegableAuthInfoServiceSpec.scala | 0 .../impl/services/GravatarServiceSpec.scala | 0 .../impl/util/BCryptPasswordHasherSpec.scala | 0 .../DefaultFingerprintGeneratorSpec.scala | 0 .../impl/util/PlayCacheLayerSpec.scala | 0 .../util/SecureRandomIDGeneratorSpec.scala | 0 .../providers/custom/facebook.error.json | 0 .../providers/custom/facebook.success.json | 0 .../providers/oauth1/linkedin.error.json | 0 .../providers/oauth1/linkedin.success.json | 0 .../providers/oauth1/twitter.error.json | 0 .../providers/oauth1/twitter.success.json | 0 .../providers/oauth1/xing.error.json | 0 .../providers/oauth1/xing.success.json | 0 .../oauth2/dropbox.access.token.json | 0 .../providers/oauth2/dropbox.error.json | 0 .../providers/oauth2/dropbox.success.json | 0 .../providers/oauth2/facebook.error.json | 0 .../providers/oauth2/facebook.success.json | 0 .../oauth2/foursquare.access.token.json | 0 .../oauth2/foursquare.deprecated.json | 0 .../providers/oauth2/foursquare.error.json | 0 .../providers/oauth2/foursquare.success.json | 0 .../providers/oauth2/github.access.token.json | 0 .../providers/oauth2/github.error.json | 0 .../providers/oauth2/github.success.json | 0 .../providers/oauth2/google.access.token.json | 0 .../providers/oauth2/google.error.json | 0 .../providers/oauth2/google.success.json | 0 .../oauth2/google.without.email.json | 0 .../oauth2/instagram.access.token.json | 0 .../providers/oauth2/instagram.error.json | 0 .../providers/oauth2/instagram.success.json | 0 .../oauth2/linkedin.access.token.json | 0 .../providers/oauth2/linkedin.error.json | 0 .../providers/oauth2/linkedin.success.json | 0 .../providers/oauth2/vk.access.token.json | 0 .../resources/providers/oauth2/vk.error.json | 0 .../providers/oauth2/vk.success.json | 0 165 files changed, 219 insertions(+), 175 deletions(-) delete mode 100644 build.sbt create mode 100644 project/Build.scala create mode 100644 project/BuildSettings.scala create mode 100644 project/Dependencies.scala delete mode 100644 project/Helper.scala rename {app => silhouette-testkit/app}/com/mohiva/play/silhouette/test/Fakes.scala (100%) rename {app => silhouette-testkit/app}/com/mohiva/play/silhouette/test/package.scala (100%) create mode 100644 silhouette-testkit/build.sbt rename {test => silhouette-testkit/test}/com/mohiva/play/silhouette/test/FakesSpec.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/Authenticator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/Authorization.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/Environment.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/EventBus.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/Identity.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/Logger.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/Provider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/SecuredSettings.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/Silhouette.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/Token.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/exceptions/AccessDeniedException.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/exceptions/AuthenticationException.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/exceptions/SilhouetteException.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/exceptions/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/services/AuthInfoService.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/services/AuthenticatorService.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/services/AvatarService.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/services/IdentityService.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/services/TokenService.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/services/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/Base64.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/CacheLayer.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/Clock.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/Credentials.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/DefaultActionHandler.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/FingerprintGenerator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/HTTPLayer.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/IDGenerator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/PasswordHasher.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/RequestExtractor.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/api/util/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/User.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/authenticators/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/daos/AuthInfoDAO.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/daos/AuthenticatorDAO.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAO.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/daos/DelegableAuthInfoDAO.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/daos/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/exceptions/ProfileRetrievalException.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/exceptions/StateException.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/exceptions/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/BasicAuthProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/CredentialsProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/OAuth1Provider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/OAuth2Provider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/SocialProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth1/XingProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1Service.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/VKProvider.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieState.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyState.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/providers/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoService.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/services/GravatarService.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/services/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasher.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGenerator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/util/PlayCacheLayer.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/util/SecureRandomIDGenerator.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/impl/util/package.scala (100%) rename {app => silhouette/app}/com/mohiva/play/silhouette/package.scala (100%) create mode 100644 silhouette/build.sbt rename {conf => silhouette/conf}/application.conf (100%) rename {conf => silhouette/conf}/build-jvm-opts (100%) rename {conf => silhouette/conf}/messages (100%) rename {test => silhouette/test}/Helpers.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/api/EventBusSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/api/SecuredSettingsSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/api/SilhouetteSpec.scala (99%) rename {test => silhouette/test}/com/mohiva/play/silhouette/api/util/Base64Spec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/api/util/ClockSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/api/util/DefaultActionHandlerSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/api/util/PlayHTTPLayerSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/api/util/RequestExtractorSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticatorSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticatorSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticatorSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticatorSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticatorSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAOSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/BasicAuthProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/CredentialsProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/OAuth1ProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/OAuth2ProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/SocialProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/custom/FacebookProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth1/XingProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1ServiceSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/VKProviderSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieStateSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyStateSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoServiceSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/services/GravatarServiceSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasherSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGeneratorSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/util/PlayCacheLayerSpec.scala (100%) rename {test => silhouette/test}/com/mohiva/play/silhouette/impl/util/SecureRandomIDGeneratorSpec.scala (100%) rename {test => silhouette/test}/resources/providers/custom/facebook.error.json (100%) rename {test => silhouette/test}/resources/providers/custom/facebook.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth1/linkedin.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth1/linkedin.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth1/twitter.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth1/twitter.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth1/xing.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth1/xing.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/dropbox.access.token.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/dropbox.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/dropbox.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/facebook.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/facebook.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/foursquare.access.token.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/foursquare.deprecated.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/foursquare.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/foursquare.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/github.access.token.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/github.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/github.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/google.access.token.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/google.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/google.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/google.without.email.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/instagram.access.token.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/instagram.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/instagram.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/linkedin.access.token.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/linkedin.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/linkedin.success.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/vk.access.token.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/vk.error.json (100%) rename {test => silhouette/test}/resources/providers/oauth2/vk.success.json (100%) diff --git a/build.sbt b/build.sbt deleted file mode 100644 index 21d2a20d6..000000000 --- a/build.sbt +++ /dev/null @@ -1,129 +0,0 @@ -import play.PlayScala -import play.core.PlayVersion -import mohiva.sbt.Helper._ -import com.typesafe.sbt.SbtScalariform._ -import xerial.sbt.Sonatype._ -import scalariform.formatter.preferences.{PreserveDanglingCloseParenthesis, DoubleIndentClassDeclaration, FormatXml} - -//******************************* -// Play settings -//******************************* - -name := "play-silhouette" - -version := "2.0-SNAPSHOT" - -resolvers := ("Atlassian Releases" at "https://maven.atlassian.com/public/") +: resolvers.value - -libraryDependencies ++= Seq( - "com.typesafe.play" %% "play-test" % "2.3.7", - "org.mindrot" % "jbcrypt" % "0.3m", - "com.atlassian.jwt" % "jwt-core" % "1.2.3", - "com.atlassian.jwt" % "jwt-api" % "1.2.3", - "org.mockito" % "mockito-core" % "1.9.5" % "test", - "net.codingwell" %% "scala-guice" % "4.0.0-beta5" % "test", - "com.typesafe.akka" %% "akka-testkit" % "2.3.3" % "test", - cache, - ws -) - -lazy val root = (project in file(".")).enablePlugins(PlayScala) - -//******************************* -// Maven settings -//******************************* - -sonatypeSettings - -organization := "com.mohiva" - -description := "Authentication library for Play Framework applications that supports several authentication methods, including OAuth1, OAuth2, OpenID, Credentials or custom authentication schemes" - -homepage := Some(url("http://silhouette.mohiva.com/")) - -licenses := Seq("Apache License" -> url("https://github.com/mohiva/play-silhouette/blob/master/LICENSE")) - -val pom = - git@github.com:mohiva/play-silhouette.git - scm:git:git@github.com:mohiva/play-silhouette.git - - - - akkie - Christian Kaps - http://mohiva.com - - - fernandoacorreia - Fernando Correia - http://www.fernandocorreia.info/ - - - -publishMavenStyle := true - -publishArtifact in Test := false - -pomIncludeRepository := { _ => false } - -pomExtra := pom - -credentials += Credentials(Path.userHome / ".sbt" / "sonatype.credentials") - -//******************************* -// Test settings -//******************************* - -parallelExecution in Test := false - -//******************************* -// Compiler settings -//******************************* - -scalaVersion := "2.11.4" - -crossScalaVersions := Seq("2.10.4", "2.11.4") - -scalacOptions ++= Seq( - "-deprecation", // Emit warning and location for usages of deprecated APIs. - "-feature", // Emit warning and location for usages of features that should be imported explicitly. - "-unchecked", // Enable additional warnings where generated code depends on assumptions. - "-Xfatal-warnings", // Fail the compilation if there are any warnings. - "-Xlint", // Enable recommended additional warnings. - "-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver. - "-Ywarn-dead-code", // Warn when dead code is identified. - "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures. - "-Ywarn-nullary-override", // Warn when non-nullary overrides nullary, e.g. def foo() over def foo. - "-Ywarn-numeric-widen" // Warn when numerics are widened. -) - -scalacOptions in Test ~= { (options: Seq[String]) => - options filterNot ( _ == "-Ywarn-dead-code" ) // Allow dead code in tests (to support using mockito). -} - -//******************************* -// Scalariform settings -//******************************* - -defaultScalariformSettings - -ScalariformKeys.preferences := ScalariformKeys.preferences.value - .setPreference(FormatXml, false) - .setPreference(DoubleIndentClassDeclaration, false) - .setPreference(PreserveDanglingCloseParenthesis, true) - -//******************************* -// ScalaDoc settings -//******************************* - -autoAPIMappings := true - -apiURL := Some(url(s"http://silhouette.mohiva.com/api/$version/")) - -apiMappings ++= { - implicit val cp = (fullClasspath in Compile).value - Map ( - jarFor("com.typesafe.play", "play") -> url(s"http://www.playframework.com/documentation/${PlayVersion.current}/api/scala/"), - scalaInstance.value.libraryJar -> url(s"http://www.scala-lang.org/api/${scalaVersion.value}/") - ) -} diff --git a/project/Build.scala b/project/Build.scala new file mode 100644 index 000000000..acb36eced --- /dev/null +++ b/project/Build.scala @@ -0,0 +1,22 @@ +import sbt._ + +object Build extends Build { + + val silhouette = Project( + id = "silhouette", + base = file("silhouette") + ) + + val silhouetteTestkit = Project( + id = "silhouette-testkit", + base = file("silhouette-testkit"), + dependencies = Seq(silhouette) + ) + + val root = Project( + id = "root", + base = file("."), + aggregate = Seq(silhouette, silhouetteTestkit) + ) + +} diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala new file mode 100644 index 000000000..ddbecbaa3 --- /dev/null +++ b/project/BuildSettings.scala @@ -0,0 +1,127 @@ +import sbt.Keys._ +import sbt._ + +object BasicSettings extends AutoPlugin { + override def trigger = allRequirements + + override def projectSettings = Seq( + organization := "com.mohiva", + version := "2.0-SNAPSHOT", + resolvers ++= Dependencies.resolvers, + scalaVersion := Dependencies.Versions.scalaVersion, + crossScalaVersions := Dependencies.Versions.crossScala, + scalacOptions ++= Seq( + "-deprecation", // Emit warning and location for usages of deprecated APIs. + "-feature", // Emit warning and location for usages of features that should be imported explicitly. + "-unchecked", // Enable additional warnings where generated code depends on assumptions. + "-Xfatal-warnings", // Fail the compilation if there are any warnings. + "-Xlint", // Enable recommended additional warnings. + "-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver. + "-Ywarn-dead-code", // Warn when dead code is identified. + "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures. + "-Ywarn-nullary-override", // Warn when non-nullary overrides nullary, e.g. def foo() over def foo. + "-Ywarn-numeric-widen" // Warn when numerics are widened. + ), + scalacOptions in Test ~= { (options: Seq[String]) => + options filterNot (_ == "-Ywarn-dead-code") // Allow dead code in tests (to support using mockito). + }, + parallelExecution in Test := false + ) +} + +////******************************* +//// Scalariform settings +////******************************* +object CodeFormatter extends AutoPlugin { + + import com.typesafe.sbt.SbtScalariform._ + import scalariform.formatter.preferences.{DoubleIndentClassDeclaration, FormatXml, PreserveDanglingCloseParenthesis} + + override def trigger = allRequirements + + override def projectSettings = defaultScalariformSettings ++ Seq( + ScalariformKeys.preferences := ScalariformKeys.preferences.value + .setPreference(FormatXml, false) + .setPreference(DoubleIndentClassDeclaration, false) + .setPreference(PreserveDanglingCloseParenthesis, true) + ) +} + +////******************************* +//// ScalaDoc settings +////******************************* +object Doc extends AutoPlugin { + + import play.core.PlayVersion + + override def projectSettings = Seq( + autoAPIMappings := true, + apiURL := Some(url(s"http://silhouette.mohiva.com/api/$version/")), + apiMappings ++= { + implicit val cp = (fullClasspath in Compile).value + Map( + jarFor("com.typesafe.play", "play") -> url(s"http://www.playframework.com/documentation/${PlayVersion.current}/api/scala/"), + scalaInstance.value.libraryJar -> url(s"http://www.scala-lang.org/api/${scalaVersion.value}/") + ) + } + ) + + /** + * Gets the JAR file for a package. + * + * @param organization The organization name. + * @param name The name of the package. + * @param cp The class path. + * @return The file which points to the JAR. + * @see http://stackoverflow.com/a/20919304/2153190 + */ + private def jarFor(organization: String, name: String)(implicit cp: Seq[Attributed[File]]): File = { + (for { + entry <- cp + module <- entry.get(moduleID.key) + if module.organization == organization + if module.name.startsWith(name) + jarFile = entry.data + } yield jarFile).head + } +} + +////******************************* +//// Maven settings +////******************************* +object Publish extends AutoPlugin { + + import xerial.sbt.Sonatype._ + + override def trigger = allRequirements + + private val pom = { + + git@github.com:mohiva/play-silhouette.git + scm:git:git@github.com:mohiva/play-silhouette.git + + + + akkie + Christian Kaps + http://mohiva.com + + + fernandoacorreia + Fernando Correia + http://www.fernandocorreia.info/ + + + } + + override def projectSettings = sonatypeSettings ++ Seq( + description := "Authentication library for Play Framework applications that supports several authentication methods, including OAuth1, OAuth2, OpenID, Credentials or custom authentication schemes", + homepage := Some(url("http://silhouette.mohiva.com/")), + licenses := Seq("Apache License" -> url("https://github.com/mohiva/play-silhouette/blob/master/LICENSE")), + publishMavenStyle := true, + publishArtifact in Test := false, + pomIncludeRepository := { _ => false}, + pomExtra := pom, + credentials += Credentials(Path.userHome / ".sbt" / "sonatype.credentials") + ) +} diff --git a/project/Dependencies.scala b/project/Dependencies.scala new file mode 100644 index 000000000..2f80e8efc --- /dev/null +++ b/project/Dependencies.scala @@ -0,0 +1,31 @@ +import sbt._ + +object Dependencies { + + object Versions { + val crossScala = Seq("2.11.4", "2.10.4") + val scalaVersion = crossScala.head + } + + val resolvers = Seq( + "Atlassian Releases" at "https://maven.atlassian.com/public/" + ) + + object Library { + + object Play { + val version = play.core.PlayVersion.current + val ws = "com.typesafe.play" %% "play-ws" % version + val cache = "com.typesafe.play" %% "play-cache" % version + val test = "com.typesafe.play" %% "play-test" % version + } + + val jbcrypt = "org.mindrot" % "jbcrypt" % "0.3m" + val jwtCore = "com.atlassian.jwt" % "jwt-core" % "1.2.3" + val jwtApi = "com.atlassian.jwt" % "jwt-api" % "1.2.3" + val mockito = "org.mockito" % "mockito-core" % "1.9.5" + val scalaGuice = "net.codingwell" %% "scala-guice" % "4.0.0-beta5" + val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % "2.3.3" + } + +} diff --git a/project/Helper.scala b/project/Helper.scala deleted file mode 100644 index 9d45ca6aa..000000000 --- a/project/Helper.scala +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Copyright 2014 Mohiva Organisation (license at mohiva dot com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package mohiva.sbt - -import sbt.Keys._ -import sbt.{ File, Attributed } - -/** - * Some SBT helpers. - */ -object Helper { - - /** - * Gets the JAR file for a package. - * - * @param organization The organization name. - * @param name The name of the package. - * @param cp The class path. - * @return The file which points to the JAR. - * @see http://stackoverflow.com/a/20919304/2153190 - */ - def jarFor(organization: String, name: String)(implicit cp: Seq[Attributed[File]]): File = { - ( for { - entry <- cp - module <- entry.get(moduleID.key) - if module.organization == organization - if module.name.startsWith(name) - jarFile = entry.data - } yield jarFile ).head - } -} diff --git a/project/build.properties b/project/build.properties index be6c454fb..748703f77 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.5 +sbt.version=0.13.7 diff --git a/app/com/mohiva/play/silhouette/test/Fakes.scala b/silhouette-testkit/app/com/mohiva/play/silhouette/test/Fakes.scala similarity index 100% rename from app/com/mohiva/play/silhouette/test/Fakes.scala rename to silhouette-testkit/app/com/mohiva/play/silhouette/test/Fakes.scala diff --git a/app/com/mohiva/play/silhouette/test/package.scala b/silhouette-testkit/app/com/mohiva/play/silhouette/test/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/test/package.scala rename to silhouette-testkit/app/com/mohiva/play/silhouette/test/package.scala diff --git a/silhouette-testkit/build.sbt b/silhouette-testkit/build.sbt new file mode 100644 index 000000000..cbbc8a6b1 --- /dev/null +++ b/silhouette-testkit/build.sbt @@ -0,0 +1,9 @@ +import Dependencies._ + +libraryDependencies ++= Seq( + Library.Play.test, + Library.mockito % Test, + Library.akkaTestkit % Test +) + +enablePlugins(PlayScala, Doc) diff --git a/test/com/mohiva/play/silhouette/test/FakesSpec.scala b/silhouette-testkit/test/com/mohiva/play/silhouette/test/FakesSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/test/FakesSpec.scala rename to silhouette-testkit/test/com/mohiva/play/silhouette/test/FakesSpec.scala diff --git a/app/com/mohiva/play/silhouette/api/Authenticator.scala b/silhouette/app/com/mohiva/play/silhouette/api/Authenticator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/Authenticator.scala rename to silhouette/app/com/mohiva/play/silhouette/api/Authenticator.scala diff --git a/app/com/mohiva/play/silhouette/api/Authorization.scala b/silhouette/app/com/mohiva/play/silhouette/api/Authorization.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/Authorization.scala rename to silhouette/app/com/mohiva/play/silhouette/api/Authorization.scala diff --git a/app/com/mohiva/play/silhouette/api/Environment.scala b/silhouette/app/com/mohiva/play/silhouette/api/Environment.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/Environment.scala rename to silhouette/app/com/mohiva/play/silhouette/api/Environment.scala diff --git a/app/com/mohiva/play/silhouette/api/EventBus.scala b/silhouette/app/com/mohiva/play/silhouette/api/EventBus.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/EventBus.scala rename to silhouette/app/com/mohiva/play/silhouette/api/EventBus.scala diff --git a/app/com/mohiva/play/silhouette/api/Identity.scala b/silhouette/app/com/mohiva/play/silhouette/api/Identity.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/Identity.scala rename to silhouette/app/com/mohiva/play/silhouette/api/Identity.scala diff --git a/app/com/mohiva/play/silhouette/api/Logger.scala b/silhouette/app/com/mohiva/play/silhouette/api/Logger.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/Logger.scala rename to silhouette/app/com/mohiva/play/silhouette/api/Logger.scala diff --git a/app/com/mohiva/play/silhouette/api/Provider.scala b/silhouette/app/com/mohiva/play/silhouette/api/Provider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/Provider.scala rename to silhouette/app/com/mohiva/play/silhouette/api/Provider.scala diff --git a/app/com/mohiva/play/silhouette/api/SecuredSettings.scala b/silhouette/app/com/mohiva/play/silhouette/api/SecuredSettings.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/SecuredSettings.scala rename to silhouette/app/com/mohiva/play/silhouette/api/SecuredSettings.scala diff --git a/app/com/mohiva/play/silhouette/api/Silhouette.scala b/silhouette/app/com/mohiva/play/silhouette/api/Silhouette.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/Silhouette.scala rename to silhouette/app/com/mohiva/play/silhouette/api/Silhouette.scala diff --git a/app/com/mohiva/play/silhouette/api/Token.scala b/silhouette/app/com/mohiva/play/silhouette/api/Token.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/Token.scala rename to silhouette/app/com/mohiva/play/silhouette/api/Token.scala diff --git a/app/com/mohiva/play/silhouette/api/exceptions/AccessDeniedException.scala b/silhouette/app/com/mohiva/play/silhouette/api/exceptions/AccessDeniedException.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/exceptions/AccessDeniedException.scala rename to silhouette/app/com/mohiva/play/silhouette/api/exceptions/AccessDeniedException.scala diff --git a/app/com/mohiva/play/silhouette/api/exceptions/AuthenticationException.scala b/silhouette/app/com/mohiva/play/silhouette/api/exceptions/AuthenticationException.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/exceptions/AuthenticationException.scala rename to silhouette/app/com/mohiva/play/silhouette/api/exceptions/AuthenticationException.scala diff --git a/app/com/mohiva/play/silhouette/api/exceptions/SilhouetteException.scala b/silhouette/app/com/mohiva/play/silhouette/api/exceptions/SilhouetteException.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/exceptions/SilhouetteException.scala rename to silhouette/app/com/mohiva/play/silhouette/api/exceptions/SilhouetteException.scala diff --git a/app/com/mohiva/play/silhouette/api/exceptions/package.scala b/silhouette/app/com/mohiva/play/silhouette/api/exceptions/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/exceptions/package.scala rename to silhouette/app/com/mohiva/play/silhouette/api/exceptions/package.scala diff --git a/app/com/mohiva/play/silhouette/api/package.scala b/silhouette/app/com/mohiva/play/silhouette/api/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/package.scala rename to silhouette/app/com/mohiva/play/silhouette/api/package.scala diff --git a/app/com/mohiva/play/silhouette/api/services/AuthInfoService.scala b/silhouette/app/com/mohiva/play/silhouette/api/services/AuthInfoService.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/services/AuthInfoService.scala rename to silhouette/app/com/mohiva/play/silhouette/api/services/AuthInfoService.scala diff --git a/app/com/mohiva/play/silhouette/api/services/AuthenticatorService.scala b/silhouette/app/com/mohiva/play/silhouette/api/services/AuthenticatorService.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/services/AuthenticatorService.scala rename to silhouette/app/com/mohiva/play/silhouette/api/services/AuthenticatorService.scala diff --git a/app/com/mohiva/play/silhouette/api/services/AvatarService.scala b/silhouette/app/com/mohiva/play/silhouette/api/services/AvatarService.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/services/AvatarService.scala rename to silhouette/app/com/mohiva/play/silhouette/api/services/AvatarService.scala diff --git a/app/com/mohiva/play/silhouette/api/services/IdentityService.scala b/silhouette/app/com/mohiva/play/silhouette/api/services/IdentityService.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/services/IdentityService.scala rename to silhouette/app/com/mohiva/play/silhouette/api/services/IdentityService.scala diff --git a/app/com/mohiva/play/silhouette/api/services/TokenService.scala b/silhouette/app/com/mohiva/play/silhouette/api/services/TokenService.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/services/TokenService.scala rename to silhouette/app/com/mohiva/play/silhouette/api/services/TokenService.scala diff --git a/app/com/mohiva/play/silhouette/api/services/package.scala b/silhouette/app/com/mohiva/play/silhouette/api/services/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/services/package.scala rename to silhouette/app/com/mohiva/play/silhouette/api/services/package.scala diff --git a/app/com/mohiva/play/silhouette/api/util/Base64.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/Base64.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/Base64.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/Base64.scala diff --git a/app/com/mohiva/play/silhouette/api/util/CacheLayer.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/CacheLayer.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/CacheLayer.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/CacheLayer.scala diff --git a/app/com/mohiva/play/silhouette/api/util/Clock.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/Clock.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/Clock.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/Clock.scala diff --git a/app/com/mohiva/play/silhouette/api/util/Credentials.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/Credentials.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/Credentials.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/Credentials.scala diff --git a/app/com/mohiva/play/silhouette/api/util/DefaultActionHandler.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/DefaultActionHandler.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/DefaultActionHandler.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/DefaultActionHandler.scala diff --git a/app/com/mohiva/play/silhouette/api/util/FingerprintGenerator.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/FingerprintGenerator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/FingerprintGenerator.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/FingerprintGenerator.scala diff --git a/app/com/mohiva/play/silhouette/api/util/HTTPLayer.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/HTTPLayer.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/HTTPLayer.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/HTTPLayer.scala diff --git a/app/com/mohiva/play/silhouette/api/util/IDGenerator.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/IDGenerator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/IDGenerator.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/IDGenerator.scala diff --git a/app/com/mohiva/play/silhouette/api/util/PasswordHasher.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/PasswordHasher.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/PasswordHasher.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/PasswordHasher.scala diff --git a/app/com/mohiva/play/silhouette/api/util/RequestExtractor.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/RequestExtractor.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/RequestExtractor.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/RequestExtractor.scala diff --git a/app/com/mohiva/play/silhouette/api/util/package.scala b/silhouette/app/com/mohiva/play/silhouette/api/util/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/api/util/package.scala rename to silhouette/app/com/mohiva/play/silhouette/api/util/package.scala diff --git a/app/com/mohiva/play/silhouette/impl/User.scala b/silhouette/app/com/mohiva/play/silhouette/impl/User.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/User.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/User.scala diff --git a/app/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticator.scala b/silhouette/app/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticator.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticator.scala diff --git a/app/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticator.scala b/silhouette/app/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticator.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticator.scala diff --git a/app/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticator.scala b/silhouette/app/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticator.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticator.scala diff --git a/app/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticator.scala b/silhouette/app/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticator.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticator.scala diff --git a/app/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticator.scala b/silhouette/app/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticator.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticator.scala diff --git a/app/com/mohiva/play/silhouette/impl/authenticators/package.scala b/silhouette/app/com/mohiva/play/silhouette/impl/authenticators/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/authenticators/package.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/authenticators/package.scala diff --git a/app/com/mohiva/play/silhouette/impl/daos/AuthInfoDAO.scala b/silhouette/app/com/mohiva/play/silhouette/impl/daos/AuthInfoDAO.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/daos/AuthInfoDAO.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/daos/AuthInfoDAO.scala diff --git a/app/com/mohiva/play/silhouette/impl/daos/AuthenticatorDAO.scala b/silhouette/app/com/mohiva/play/silhouette/impl/daos/AuthenticatorDAO.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/daos/AuthenticatorDAO.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/daos/AuthenticatorDAO.scala diff --git a/app/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAO.scala b/silhouette/app/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAO.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAO.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAO.scala diff --git a/app/com/mohiva/play/silhouette/impl/daos/DelegableAuthInfoDAO.scala b/silhouette/app/com/mohiva/play/silhouette/impl/daos/DelegableAuthInfoDAO.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/daos/DelegableAuthInfoDAO.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/daos/DelegableAuthInfoDAO.scala diff --git a/app/com/mohiva/play/silhouette/impl/daos/package.scala b/silhouette/app/com/mohiva/play/silhouette/impl/daos/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/daos/package.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/daos/package.scala diff --git a/app/com/mohiva/play/silhouette/impl/exceptions/ProfileRetrievalException.scala b/silhouette/app/com/mohiva/play/silhouette/impl/exceptions/ProfileRetrievalException.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/exceptions/ProfileRetrievalException.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/exceptions/ProfileRetrievalException.scala diff --git a/app/com/mohiva/play/silhouette/impl/exceptions/StateException.scala b/silhouette/app/com/mohiva/play/silhouette/impl/exceptions/StateException.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/exceptions/StateException.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/exceptions/StateException.scala diff --git a/app/com/mohiva/play/silhouette/impl/exceptions/package.scala b/silhouette/app/com/mohiva/play/silhouette/impl/exceptions/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/exceptions/package.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/exceptions/package.scala diff --git a/app/com/mohiva/play/silhouette/impl/package.scala b/silhouette/app/com/mohiva/play/silhouette/impl/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/package.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/package.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/BasicAuthProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/BasicAuthProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/BasicAuthProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/BasicAuthProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/CredentialsProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/CredentialsProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/CredentialsProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/CredentialsProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/OAuth1Provider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/OAuth1Provider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/OAuth1Provider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/OAuth1Provider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/OAuth2Provider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/OAuth2Provider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/OAuth2Provider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/OAuth2Provider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/SocialProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/SocialProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/SocialProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/SocialProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth1/XingProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth1/XingProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth1/XingProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth1/XingProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1Service.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1Service.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1Service.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1Service.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/VKProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/VKProvider.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/VKProvider.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/VKProvider.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieState.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieState.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieState.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieState.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyState.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyState.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyState.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyState.scala diff --git a/app/com/mohiva/play/silhouette/impl/providers/package.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/providers/package.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/providers/package.scala diff --git a/app/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoService.scala b/silhouette/app/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoService.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoService.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoService.scala diff --git a/app/com/mohiva/play/silhouette/impl/services/GravatarService.scala b/silhouette/app/com/mohiva/play/silhouette/impl/services/GravatarService.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/services/GravatarService.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/services/GravatarService.scala diff --git a/app/com/mohiva/play/silhouette/impl/services/package.scala b/silhouette/app/com/mohiva/play/silhouette/impl/services/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/services/package.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/services/package.scala diff --git a/app/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasher.scala b/silhouette/app/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasher.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasher.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasher.scala diff --git a/app/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGenerator.scala b/silhouette/app/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGenerator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGenerator.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGenerator.scala diff --git a/app/com/mohiva/play/silhouette/impl/util/PlayCacheLayer.scala b/silhouette/app/com/mohiva/play/silhouette/impl/util/PlayCacheLayer.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/util/PlayCacheLayer.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/util/PlayCacheLayer.scala diff --git a/app/com/mohiva/play/silhouette/impl/util/SecureRandomIDGenerator.scala b/silhouette/app/com/mohiva/play/silhouette/impl/util/SecureRandomIDGenerator.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/util/SecureRandomIDGenerator.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/util/SecureRandomIDGenerator.scala diff --git a/app/com/mohiva/play/silhouette/impl/util/package.scala b/silhouette/app/com/mohiva/play/silhouette/impl/util/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/impl/util/package.scala rename to silhouette/app/com/mohiva/play/silhouette/impl/util/package.scala diff --git a/app/com/mohiva/play/silhouette/package.scala b/silhouette/app/com/mohiva/play/silhouette/package.scala similarity index 100% rename from app/com/mohiva/play/silhouette/package.scala rename to silhouette/app/com/mohiva/play/silhouette/package.scala diff --git a/silhouette/build.sbt b/silhouette/build.sbt new file mode 100644 index 000000000..b2ac0e04f --- /dev/null +++ b/silhouette/build.sbt @@ -0,0 +1,15 @@ +import Dependencies._ + +libraryDependencies ++= Seq( + Library.Play.cache, + Library.Play.ws, + Library.jbcrypt, + Library.jwtCore, + Library.jwtApi, + Library.mockito % Test, + Library.scalaGuice % Test, + Library.akkaTestkit % Test +) + +enablePlugins(PlayScala, Doc) + diff --git a/conf/application.conf b/silhouette/conf/application.conf similarity index 100% rename from conf/application.conf rename to silhouette/conf/application.conf diff --git a/conf/build-jvm-opts b/silhouette/conf/build-jvm-opts similarity index 100% rename from conf/build-jvm-opts rename to silhouette/conf/build-jvm-opts diff --git a/conf/messages b/silhouette/conf/messages similarity index 100% rename from conf/messages rename to silhouette/conf/messages diff --git a/test/Helpers.scala b/silhouette/test/Helpers.scala similarity index 100% rename from test/Helpers.scala rename to silhouette/test/Helpers.scala diff --git a/test/com/mohiva/play/silhouette/api/EventBusSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/EventBusSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/api/EventBusSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/api/EventBusSpec.scala diff --git a/test/com/mohiva/play/silhouette/api/SecuredSettingsSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/SecuredSettingsSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/api/SecuredSettingsSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/api/SecuredSettingsSpec.scala diff --git a/test/com/mohiva/play/silhouette/api/SilhouetteSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/SilhouetteSpec.scala similarity index 99% rename from test/com/mohiva/play/silhouette/api/SilhouetteSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/api/SilhouetteSpec.scala index 91801ef84..b6051c6d1 100644 --- a/test/com/mohiva/play/silhouette/api/SilhouetteSpec.scala +++ b/silhouette/test/com/mohiva/play/silhouette/api/SilhouetteSpec.scala @@ -19,7 +19,6 @@ import akka.actor.{ Actor, Props } import akka.testkit.TestProbe import com.mohiva.play.silhouette.api.exceptions.{ AccessDeniedException, AuthenticationException } import com.mohiva.play.silhouette.api.services.{ AuthenticatorService, IdentityService } -import com.mohiva.play.silhouette.test.{ FakeAuthenticator, FakeIdentity } import org.specs2.matcher.JsonMatchers import org.specs2.mock.Mockito import org.specs2.specification.Scope @@ -761,6 +760,20 @@ class SilhouetteSpec extends PlaySpecification with Mockito with JsonMatchers { } } + /** + * A test identity. + * + * @param loginInfo The linked login info. + */ + case class FakeIdentity(loginInfo: LoginInfo) extends Identity + + /** + * A test authenticator. + * + * @param loginInfo The linked login info. + */ + case class FakeAuthenticator(loginInfo: LoginInfo, isValid: Boolean = true) extends Authenticator + /** * The context. */ diff --git a/test/com/mohiva/play/silhouette/api/util/Base64Spec.scala b/silhouette/test/com/mohiva/play/silhouette/api/util/Base64Spec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/api/util/Base64Spec.scala rename to silhouette/test/com/mohiva/play/silhouette/api/util/Base64Spec.scala diff --git a/test/com/mohiva/play/silhouette/api/util/ClockSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/util/ClockSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/api/util/ClockSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/api/util/ClockSpec.scala diff --git a/test/com/mohiva/play/silhouette/api/util/DefaultActionHandlerSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/util/DefaultActionHandlerSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/api/util/DefaultActionHandlerSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/api/util/DefaultActionHandlerSpec.scala diff --git a/test/com/mohiva/play/silhouette/api/util/PlayHTTPLayerSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/util/PlayHTTPLayerSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/api/util/PlayHTTPLayerSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/api/util/PlayHTTPLayerSpec.scala diff --git a/test/com/mohiva/play/silhouette/api/util/RequestExtractorSpec.scala b/silhouette/test/com/mohiva/play/silhouette/api/util/RequestExtractorSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/api/util/RequestExtractorSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/api/util/RequestExtractorSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticatorSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticatorSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticatorSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/authenticators/BearerTokenAuthenticatorSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticatorSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticatorSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticatorSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/authenticators/CookieAuthenticatorSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticatorSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticatorSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticatorSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/authenticators/DummyAuthenticatorSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticatorSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticatorSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticatorSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/authenticators/JWTAuthenticatorSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticatorSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticatorSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticatorSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/authenticators/SessionAuthenticatorSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAOSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAOSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAOSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/daos/CacheAuthenticatorDAOSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/BasicAuthProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/BasicAuthProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/BasicAuthProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/BasicAuthProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/CredentialsProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/CredentialsProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/CredentialsProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/CredentialsProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/OAuth1ProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/OAuth1ProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/OAuth1ProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/OAuth1ProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/OAuth2ProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/OAuth2ProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/OAuth2ProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/OAuth2ProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/SocialProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/SocialProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/SocialProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/SocialProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/custom/FacebookProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/custom/FacebookProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/custom/FacebookProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/custom/FacebookProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth1/LinkedInProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth1/TwitterProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth1/XingProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth1/XingProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth1/XingProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth1/XingProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1ServiceSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1ServiceSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1ServiceSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth1/services/PlayOAuth1ServiceSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/DropboxProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/FacebookProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/FoursquareProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/GitHubProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/GoogleProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/InstagramProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/LinkedInProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/VKProviderSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/VKProviderSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/VKProviderSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/VKProviderSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieStateSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieStateSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieStateSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/state/CookieStateSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyStateSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyStateSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyStateSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/state/DummyStateSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoServiceSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoServiceSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoServiceSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/services/DelegableAuthInfoServiceSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/services/GravatarServiceSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/services/GravatarServiceSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/services/GravatarServiceSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/services/GravatarServiceSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasherSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasherSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasherSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/util/BCryptPasswordHasherSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGeneratorSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGeneratorSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGeneratorSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/util/DefaultFingerprintGeneratorSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/util/PlayCacheLayerSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/util/PlayCacheLayerSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/util/PlayCacheLayerSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/util/PlayCacheLayerSpec.scala diff --git a/test/com/mohiva/play/silhouette/impl/util/SecureRandomIDGeneratorSpec.scala b/silhouette/test/com/mohiva/play/silhouette/impl/util/SecureRandomIDGeneratorSpec.scala similarity index 100% rename from test/com/mohiva/play/silhouette/impl/util/SecureRandomIDGeneratorSpec.scala rename to silhouette/test/com/mohiva/play/silhouette/impl/util/SecureRandomIDGeneratorSpec.scala diff --git a/test/resources/providers/custom/facebook.error.json b/silhouette/test/resources/providers/custom/facebook.error.json similarity index 100% rename from test/resources/providers/custom/facebook.error.json rename to silhouette/test/resources/providers/custom/facebook.error.json diff --git a/test/resources/providers/custom/facebook.success.json b/silhouette/test/resources/providers/custom/facebook.success.json similarity index 100% rename from test/resources/providers/custom/facebook.success.json rename to silhouette/test/resources/providers/custom/facebook.success.json diff --git a/test/resources/providers/oauth1/linkedin.error.json b/silhouette/test/resources/providers/oauth1/linkedin.error.json similarity index 100% rename from test/resources/providers/oauth1/linkedin.error.json rename to silhouette/test/resources/providers/oauth1/linkedin.error.json diff --git a/test/resources/providers/oauth1/linkedin.success.json b/silhouette/test/resources/providers/oauth1/linkedin.success.json similarity index 100% rename from test/resources/providers/oauth1/linkedin.success.json rename to silhouette/test/resources/providers/oauth1/linkedin.success.json diff --git a/test/resources/providers/oauth1/twitter.error.json b/silhouette/test/resources/providers/oauth1/twitter.error.json similarity index 100% rename from test/resources/providers/oauth1/twitter.error.json rename to silhouette/test/resources/providers/oauth1/twitter.error.json diff --git a/test/resources/providers/oauth1/twitter.success.json b/silhouette/test/resources/providers/oauth1/twitter.success.json similarity index 100% rename from test/resources/providers/oauth1/twitter.success.json rename to silhouette/test/resources/providers/oauth1/twitter.success.json diff --git a/test/resources/providers/oauth1/xing.error.json b/silhouette/test/resources/providers/oauth1/xing.error.json similarity index 100% rename from test/resources/providers/oauth1/xing.error.json rename to silhouette/test/resources/providers/oauth1/xing.error.json diff --git a/test/resources/providers/oauth1/xing.success.json b/silhouette/test/resources/providers/oauth1/xing.success.json similarity index 100% rename from test/resources/providers/oauth1/xing.success.json rename to silhouette/test/resources/providers/oauth1/xing.success.json diff --git a/test/resources/providers/oauth2/dropbox.access.token.json b/silhouette/test/resources/providers/oauth2/dropbox.access.token.json similarity index 100% rename from test/resources/providers/oauth2/dropbox.access.token.json rename to silhouette/test/resources/providers/oauth2/dropbox.access.token.json diff --git a/test/resources/providers/oauth2/dropbox.error.json b/silhouette/test/resources/providers/oauth2/dropbox.error.json similarity index 100% rename from test/resources/providers/oauth2/dropbox.error.json rename to silhouette/test/resources/providers/oauth2/dropbox.error.json diff --git a/test/resources/providers/oauth2/dropbox.success.json b/silhouette/test/resources/providers/oauth2/dropbox.success.json similarity index 100% rename from test/resources/providers/oauth2/dropbox.success.json rename to silhouette/test/resources/providers/oauth2/dropbox.success.json diff --git a/test/resources/providers/oauth2/facebook.error.json b/silhouette/test/resources/providers/oauth2/facebook.error.json similarity index 100% rename from test/resources/providers/oauth2/facebook.error.json rename to silhouette/test/resources/providers/oauth2/facebook.error.json diff --git a/test/resources/providers/oauth2/facebook.success.json b/silhouette/test/resources/providers/oauth2/facebook.success.json similarity index 100% rename from test/resources/providers/oauth2/facebook.success.json rename to silhouette/test/resources/providers/oauth2/facebook.success.json diff --git a/test/resources/providers/oauth2/foursquare.access.token.json b/silhouette/test/resources/providers/oauth2/foursquare.access.token.json similarity index 100% rename from test/resources/providers/oauth2/foursquare.access.token.json rename to silhouette/test/resources/providers/oauth2/foursquare.access.token.json diff --git a/test/resources/providers/oauth2/foursquare.deprecated.json b/silhouette/test/resources/providers/oauth2/foursquare.deprecated.json similarity index 100% rename from test/resources/providers/oauth2/foursquare.deprecated.json rename to silhouette/test/resources/providers/oauth2/foursquare.deprecated.json diff --git a/test/resources/providers/oauth2/foursquare.error.json b/silhouette/test/resources/providers/oauth2/foursquare.error.json similarity index 100% rename from test/resources/providers/oauth2/foursquare.error.json rename to silhouette/test/resources/providers/oauth2/foursquare.error.json diff --git a/test/resources/providers/oauth2/foursquare.success.json b/silhouette/test/resources/providers/oauth2/foursquare.success.json similarity index 100% rename from test/resources/providers/oauth2/foursquare.success.json rename to silhouette/test/resources/providers/oauth2/foursquare.success.json diff --git a/test/resources/providers/oauth2/github.access.token.json b/silhouette/test/resources/providers/oauth2/github.access.token.json similarity index 100% rename from test/resources/providers/oauth2/github.access.token.json rename to silhouette/test/resources/providers/oauth2/github.access.token.json diff --git a/test/resources/providers/oauth2/github.error.json b/silhouette/test/resources/providers/oauth2/github.error.json similarity index 100% rename from test/resources/providers/oauth2/github.error.json rename to silhouette/test/resources/providers/oauth2/github.error.json diff --git a/test/resources/providers/oauth2/github.success.json b/silhouette/test/resources/providers/oauth2/github.success.json similarity index 100% rename from test/resources/providers/oauth2/github.success.json rename to silhouette/test/resources/providers/oauth2/github.success.json diff --git a/test/resources/providers/oauth2/google.access.token.json b/silhouette/test/resources/providers/oauth2/google.access.token.json similarity index 100% rename from test/resources/providers/oauth2/google.access.token.json rename to silhouette/test/resources/providers/oauth2/google.access.token.json diff --git a/test/resources/providers/oauth2/google.error.json b/silhouette/test/resources/providers/oauth2/google.error.json similarity index 100% rename from test/resources/providers/oauth2/google.error.json rename to silhouette/test/resources/providers/oauth2/google.error.json diff --git a/test/resources/providers/oauth2/google.success.json b/silhouette/test/resources/providers/oauth2/google.success.json similarity index 100% rename from test/resources/providers/oauth2/google.success.json rename to silhouette/test/resources/providers/oauth2/google.success.json diff --git a/test/resources/providers/oauth2/google.without.email.json b/silhouette/test/resources/providers/oauth2/google.without.email.json similarity index 100% rename from test/resources/providers/oauth2/google.without.email.json rename to silhouette/test/resources/providers/oauth2/google.without.email.json diff --git a/test/resources/providers/oauth2/instagram.access.token.json b/silhouette/test/resources/providers/oauth2/instagram.access.token.json similarity index 100% rename from test/resources/providers/oauth2/instagram.access.token.json rename to silhouette/test/resources/providers/oauth2/instagram.access.token.json diff --git a/test/resources/providers/oauth2/instagram.error.json b/silhouette/test/resources/providers/oauth2/instagram.error.json similarity index 100% rename from test/resources/providers/oauth2/instagram.error.json rename to silhouette/test/resources/providers/oauth2/instagram.error.json diff --git a/test/resources/providers/oauth2/instagram.success.json b/silhouette/test/resources/providers/oauth2/instagram.success.json similarity index 100% rename from test/resources/providers/oauth2/instagram.success.json rename to silhouette/test/resources/providers/oauth2/instagram.success.json diff --git a/test/resources/providers/oauth2/linkedin.access.token.json b/silhouette/test/resources/providers/oauth2/linkedin.access.token.json similarity index 100% rename from test/resources/providers/oauth2/linkedin.access.token.json rename to silhouette/test/resources/providers/oauth2/linkedin.access.token.json diff --git a/test/resources/providers/oauth2/linkedin.error.json b/silhouette/test/resources/providers/oauth2/linkedin.error.json similarity index 100% rename from test/resources/providers/oauth2/linkedin.error.json rename to silhouette/test/resources/providers/oauth2/linkedin.error.json diff --git a/test/resources/providers/oauth2/linkedin.success.json b/silhouette/test/resources/providers/oauth2/linkedin.success.json similarity index 100% rename from test/resources/providers/oauth2/linkedin.success.json rename to silhouette/test/resources/providers/oauth2/linkedin.success.json diff --git a/test/resources/providers/oauth2/vk.access.token.json b/silhouette/test/resources/providers/oauth2/vk.access.token.json similarity index 100% rename from test/resources/providers/oauth2/vk.access.token.json rename to silhouette/test/resources/providers/oauth2/vk.access.token.json diff --git a/test/resources/providers/oauth2/vk.error.json b/silhouette/test/resources/providers/oauth2/vk.error.json similarity index 100% rename from test/resources/providers/oauth2/vk.error.json rename to silhouette/test/resources/providers/oauth2/vk.error.json diff --git a/test/resources/providers/oauth2/vk.success.json b/silhouette/test/resources/providers/oauth2/vk.success.json similarity index 100% rename from test/resources/providers/oauth2/vk.success.json rename to silhouette/test/resources/providers/oauth2/vk.success.json