You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/05/05 08:58:51 UTC
svn commit: r535465 [22/49] - in /jakarta/turbine/fulcrum/trunk: ./ bsf/
bsf/src/java/org/apache/fulcrum/bsf/ bsf/src/test/ bsf/xdocs/ cache/
cache/src/java/org/apache/fulcrum/cache/
cache/src/java/org/apache/fulcrum/cache/impl/ cache/src/test/ cache/s...
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicGroup.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicGroup.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicGroup.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicGroup.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.model.dynamic.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.util.Set;
@@ -25,7 +28,7 @@
* Represents the "dynamic" model where permissions are related to roles,
* roles are related to groups and groups are related to userSet,
* all in many to many relationships.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -33,42 +36,42 @@
{
/**
* Get the roles that are part of this group
- *
+ *
* @return a set of roles
*/
public RoleSet getRoles();
/**
* Set the roles that are part of this group
- *
+ *
* @param roleSet a set of roles
*/
public void setRoles(RoleSet roleSet);
/**
* Add a role to this group
- *
+ *
* @param role the role to add
*/
public void addRole(Role role);
/**
* Remove a role from this group
- *
+ *
* @param role the role to remove
*/
public void removeRole(Role role);
/**
* Set the roles that are part of this group as Set
- *
+ *
* @param roles a set of roles
*/
public void setRolesAsSet(Set roles);
/**
* Get the roles that are part of this group as Set
- *
+ *
* @return a set of roles
*/
public Set getRolesAsSet();
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicPermission.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicPermission.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicPermission.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicPermission.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.model.dynamic.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.util.Set;
@@ -33,42 +36,42 @@
{
/**
* Get the roles that this permission belongs to
- *
+ *
* @return a set of roles
*/
public RoleSet getRoles();
/**
* Set the roles that this permission belongs to
- *
+ *
* @param roleSet a set of roles
*/
public void setRoles(RoleSet roleSet);
/**
* Add a role to this permission
- *
+ *
* @param role the role to add
*/
public void addRole(Role role);
/**
* Remove a role from this permission
- *
+ *
* @param role the role to remove
*/
public void removeRole(Role role);
/**
* Set the roles that this permission belongs to as Set
- *
+ *
* @param roles a set of roles
*/
public void setRolesAsSet(Set roles);
/**
* Get the roles that this permission belongs to as Set
- *
+ *
* @return a set of roles
*/
public Set getRolesAsSet();
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicRole.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicRole.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicRole.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicRole.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.model.dynamic.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.util.Set;
@@ -35,28 +38,28 @@
{
/**
* Get the permission that are part of this role
- *
+ *
* @return a set of permissions
*/
public PermissionSet getPermissions();
/**
* Get the permission that are part of this role as Set
- *
+ *
* @return a set of permissions
*/
public Set getPermissionsAsSet();
/**
* Set the permission that are part of this role
- *
+ *
* @param permissionSet a set of permissions
*/
public void setPermissions(PermissionSet permissionSet);
/**
* Set the permission that are part of this role as Set
- *
+ *
* @param permissions a set of permissions
*/
public void setPermissionsAsSet(Set permissions);
@@ -75,14 +78,14 @@
/**
* Get the groups this role belongs to
- *
+ *
* @return a set of groups
*/
public GroupSet getGroups();
/**
* Set the groups this role belongs to
- *
+ *
* @param groups the set of groups
*/
public void setGroups(GroupSet groups);
@@ -101,14 +104,14 @@
/**
* Set the groups this role belongs to as a Set
- *
+ *
* @param groups the set of groups
*/
public void setGroupsAsSet(Set groups);
/**
* Get the groups this role belongs to as a Set
- *
+ *
* @return a set of groups
*/
public Set getGroupsAsSet();
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicUser.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicUser.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicUser.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicUser.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.model.dynamic.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.util.Set;
@@ -24,11 +27,11 @@
* Represents the "simple" model where permissions are related to roles, roles
* are related to groups and groups are related to users, all in many to many
* relationships.
- *
+ *
* Users have a set of delegates and delegatee's. If user A has B in their
* delegates - B assumes A's groups,roles and permissions If user C has D in
* their delegatees - C assumes D's groups,roles and permissions
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicGroupImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicGroupImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicGroupImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicGroupImpl.java Fri May 4 23:58:06 2007
@@ -1,76 +1,79 @@
-package org.apache.fulcrum.security.model.dynamic.entity.impl;
-/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * 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.
- */
-
-import java.util.Set;
-
-import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.model.basic.entity.impl.BasicGroupImpl;
-import org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup;
-import org.apache.fulcrum.security.util.RoleSet;
-
-/**
- * Represents the "dynamic" model where permissions are related to roles,
- * roles are related to groups and groups are related to userSet,
- * all in many to many relationships.
- *
- * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
- * @version $Id: DynamicGroup.java 223057 2004-07-05 19:28:23Z epugh $
- */
-public class DynamicGroupImpl extends BasicGroupImpl implements DynamicGroup
-{
- private Set roleSet = new RoleSet();
-
- /**
- * @return
- */
- public RoleSet getRoles()
- {
- if( roleSet instanceof RoleSet )
- return (RoleSet) roleSet;
- else {
- roleSet = new RoleSet(roleSet);
- return (RoleSet)roleSet;
- }
- }
- /**
- * @param roleSet
- */
- public void setRoles(RoleSet roleSet)
- {
- if( roleSet != null )
- this.roleSet = roleSet;
- else
- this.roleSet = new RoleSet();
- }
- public void addRole(Role role)
- {
- getRoles().add(role);
- }
- public void removeRole(Role role)
- {
- getRoles().remove(role);
- }
-
- public void setRolesAsSet(Set roles)
- {
- this.roleSet = roles;
- }
- public Set getRolesAsSet()
- {
- return roleSet;
- }
-}
+package org.apache.fulcrum.security.model.dynamic.entity.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import java.util.Set;
+
+import org.apache.fulcrum.security.entity.Role;
+import org.apache.fulcrum.security.model.basic.entity.impl.BasicGroupImpl;
+import org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup;
+import org.apache.fulcrum.security.util.RoleSet;
+
+/**
+ * Represents the "dynamic" model where permissions are related to roles,
+ * roles are related to groups and groups are related to userSet,
+ * all in many to many relationships.
+ *
+ * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
+ * @version $Id: DynamicGroup.java 223057 2004-07-05 19:28:23Z epugh $
+ */
+public class DynamicGroupImpl extends BasicGroupImpl implements DynamicGroup
+{
+ private Set roleSet = new RoleSet();
+
+ /**
+ * @return
+ */
+ public RoleSet getRoles()
+ {
+ if( roleSet instanceof RoleSet )
+ return (RoleSet) roleSet;
+ else {
+ roleSet = new RoleSet(roleSet);
+ return (RoleSet)roleSet;
+ }
+ }
+ /**
+ * @param roleSet
+ */
+ public void setRoles(RoleSet roleSet)
+ {
+ if( roleSet != null )
+ this.roleSet = roleSet;
+ else
+ this.roleSet = new RoleSet();
+ }
+ public void addRole(Role role)
+ {
+ getRoles().add(role);
+ }
+ public void removeRole(Role role)
+ {
+ getRoles().remove(role);
+ }
+
+ public void setRolesAsSet(Set roles)
+ {
+ this.roleSet = roles;
+ }
+ public Set getRolesAsSet()
+ {
+ return roleSet;
+ }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicPermissionImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicPermissionImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicPermissionImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicPermissionImpl.java Fri May 4 23:58:06 2007
@@ -1,92 +1,95 @@
-package org.apache.fulcrum.security.model.dynamic.entity.impl;
-/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * 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.
- */
-
-import java.util.Set;
-
-import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
-import org.apache.fulcrum.security.model.dynamic.entity.DynamicPermission;
-import org.apache.fulcrum.security.util.RoleSet;
-
-/**
- * Represents the "simple" model where permissions are related to roles,
- * roles are related to groups and groups are related to users,
- * all in many to many relationships.
- *
- * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
- * @version $Id: DynamicPermission.java 223059 2004-07-07 16:49:09Z epugh $
- */
-public class DynamicPermissionImpl extends SecurityEntityImpl implements DynamicPermission
-{
-
- private Set roleSet = new RoleSet();
-
-
- /**
- * @return
- */
- public RoleSet getRoles() {
- if (roleSet instanceof RoleSet)
- return (RoleSet) roleSet;
- else {
- roleSet = new RoleSet(roleSet);
- return (RoleSet) roleSet;
- }
- }
-
- /**
- * @param roleSet
- */
- public void setRoles(RoleSet roleSet) {
- if (roleSet != null)
- this.roleSet = roleSet;
- else
- this.roleSet = new RoleSet();
- }
-
- /**
- * Add a role to the RoleSet
- * @param role the role to add
- */
- public void addRole(Role role) {
- getRoles().add(role);
- }
-
- /**
- * Remove a role from the RoleSet
- * @param role the role to remove
- */
- public void removeRole(Role role) {
- getRoles().remove(role);
- }
-
- /**
- *
- * @param roles
- */
- public void setRolesAsSet(Set roles) {
- this.roleSet = roles;
- }
-
- /**
- *
- * @return
- */
- public Set getRolesAsSet() {
- return roleSet;
- }
-}
+package org.apache.fulcrum.security.model.dynamic.entity.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import java.util.Set;
+
+import org.apache.fulcrum.security.entity.Role;
+import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
+import org.apache.fulcrum.security.model.dynamic.entity.DynamicPermission;
+import org.apache.fulcrum.security.util.RoleSet;
+
+/**
+ * Represents the "simple" model where permissions are related to roles,
+ * roles are related to groups and groups are related to users,
+ * all in many to many relationships.
+ *
+ * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
+ * @version $Id: DynamicPermission.java 223059 2004-07-07 16:49:09Z epugh $
+ */
+public class DynamicPermissionImpl extends SecurityEntityImpl implements DynamicPermission
+{
+
+ private Set roleSet = new RoleSet();
+
+
+ /**
+ * @return
+ */
+ public RoleSet getRoles() {
+ if (roleSet instanceof RoleSet)
+ return (RoleSet) roleSet;
+ else {
+ roleSet = new RoleSet(roleSet);
+ return (RoleSet) roleSet;
+ }
+ }
+
+ /**
+ * @param roleSet
+ */
+ public void setRoles(RoleSet roleSet) {
+ if (roleSet != null)
+ this.roleSet = roleSet;
+ else
+ this.roleSet = new RoleSet();
+ }
+
+ /**
+ * Add a role to the RoleSet
+ * @param role the role to add
+ */
+ public void addRole(Role role) {
+ getRoles().add(role);
+ }
+
+ /**
+ * Remove a role from the RoleSet
+ * @param role the role to remove
+ */
+ public void removeRole(Role role) {
+ getRoles().remove(role);
+ }
+
+ /**
+ *
+ * @param roles
+ */
+ public void setRolesAsSet(Set roles) {
+ this.roleSet = roles;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public Set getRolesAsSet() {
+ return roleSet;
+ }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicRoleImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicRoleImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicRoleImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicRoleImpl.java Fri May 4 23:58:06 2007
@@ -1,140 +1,143 @@
-package org.apache.fulcrum.security.model.dynamic.entity.impl;
-/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * 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.
- */
-
-import java.util.Set;
-
-import org.apache.fulcrum.security.entity.Group;
-import org.apache.fulcrum.security.entity.Permission;
-import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
-import org.apache.fulcrum.security.model.dynamic.entity.DynamicRole;
-import org.apache.fulcrum.security.util.GroupSet;
-import org.apache.fulcrum.security.util.PermissionSet;
-
-/**
- * Represents the "simple" model where permissions are related to roles,
- * roles are related to groups and groups are related to users,
- * all in many to many relationships.
- *
- * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
- * @version $Id: DynamicRole.java 437451 2006-08-27 20:20:44Z tv $
- */
-public class DynamicRoleImpl extends SecurityEntityImpl implements DynamicRole
-{
- private Set permissionSet = new PermissionSet();
-
- private Set groupSet = new GroupSet();
- /**
- * @return
- */
- public PermissionSet getPermissions()
- {
- if( permissionSet instanceof PermissionSet )
- return (PermissionSet) permissionSet;
- else {
- permissionSet = new PermissionSet(permissionSet);
- return (PermissionSet)permissionSet;
- }
- }
- /**
- * @return
- */
- public Set getPermissionsAsSet()
- {
- return permissionSet;
- }
-
- public void setPermissionsAsSet(Set permissions)
- {
- this.permissionSet = permissions;
- }
- /**
- * @param permissionSet
- */
- public void setPermissions(PermissionSet permissionSet)
- {
- if( permissionSet != null )
- this.permissionSet = permissionSet;
- else
- this.permissionSet = new PermissionSet();
- }
-
- /**
- * This method should only be used by a RoleManager. Not directly.
- * @param permission
- */
- public void addPermission(Permission permission)
- {
- getPermissions().add(permission);
- }
- /**
- * This method should only be used by a RoleManager. Not directly.
- * @param permission
- */
- public void removePermission(Permission permission)
- {
- getPermissions().remove(permission);
- }
-
- /**
- * @return
- */
- public GroupSet getGroups()
- {
- if( groupSet instanceof GroupSet )
- return (GroupSet) groupSet;
- else {
- groupSet = new GroupSet(groupSet);
- return (GroupSet)groupSet;
- }
- }
- /**
- * @param groupSet
- */
- public void setGroups(GroupSet groupSet)
- {
- if( groupSet != null )
- this.groupSet = groupSet;
- else
- this.groupSet = new GroupSet();
- }
-
- /**
- * This method should only be used by a RoleManager. Not directly.
- * @param group
- */
- public void addGroup(Group group)
- {
- getGroups().add(group);
- }
- /**
- * This method should only be used by a RoleManager. Not directly.
- * @param group
- */
- public void removeGroup(Group group)
- {
- getGroups().remove(group);
- }
-
- public void setGroupsAsSet(Set groups)
- {
- this.groupSet = groups;
- }
- public Set getGroupsAsSet()
- {
- return groupSet;
- }
-}
+package org.apache.fulcrum.security.model.dynamic.entity.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import java.util.Set;
+
+import org.apache.fulcrum.security.entity.Group;
+import org.apache.fulcrum.security.entity.Permission;
+import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
+import org.apache.fulcrum.security.model.dynamic.entity.DynamicRole;
+import org.apache.fulcrum.security.util.GroupSet;
+import org.apache.fulcrum.security.util.PermissionSet;
+
+/**
+ * Represents the "simple" model where permissions are related to roles,
+ * roles are related to groups and groups are related to users,
+ * all in many to many relationships.
+ *
+ * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
+ * @version $Id: DynamicRole.java 437451 2006-08-27 20:20:44Z tv $
+ */
+public class DynamicRoleImpl extends SecurityEntityImpl implements DynamicRole
+{
+ private Set permissionSet = new PermissionSet();
+
+ private Set groupSet = new GroupSet();
+ /**
+ * @return
+ */
+ public PermissionSet getPermissions()
+ {
+ if( permissionSet instanceof PermissionSet )
+ return (PermissionSet) permissionSet;
+ else {
+ permissionSet = new PermissionSet(permissionSet);
+ return (PermissionSet)permissionSet;
+ }
+ }
+ /**
+ * @return
+ */
+ public Set getPermissionsAsSet()
+ {
+ return permissionSet;
+ }
+
+ public void setPermissionsAsSet(Set permissions)
+ {
+ this.permissionSet = permissions;
+ }
+ /**
+ * @param permissionSet
+ */
+ public void setPermissions(PermissionSet permissionSet)
+ {
+ if( permissionSet != null )
+ this.permissionSet = permissionSet;
+ else
+ this.permissionSet = new PermissionSet();
+ }
+
+ /**
+ * This method should only be used by a RoleManager. Not directly.
+ * @param permission
+ */
+ public void addPermission(Permission permission)
+ {
+ getPermissions().add(permission);
+ }
+ /**
+ * This method should only be used by a RoleManager. Not directly.
+ * @param permission
+ */
+ public void removePermission(Permission permission)
+ {
+ getPermissions().remove(permission);
+ }
+
+ /**
+ * @return
+ */
+ public GroupSet getGroups()
+ {
+ if( groupSet instanceof GroupSet )
+ return (GroupSet) groupSet;
+ else {
+ groupSet = new GroupSet(groupSet);
+ return (GroupSet)groupSet;
+ }
+ }
+ /**
+ * @param groupSet
+ */
+ public void setGroups(GroupSet groupSet)
+ {
+ if( groupSet != null )
+ this.groupSet = groupSet;
+ else
+ this.groupSet = new GroupSet();
+ }
+
+ /**
+ * This method should only be used by a RoleManager. Not directly.
+ * @param group
+ */
+ public void addGroup(Group group)
+ {
+ getGroups().add(group);
+ }
+ /**
+ * This method should only be used by a RoleManager. Not directly.
+ * @param group
+ */
+ public void removeGroup(Group group)
+ {
+ getGroups().remove(group);
+ }
+
+ public void setGroupsAsSet(Set groups)
+ {
+ this.groupSet = groups;
+ }
+ public Set getGroupsAsSet()
+ {
+ return groupSet;
+ }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicUserImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicUserImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicUserImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/impl/DynamicUserImpl.java Fri May 4 23:58:06 2007
@@ -1,81 +1,84 @@
-package org.apache.fulcrum.security.model.dynamic.entity.impl;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * 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.
- */
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.fulcrum.security.model.basic.entity.impl.BasicUserImpl;
-import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
-
-/**
- * Represents the "simple" model where permissions are related to roles, roles
- * are related to groups and groups are related to users, all in many to many
- * relationships.
- *
- * Users have a set of delegates and delegatee's. If user A has B in their
- * delegates - B assumes A's groups,roles and permissions If user C has D in
- * their delegatees - C assumes D's groups,roles and permissions
- *
- * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
- * @version $Id: DynamicUser.java 437451 2006-08-27 20:20:44Z tv $
- */
-public class DynamicUserImpl extends BasicUserImpl implements DynamicUser
-{
- /**
- * Serial number
- */
- private static final long serialVersionUID = 2841311062371647853L;
-
- private Set delegators = new HashSet();
-
- private Set delegatees = new HashSet();
-
- /**
- * @return Returns the delegatees.
- */
- public Set getDelegatees()
- {
- return delegatees;
- }
-
- /**
- * @param delegatees
- * The delegatees to set.
- */
- public void setDelegatees(Set delegatees)
- {
- this.delegatees = delegatees;
- }
-
- /**
- * @return Returns the delegators.
- */
- public Set getDelegators()
- {
- return delegators;
- }
-
- /**
- * @param delegates
- * The delegators to set.
- */
- public void setDelegators(Set delegates)
- {
- this.delegators = delegates;
- }
-}
+package org.apache.fulcrum.security.model.dynamic.entity.impl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.fulcrum.security.model.basic.entity.impl.BasicUserImpl;
+import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
+
+/**
+ * Represents the "simple" model where permissions are related to roles, roles
+ * are related to groups and groups are related to users, all in many to many
+ * relationships.
+ *
+ * Users have a set of delegates and delegatee's. If user A has B in their
+ * delegates - B assumes A's groups,roles and permissions If user C has D in
+ * their delegatees - C assumes D's groups,roles and permissions
+ *
+ * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
+ * @version $Id: DynamicUser.java 437451 2006-08-27 20:20:44Z tv $
+ */
+public class DynamicUserImpl extends BasicUserImpl implements DynamicUser
+{
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = 2841311062371647853L;
+
+ private Set delegators = new HashSet();
+
+ private Set delegatees = new HashSet();
+
+ /**
+ * @return Returns the delegatees.
+ */
+ public Set getDelegatees()
+ {
+ return delegatees;
+ }
+
+ /**
+ * @param delegatees
+ * The delegatees to set.
+ */
+ public void setDelegatees(Set delegatees)
+ {
+ this.delegatees = delegatees;
+ }
+
+ /**
+ * @return Returns the delegators.
+ */
+ public Set getDelegators()
+ {
+ return delegators;
+ }
+
+ /**
+ * @param delegates
+ * The delegators to set.
+ */
+ public void setDelegators(Set delegates)
+ {
+ this.delegators = delegates;
+ }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/test/AbstractDynamicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/test/AbstractDynamicModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/test/AbstractDynamicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/test/AbstractDynamicModelManagerTest.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.model.dynamic.test;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.util.HashSet;
@@ -45,7 +48,7 @@
/**
* @author Eric Pugh
* @author <a href="mailto:ben@gidley.co.uk">Ben Gidley </a>
- *
+ *
*/
public abstract class AbstractDynamicModelManagerTest extends BaseUnitTest {
private static final String ONLY_BORRIS_PERMISSION = "ONLY_BORRIS_PERMISSION";
@@ -91,7 +94,7 @@
/**
* Constructor for AbstractRoleManagerTest.
- *
+ *
* @param arg0
*/
public AbstractDynamicModelManagerTest(String arg0) {
@@ -343,17 +346,17 @@
DynamicAccessControlList acl = (DynamicAccessControlList) userManager.getACL(sam);
assertTrue(acl.hasPermission(permission));
assertTrue(acl.hasRole(role));
-
+
// Now just to be silly make it recursive and check permissions work
modelManager.addDelegate(sam, borris);
acl = (DynamicAccessControlList) userManager.getACL(sam);
assertTrue(acl.hasPermission(permission));
assertTrue(acl.hasRole(role));
-
+
modelManager.removeDelegate(borris, sam);
assertFalse(borris.getDelegatees().contains(sam));
assertFalse(sam.getDelegators().contains(borris));
-
+
borrisLoaded = (DynamicUser) userManager.getUser(USERNAME_BORRIS);
samLoaded = (DynamicUser) userManager.getUser(USERNAME_BORRIS);
assertFalse(borrisLoaded.getDelegatees().contains(samLoaded));
@@ -369,4 +372,4 @@
}
assertTrue(thrown);
}
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractGroupManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractGroupManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractGroupManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractGroupManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.model.test;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.fulcrum.security.GroupManager;
@@ -132,7 +135,7 @@
Group group2 = groupManager.getGroupInstance("WALK_DOGS");
assertFalse(groupManager.checkExists(group2));
}
-
+
public void testCheckExistsWithString() throws Exception
{
group = groupManager.getGroupInstance("GREET_PEOPLE2");
@@ -141,7 +144,7 @@
Group group2 = groupManager.getGroupInstance("WALK_DOGS2");
assertFalse(groupManager.checkExists(group2.getName()));
}
-
+
/*
* Class to test for boolean checkExists(string)
*/
@@ -157,7 +160,7 @@
catch (EntityExistsException uee){
//good
}
- }
+ }
public void testAddGroup() throws Exception
{
group = groupManager.getGroupInstance("CLEAN_RABBIT_HUTCHES");
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractPermissionManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractPermissionManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractPermissionManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractPermissionManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.model.test;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.fulcrum.security.PermissionManager;
@@ -161,7 +164,7 @@
Permission permission2 = permissionManager.getPermissionInstance("CLOSE_OFFICE2");
assertFalse(permissionManager.checkExists(permission2.getName()));
}
-
+
/*
* Class to test for boolean checkExists(string)
*/
@@ -177,5 +180,5 @@
catch (EntityExistsException uee){
//good
}
- }
+ }
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractRoleManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractRoleManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractRoleManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractRoleManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.model.test;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.fulcrum.security.RoleManager;
@@ -76,7 +79,7 @@
Role role2 = roleManager.getRoleById(role.getId());
assertEquals(role.getName(), role2.getName());
}
-
+
public void testRenameRole() throws Exception
{
role = roleManager.getRoleInstance("CLEAN_KENNEL_X");
@@ -96,7 +99,7 @@
assertEquals(size + 1, roleSet.size());
}
-
+
public void testAddRole() throws Exception
{
role = roleManager.getRoleInstance("DOG_NAPPER");
@@ -153,5 +156,5 @@
catch (EntityExistsException uee){
//good
}
- }
+ }
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractUserManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractUserManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractUserManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/test/AbstractUserManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.model.test;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.fulcrum.security.SecurityService;
@@ -34,7 +37,7 @@
protected User user;
protected UserManager userManager;
protected SecurityService securityService;
-
+
/**
* Constructor for AbstractUserManagerTest.
* @param arg0
@@ -53,7 +56,7 @@
user = userManager.getUserInstance("ImaginaryFriend");
assertFalse(userManager.checkExists(user));
}
-
+
public void testCheckExistsWithString() throws Exception
{
user = userManager.getUserInstance("Philip2");
@@ -74,7 +77,7 @@
user = userManager.getUser("QuietMike");
assertNotNull(user);
}
-
+
public void testGetUserById() throws Exception
{
user = userManager.getUserInstance("QuietMike2");
@@ -82,7 +85,7 @@
User user2 = userManager.getUserById(user.getId());
assertEquals(user.getName(), user2.getName());
assertEquals(user.getId(), user2.getId());
- }
+ }
/*
* Class to test for User retrieve(String, String)
*/
@@ -111,8 +114,8 @@
userManager.addUser(user,"");
UserSet userSet = userManager.getAllUsers();
assertEquals(size + 1, userSet.size());
- }
-
+ }
+
public void testAuthenticate() throws Exception
{
user = userManager.getUserInstance("Kay");
@@ -168,7 +171,7 @@
user = userManager.getUserInstance("Philip");
assertEquals("philip", user.getName());
}
-
+
/**
* Need to figure out if save is something we want..
* right now it just bloes up if you actually cahnge anything.
@@ -184,7 +187,7 @@
userManager.saveUser(user);
assertEquals("kate", userManager.getUser(user.getName()).getName());
}
-
+
public void testGetACL() throws Exception
{
user = userManager.getUserInstance("Tony");
@@ -218,7 +221,7 @@
assertNotNull(user.getId());
assertNotNull(userManager.getUser(user.getName()));
}
-
+
/*
* Class to test for boolean checkExists(string)
*/
@@ -239,14 +242,14 @@
}
catch (EntityExistsException uee){
//good
- }
+ }
}
-
+
public void testCheckUserCaseSensitiveExists() throws Exception {
user = userManager.getUserInstance("borrisJohnson");
userManager.addUser(user,"bob");
-
+
assertTrue(userManager.checkExists("borrisJohnson"));
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/AbstractTurbineModelManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/AbstractTurbineModelManager.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/AbstractTurbineModelManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/AbstractTurbineModelManager.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.model.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.fulcrum.security.entity.Group;
@@ -31,7 +34,7 @@
/**
* Holds shared functionality between different implementations of
* TurbineModelManager's.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh </a>
* @version $Id: AbstractDynamicModelManager.java,v 1.2 2004/07/07 18:18:09
* epugh Exp $
@@ -41,7 +44,7 @@
/**
* Provides a reference to the Group object that represents the <a
* href="#global">global group </a>.
- *
+ *
* @return A Group object that represents the global group.
*/
public Group getGlobalGroup() throws DataBackendException {
@@ -58,12 +61,12 @@
}
return g;
- }
+ }
/**
* Revokes all permissions and groups from a Role.
- *
+ *
* This method is used when deleting a Role.
- *
+ *
* @param role
* the Role
* @throws DataBackendException
@@ -88,12 +91,12 @@
}
}
-
+
/**
* Revokes all roles and groups from a User.
- *
+ *
* This method is used when deleting a User.
- *
+ *
* @param user
* the User
* @throws DataBackendException
@@ -118,5 +121,5 @@
+ "'");
}
- }
-}
\ No newline at end of file
+ }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.model.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.fulcrum.security.ModelManager;
@@ -25,7 +28,7 @@
/**
* Describes all the relationships between entities in the "Turbine" model.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -44,12 +47,12 @@
* @return A Group object that represents the global group.
*/
Group getGlobalGroup() throws DataBackendException;
-
+
/**
* Puts a permission in a role
- *
+ *
* This method is used when adding a permission to a role
- *
+ *
* @param user the User.
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the account is not present.
@@ -58,7 +61,7 @@
throws DataBackendException, UnknownEntityException;
/**
* Removes a permission from a role
- *
+ *
* @param role the Role.
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the user or group is not present.
@@ -68,9 +71,9 @@
/**
* Revokes all roles from an User.
- *
+ *
* This method is typically used when deleting an account.
- *
+ *
* @param user the User.
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the account is not present.
@@ -78,19 +81,19 @@
void revokeAll(User user) throws DataBackendException, UnknownEntityException;
/**
* Revokes all permissions from a Role.
- *
+ *
* This method is typically used when deleting a Role.
- *
+ *
* @param role the Role
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the Role is not present.
*/
void revokeAll(Role role) throws DataBackendException, UnknownEntityException;
-
+
/**
* Grant an User a Role in a Group.
- *
+ *
* @param user the user.
* @param group the group.
* @param role the role.
@@ -101,7 +104,7 @@
throws DataBackendException, UnknownEntityException;
/**
* Revoke a Role in a Group from an User.
- *
+ *
* @param user the user.
* @param group the group.
* @param role the role.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineUserManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineUserManager.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineUserManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineUserManager.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.model.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.security.entity.User;
@@ -46,5 +49,5 @@
*
*/
boolean isAnonymousUser(User u);
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineGroup.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineGroup.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineGroup.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineGroup.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.model.turbine.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.util.Set;
@@ -24,37 +27,37 @@
* Represents the "turbine" model where permissions are in a many to many
* relationship to roles, roles are related to groups are related to users, all
* in many to many relationships.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh </a>
* @version $Id$
*/
-public interface TurbineGroup extends Group
+public interface TurbineGroup extends Group
{
/**
* Get the User/Group/Role set associated with this group
- *
+ *
* @return a set of User/GRoup/Role relations
*/
public Set getUserGroupRoleSet();
/**
* Get the User/Group/Role set associated with this group
- *
+ *
* @param userGroupRoleSet a set of User/GRoup/Role relations
*/
public void setUserGroupRoleSet(Set userGroupRoleSet);
-
+
/**
* Add a User/Group/Role relation to this group
- *
+ *
* @param userGroupRole a User/GRoup/Role relation to add
*/
public void addUserGroupRole(TurbineUserGroupRole userGroupRole);
/**
* Remove a User/Group/Role relation from this group
- *
+ *
* @param userGroupRole a User/GRoup/Role relation to remove
*/
public void removeUserGroupRole(TurbineUserGroupRole userGroupRole);
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbinePermission.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbinePermission.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbinePermission.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbinePermission.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.model.turbine.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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 ofs the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * 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.
*/
import java.util.Set;
@@ -26,51 +29,51 @@
* Represents the "turbine" model where permissions are in a many to many
* relationship to roles, roles are related to groups are related to users, all
* in many to many relationships.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh </a>
* @version $Id$
*/
-public interface TurbinePermission extends Permission
+public interface TurbinePermission extends Permission
{
/**
* Get the roles that this permission belongs to
- *
+ *
* @return a set of roles
*/
public RoleSet getRoles();
/**
* Set the roles that this permission belongs to
- *
+ *
* @param roleSet a set of roles
*/
public void setRoles(RoleSet roleSet);
/**
* Add a role to this permission
- *
+ *
* @param role the role to add
*/
public void addRole(Role role);
/**
* Remove a role from this permission
- *
+ *
* @param role the role to remove
*/
public void removeRole(Role role);
/**
* Set the roles that this permission belongs to as Set
- *
+ *
* @param roles a set of roles
*/
public void setRolesAsSet(Set roles);
/**
* Get the roles that this permission belongs to as Set
- *
+ *
* @return a set of roles
*/
public Set getRolesAsSet();
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRole.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRole.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRole.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRole.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.model.turbine.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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 ofs the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * 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.
*/
import java.util.Set;
@@ -26,7 +29,7 @@
* Represents the "turbine" model where permissions are in a many to many
* relationship to roles, roles are related to groups are related to users, all
* in many to many relationships.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh </a>
* @version $Id$
*/
@@ -34,28 +37,28 @@
{
/**
* Get the permission that are part of this role
- *
+ *
* @return a set of permissions
*/
public PermissionSet getPermissions();
/**
* Get the permission that are part of this role as Set
- *
+ *
* @return a set of permissions
*/
public Set getPermissionsAsSet();
/**
* Set the permission that are part of this role
- *
+ *
* @param permissionSet a set of permissions
*/
public void setPermissions(PermissionSet permissionSet);
/**
* Set the permission that are part of this role as Set
- *
+ *
* @param permissions a set of permissions
*/
public void setPermissionsAsSet(Set permissions);
@@ -74,28 +77,28 @@
/**
* Get the User/Group/Role set associated with this role
- *
+ *
* @return a set of User/GRoup/Role relations
*/
public Set getUserGroupRoleSet();
/**
* Get the User/Group/Role set associated with this group
- *
+ *
* @param userGroupRoleSet a set of User/GRoup/Role relations
*/
public void setUserGroupRoleSet(Set userGroupRoleSet);
-
+
/**
* Add a User/Group/Role relation to this role
- *
+ *
* @param userGroupRole a User/GRoup/Role relation to add
*/
public void addUserGroupRole(TurbineUserGroupRole userGroupRole);
/**
* Remove a User/Group/Role relation from this role
- *
+ *
* @param userGroupRole a User/GRoup/Role relation to remove
*/
public void removeUserGroupRole(TurbineUserGroupRole userGroupRole);
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRolePermissionoff.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRolePermissionoff.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRolePermissionoff.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRolePermissionoff.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.model.turbine.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.fulcrum.security.entity.Permission;
@@ -23,7 +26,7 @@
* Represents the "turbine" model where permissions are in a many to many
* relationship to roles, roles are related to groups are related to users, all
* in many to many relationships.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh </a>
* @version $Id$
*/
@@ -61,4 +64,4 @@
public void setRole(Role role) {
this.role = role;
}
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUser.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUser.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUser.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUser.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.model.turbine.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.util.Set;
@@ -24,7 +27,7 @@
* Represents the "turbine" model where permissions are in a many to many
* relationship to roles, roles are related to groups are related to users, all
* in many to many relationships.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -32,28 +35,28 @@
{
/**
* Get the User/Group/Role set associated with this user
- *
+ *
* @return a set of User/GRoup/Role relations
*/
public Set getUserGroupRoleSet();
/**
* Get the User/Group/Role set associated with this user
- *
+ *
* @param userGroupRoleSet a set of User/GRoup/Role relations
*/
public void setUserGroupRoleSet(Set userGroupRoleSet);
-
+
/**
* Add a User/Group/Role relation to this user
- *
+ *
* @param userGroupRole a User/GRoup/Role relation to add
*/
public void addUserGroupRole(TurbineUserGroupRole userGroupRole);
/**
* Remove a User/Group/Role relation from this user
- *
+ *
* @param userGroupRole a User/GRoup/Role relation to remove
*/
public void removeUserGroupRole(TurbineUserGroupRole userGroupRole);
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUserGroupRole.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUserGroupRole.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUserGroupRole.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUserGroupRole.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.model.turbine.entity;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.io.Serializable;
@@ -27,61 +30,61 @@
* Represents the "turbine" model where permissions are in a many to many
* relationship to roles, roles are related to groups are related to users, all
* in many to many relationships.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh </a>
* @version $Id$
*/
-public class TurbineUserGroupRole
+public class TurbineUserGroupRole
implements Serializable
{
/**
* Serial number
*/
private static final long serialVersionUID = 265670888102016829L;
-
+
private User user;
-
+
private Group group;
-
+
private Role role;
-
+
private int hashCode;
-
+
private boolean hashCodeGenerated = false;
-
+
/**
* Get the group
- *
+ *
* @return Returns the group.
*/
public Group getGroup()
{
return group;
}
-
+
/**
* Get the role
- *
+ *
* @return Returns the role.
*/
public Role getRole()
{
return role;
}
-
+
/**
* Get the user
- *
+ *
* @return Returns the user.
*/
public User getUser()
{
return user;
}
-
+
/**
* Set the group
- *
+ *
* @param group
* The group to set.
*/
@@ -89,10 +92,10 @@
{
this.group = group;
}
-
+
/**
* Set the role
- *
+ *
* @param role
* The role to set.
*/
@@ -100,10 +103,10 @@
{
this.role = role;
}
-
+
/**
* Set the user
- *
+ *
* @param user
* The user to set.
*/
@@ -111,7 +114,7 @@
{
this.user = user;
}
-
+
public boolean equals(Object obj)
{
if (null == obj)
@@ -161,20 +164,20 @@
return true;
}
}
-
+
public int hashCode()
{
if (!hashCodeGenerated)
{
HashCodeBuilder hcBuilder = new HashCodeBuilder(39, 17);
-
+
Role role = getRole();
if (null != role)
{
hcBuilder.append(role.getId());
hcBuilder.append(role.getName());
}
-
+
User user = getUser();
if (null != user)
{
@@ -182,31 +185,31 @@
hcBuilder.append(user.getName());
hcBuilder.append(user.getPassword());
}
-
+
Group group = getGroup();
if (null != group)
{
hcBuilder.append(group.getId());
hcBuilder.append(group.getName());
}
-
+
this.hashCode = hcBuilder.toHashCode();
}
-
+
return this.hashCode;
}
-
+
public String toString()
{
StringBuffer sb = new StringBuffer();
-
+
sb.append(null != getUser() ? getUser().toString() : "null");
sb.append('\n');
sb.append(null != getGroup() ? getGroup().toString() : "null");
sb.append('\n');
sb.append(null != getRole() ? getRole().toString() : "null");
sb.append('\n');
-
+
return sb.toString();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org