Permalink
Browse files

Changed package mistake from grails.plugin.nimble to grails.plugins.n…

…imble, Added new template for host application space views/templates/nimble/user/federationinformation to allow customization of federation details by host application
  • Loading branch information...
1 parent 1a965ca commit e13062485b7fc1b3380c516c2d2d56e5c3dcf25a Bradley Beddoes committed Jan 21, 2010
Showing with 117 additions and 114 deletions.
  1. +1 −1 NimbleGrailsPlugin.groovy
  2. +2 −2 grails-app/controllers/grails/{plugin → plugins}/nimble/core/AccountController.groovy
  3. +1 −1 grails-app/controllers/grails/{plugin → plugins}/nimble/core/AdminsController.groovy
  4. +4 −4 grails-app/controllers/grails/{plugin → plugins}/nimble/core/AuthController.groovy
  5. +1 −1 grails-app/controllers/grails/{plugin → plugins}/nimble/core/GroupController.groovy
  6. +2 −2 grails-app/controllers/grails/{plugin → plugins}/nimble/core/MainController.groovy
  7. +1 −1 grails-app/controllers/grails/{plugin → plugins}/nimble/core/RoleController.groovy
  8. +2 −2 grails-app/controllers/grails/{plugin → plugins}/nimble/core/UserController.groovy
  9. +1 −1 grails-app/domain/grails/{plugin → plugins}/nimble/core/Details.groovy
  10. +1 −1 grails-app/domain/grails/{plugin → plugins}/nimble/core/FederationProvider.groovy
  11. +1 −1 grails-app/domain/grails/{plugin → plugins}/nimble/core/Group.groovy
  12. +1 −1 grails-app/domain/grails/{plugin → plugins}/nimble/core/LevelPermission.groovy
  13. +1 −1 grails-app/domain/grails/{plugin → plugins}/nimble/core/LoginRecord.groovy
  14. +4 −4 grails-app/domain/grails/{plugin → plugins}/nimble/core/Permission.groovy
  15. +1 −1 grails-app/domain/grails/{plugin → plugins}/nimble/core/ProfileBase.groovy
  16. +1 −1 grails-app/domain/grails/{plugin → plugins}/nimble/core/Role.groovy
  17. +1 −1 grails-app/domain/grails/{plugin → plugins}/nimble/core/Url.groovy
  18. +1 −1 grails-app/domain/grails/{plugin → plugins}/nimble/core/UserBase.groovy
  19. +4 −4 grails-app/realms/grails/{plugin → plugins}/nimble/core/FacebookRealm.groovy
  20. +4 −4 grails-app/realms/grails/{plugin → plugins}/nimble/core/LocalizedRealm.groovy
  21. +4 −4 grails-app/realms/grails/{plugin → plugins}/nimble/core/OpenIDRealm.groovy
  22. +2 −2 grails-app/services/grails/{plugin → plugins}/nimble/core/AdminsService.groovy
  23. +1 −1 grails-app/services/grails/{plugin → plugins}/nimble/core/FacebookService.groovy
  24. +1 −1 grails-app/services/grails/{plugin → plugins}/nimble/core/GroupService.groovy
  25. +1 −1 grails-app/services/grails/{plugin → plugins}/nimble/core/NimbleService.groovy
  26. +3 −3 grails-app/services/grails/{plugin → plugins}/nimble/core/OpenIDService.groovy
  27. +1 −1 grails-app/services/grails/{plugin → plugins}/nimble/core/PermissionService.groovy
  28. +3 −3 grails-app/services/grails/{plugin → plugins}/nimble/core/RecaptchaService.groovy
  29. +1 −1 grails-app/services/grails/{plugin → plugins}/nimble/core/RoleService.groovy
  30. +2 −2 grails-app/services/grails/{plugin → plugins}/nimble/core/UserService.groovy
  31. +4 −4 grails-app/taglib/NimbleAuthTagLib.groovy
  32. +1 −1 grails-app/taglib/NimbleHeaderTagLib.groovy
  33. +1 −1 grails-app/taglib/NimbleInlineJSTagLib.groovy
  34. +1 −1 grails-app/taglib/NimbleTagLib.groovy
  35. +1 −1 grails-app/views/group/list.gsp
  36. +1 −1 grails-app/views/main/index.gsp
  37. +1 −1 grails-app/views/role/list.gsp
  38. +19 −0 grails-app/views/templates/nimble/user/_federationinformation.gsp
  39. +1 −1 grails-app/views/user/list.gsp
  40. +1 −17 grails-app/views/user/show.gsp
  41. +3 −3 src/groovy/grails/{plugin → plugins}/nimble/InstanceGenerator.groovy
  42. +1 −1 src/groovy/grails/{plugin → plugins}/nimble/auth/AccountCreatedException.groovy
  43. +1 −1 src/groovy/grails/{plugin → plugins}/nimble/auth/AllPermission.groovy
  44. +1 −1 src/groovy/grails/{plugin → plugins}/nimble/auth/CorePermissions.groovy
  45. +1 −1 src/groovy/grails/{plugin → plugins}/nimble/auth/FacebookConnectToken.groovy
  46. +1 −1 src/groovy/grails/{plugin → plugins}/nimble/auth/OpenIDToken.groovy
  47. +1 −1 src/groovy/grails/{plugin → plugins}/nimble/auth/WildcardPermission.groovy
  48. +1 −1 src/groovy/grails/{plugin → plugins}/nimble/security/NimbleFilterBase.groovy
  49. +6 −6 src/templates/conf/NimbleBootStrap.groovy
  50. +2 −2 src/templates/conf/NimbleSecurityFilters.groovy
  51. +1 −1 src/templates/domain/Base.groovy
  52. +1 −1 test/unit/grails/{plugin → plugins}/nimble/core/AccountControllerTests.groovy
  53. +1 −1 test/unit/grails/{plugin → plugins}/nimble/core/DetailsTests.groovy
  54. +1 −1 test/unit/grails/{plugin → plugins}/nimble/core/FederationProviderTests.groovy
  55. +1 −1 test/unit/grails/{plugin → plugins}/nimble/core/GroupTests.groovy
  56. +1 −1 test/unit/grails/{plugin → plugins}/nimble/core/LevelPermissionTests.groovy
  57. +1 −1 test/unit/grails/{plugin → plugins}/nimble/core/LoginRecordTests.groovy
  58. +3 −3 test/unit/grails/{plugin → plugins}/nimble/core/PermissionTests.groovy
  59. +1 −1 test/unit/grails/{plugin → plugins}/nimble/core/RoleTests.groovy
  60. +1 −1 test/unit/grails/{plugin → plugins}/nimble/core/UrlTests.groovy
  61. +1 −1 test/unit/grails/{plugin → plugins}/nimble/core/UserTests.groovy
  62. +1 −1 web-app/WEB-INF/applicationContext.xml
@@ -22,7 +22,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl
import org.apache.shiro.authc.credential.Sha256CredentialsMatcher
import org.apache.shiro.SecurityUtils
-import grails.plugin.nimble.core.UserBase
+import grails.plugins.nimble.core.UserBase
class NimbleGrailsPlugin {
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.apache.shiro.SecurityUtils
import org.apache.shiro.crypto.hash.Sha256Hash
-import grails.plugin.nimble.InstanceGenerator
+import grails.plugins.nimble.InstanceGenerator
/**
* Manages all common user account tasks.
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.apache.shiro.SecurityUtils
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import javax.servlet.http.Cookie
import org.openid4java.message.ParameterList
@@ -25,8 +25,8 @@ import org.apache.shiro.authc.UsernamePasswordToken
import org.apache.shiro.authc.IncorrectCredentialsException
import org.apache.shiro.authc.DisabledAccountException
-import grails.plugin.nimble.auth.FacebookConnectToken
-import grails.plugin.nimble.auth.AccountCreatedException
+import grails.plugins.nimble.auth.FacebookConnectToken
+import grails.plugins.nimble.auth.AccountCreatedException
/**
* Manages all authentication processes including integration with OpenID, Facebook etc.
@@ -35,7 +35,7 @@ import grails.plugin.nimble.auth.AccountCreatedException
*/
class AuthController {
- private static String TARGET = 'grails.plugin.nimble.controller.AuthController.TARGET'
+ private static String TARGET = 'grails.plugins.nimble.controller.AuthController.TARGET'
def shiroSecurityManager
def facebookService
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.apache.shiro.authz.annotation.RequiresRoles
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
class MainController {
def index = {
- log.debug 'grails.plugin.nimble.MainController - index - executed'
+ log.debug 'grails.plugins.nimble.MainController - index - executed'
// This relies on the fact that the session is authenticated which is enforced by
// NimbleSecurityFilters, authenticatedUser is auto populated to controllers
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
/**
* Manages Nimble roles including addition/removal of users, groups and permissions
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
-import grails.plugin.nimble.InstanceGenerator
+import grails.plugins.nimble.InstanceGenerator
/**
* Manages Nimble user accounts
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
/**
* Represents an object that we wish to store a basic set of information about
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.codehaus.groovy.grails.commons.ConfigurationHolder
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.codehaus.groovy.grails.commons.ConfigurationHolder
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
/**
* Represents a WildcardPermission in the data repository.
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
/**
* Represents a system that a user logged into a Nimble based application from
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.codehaus.groovy.grails.commons.ConfigurationHolder
@@ -26,9 +26,9 @@ import org.codehaus.groovy.grails.commons.ConfigurationHolder
*/
class Permission implements Serializable {
- static public final String defaultPerm = "grails.plugin.nimble.auth.WildcardPermission"
- static public final String wildcardPerm = "grails.plugin.nimble.auth.WildcardPermission"
- static public final String adminPerm = "grails.plugin.nimble.auth.AllPermission"
+ static public final String defaultPerm = "grails.plugins.nimble.auth.WildcardPermission"
+ static public final String wildcardPerm = "grails.plugins.nimble.auth.WildcardPermission"
+ static public final String adminPerm = "grails.plugins.nimble.auth.AllPermission"
String type
String possibleActions = "*"
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.apache.shiro.crypto.hash.Md5Hash
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.codehaus.groovy.grails.commons.ConfigurationHolder
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
/**
* Represents a web based url with extended information for display purposes.
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.codehaus.groovy.grails.commons.ConfigurationHolder
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.apache.shiro.authc.UnknownAccountException
import org.apache.shiro.authc.DisabledAccountException
@@ -24,8 +24,8 @@ import org.apache.shiro.authc.IncorrectCredentialsException
import com.google.code.facebookapi.ProfileField
import grails.converters.JSON
-import grails.plugin.nimble.auth.AccountCreatedException
-import grails.plugin.nimble.InstanceGenerator
+import grails.plugins.nimble.auth.AccountCreatedException
+import grails.plugins.nimble.InstanceGenerator
/**
* Integrates with Shiro to establish a session for users accessing the system based
@@ -34,7 +34,7 @@ import grails.plugin.nimble.InstanceGenerator
* @author Bradley Beddoes
*/
public class FacebookRealm {
- static authTokenClass = grails.plugin.nimble.auth.FacebookConnectToken
+ static authTokenClass = grails.plugins.nimble.auth.FacebookConnectToken
def grailsApplication
def facebookService
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.apache.shiro.authz.permission.AllPermission
import org.apache.shiro.authz.permission.WildcardPermission
@@ -59,7 +59,7 @@ class LocalizedRealm {
throw new DisabledAccountException("This account is currently disabled")
}
- def account = new SimpleAccount(user.id, user.passwordHash, "grails.plugin.nimble.realms.LocalizedRealm")
+ def account = new SimpleAccount(user.id, user.passwordHash, "grails.plugins.nimble.realms.LocalizedRealm")
if (!credentialMatcher.doCredentialsMatch(authToken, account)) {
log.warn "Supplied password for user [$user.id]$user.username is incorrect"
throw new IncorrectCredentialsException("Invalid password for user '${username}'")
@@ -258,7 +258,7 @@ class LocalizedRealm {
protected boolean validatePermission(permission, requiredPermission) {
boolean permitted = false;
- if (permission.type.equals(WildcardPermission.class.name) || permission.type.equals(grails.plugin.nimble.auth.WildcardPermission.class.name)) {
+ if (permission.type.equals(WildcardPermission.class.name) || permission.type.equals(grails.plugins.nimble.auth.WildcardPermission.class.name)) {
def perm = new WildcardPermission(permission.target, false)
if (perm.implies(requiredPermission)) {
@@ -269,7 +269,7 @@ class LocalizedRealm {
log.debug("Permission $permission does not imply $requiredPermission")
}
}
- else if (permission.type.equals(AllPermission.class.name) || permission.type.equals(grails.plugin.nimble.auth.AllPermission.class.name)) {
+ else if (permission.type.equals(AllPermission.class.name) || permission.type.equals(grails.plugins.nimble.auth.AllPermission.class.name)) {
def perm = new AllPermission()
if (perm.implies(requiredPermission)) {
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.openid4java.consumer.ConsumerManager
import org.openid4java.discovery.DiscoveryInformation
@@ -25,8 +25,8 @@ import org.apache.shiro.authc.DisabledAccountException
import org.apache.shiro.authc.SimpleAccount
import org.apache.shiro.authc.IncorrectCredentialsException
-import grails.plugin.nimble.InstanceGenerator
-import grails.plugin.nimble.auth.OpenIDToken
+import grails.plugins.nimble.InstanceGenerator
+import grails.plugins.nimble.auth.OpenIDToken
/**
* Integrates with Shiro to establish a session for users accessing the system based
@@ -36,7 +36,7 @@ import grails.plugin.nimble.auth.OpenIDToken
*/
public class OpenIDRealm {
- static authTokenClass = grails.plugin.nimble.auth.OpenIDToken
+ static authTokenClass = grails.plugins.nimble.auth.OpenIDToken
def grailsApplication
def openIDService
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.apache.shiro.authz.permission.AllPermission
@@ -134,7 +134,7 @@ class AdminsService {
// Revoke administrative 'ALL' permission(s)
def permToRemove = []
user.permissions.each {
- if (it.type.equals(AllPermission.class.name) || it.type.equals(grails.plugin.nimble.auth.AllPermission.class.name)) {
+ if (it.type.equals(AllPermission.class.name) || it.type.equals(grails.plugins.nimble.auth.AllPermission.class.name)) {
permToRemove.add(it)
log.debug("Found $it.type for user [$user.id]$user.username adding to remove queue")
}
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.springframework.beans.factory.InitializingBean
import com.google.code.facebookapi.FacebookJsonRestClient
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
/**
* Provides methods for interacting with Nimble group membership.
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.apache.shiro.SecurityUtils
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
import org.openid4java.discovery.DiscoveryInformation
import org.openid4java.message.AuthRequest
@@ -28,7 +28,7 @@ import org.openid4java.message.AuthSuccess
import org.openid4java.message.ax.FetchResponse
import org.openid4java.message.ax.AxMessage
-import grails.plugin.nimble.auth.OpenIDToken
+import grails.plugins.nimble.auth.OpenIDToken
/**
* Provides methods for interacting with OpenID authentication processes.
@@ -177,7 +177,7 @@ class OpenIDService {
* @param response A populated org.openid4java.message.ParameterList associated with the response
* @param receivingUrl The exact Url request ncluding parameters the OpenID IDP directed the user to locally
*
- * @return A populated grails.plugin.nimble.auth.OpenIDToken or null on error
+ * @return A populated grails.plugins.nimble.auth.OpenIDToken or null on error
*/
def processResponse(def discovered, def response, def receivingUrl) {
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.plugin.nimble.core
+package grails.plugins.nimble.core
/**
* Provides methods for interacting with Nimble permissions.
Oops, something went wrong.

0 comments on commit e130624

Please sign in to comment.