Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 76333 invoked from network); 25 Sep 2006 17:05:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Sep 2006 17:05:19 -0000 Received: (qmail 30458 invoked by uid 500); 25 Sep 2006 17:05:19 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 30422 invoked by uid 500); 25 Sep 2006 17:05:18 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 30406 invoked by uid 99); 25 Sep 2006 17:05:18 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Sep 2006 10:05:18 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=jmcconnell@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from [140.211.166.113] ([140.211.166.113:50179] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 3A/AC-13750-24C08154 for ; Mon, 25 Sep 2006 10:05:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 24B6D1A981A; Mon, 25 Sep 2006 10:04:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r449740 - in /maven/continuum/branches/rbac-integration: ./ continuum-security/ continuum-security/src/main/java/org/apache/maven/continuum/security/ continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ continuum-se... Date: Mon, 25 Sep 2006 17:04:57 -0000 To: continuum-commits@maven.apache.org From: jmcconnell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060925170458.24B6D1A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jmcconnell Date: Mon Sep 25 10:04:56 2006 New Revision: 449740 URL: http://svn.apache.org/viewvc?view=rev&rev=449740 Log: added the ContinuumSystemAdministrator role profile and the merging environment check to sync the ContinuumSystemAdministrator role to a more global SystemAdministrator role Added: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java (contents, props changed) - copied, changed from r449106, maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumRoleConstants.java maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java (with props) maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumSystemAdministrator.java (with props) maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/ maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/ maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/ maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml (with props) maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java (with props) Removed: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumRoleConstants.java Modified: maven/continuum/branches/rbac-integration/continuum-security/pom.xml maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/Menu.jsp maven/continuum/branches/rbac-integration/pom.xml Modified: maven/continuum/branches/rbac-integration/continuum-security/pom.xml URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/pom.xml?view=diff&rev=449740&r1=449739&r2=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-security/pom.xml (original) +++ maven/continuum/branches/rbac-integration/continuum-security/pom.xml Mon Sep 25 10:04:56 2006 @@ -16,10 +16,13 @@ + Copied: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java (from r449106, maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumRoleConstants.java) URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java?view=diff&rev=449740&p1=maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumRoleConstants.java&r1=449106&p2=maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java&r2=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumRoleConstants.java (original) +++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java Mon Sep 25 10:04:56 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.continuum.security.profile; +package org.apache.maven.continuum.security; /* * Copyright 2006 The Apache Software Foundation. * Propchange: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java?view=auto&rev=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java (added) +++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java Mon Sep 25 10:04:56 2006 @@ -0,0 +1,42 @@ +package org.apache.maven.continuum.security; + +import org.codehaus.plexus.rbac.profile.DefaultRoleProfileManager; +import org.codehaus.plexus.rbac.profile.RoleProfileException; +/* + * Copyright 2006 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. + */ + +/** + * ContinuumRoleProfileManager: + * + * @author: Jesse McConnell + * @version: $ID:$ + * + * @plexus.component + * role="org.codehaus.plexus.rbac.profile.RoleProfileManager" + * role-hint="continuum" + */ +public class ContinuumRoleProfileManager + extends DefaultRoleProfileManager +{ + + public void initialize() + throws RoleProfileException + { + mergeRoleProfiles( "system-administrator", "continuum-system-administrator" ); + + setInitialized( true ); + } +} Propchange: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleProfileManager.java ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumSystemAdministrator.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumSystemAdministrator.java?view=auto&rev=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumSystemAdministrator.java (added) +++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumSystemAdministrator.java Mon Sep 25 10:04:56 2006 @@ -0,0 +1,44 @@ +package org.apache.maven.continuum.security.profile; + +import org.codehaus.plexus.rbac.profile.AbstractRoleProfile; +import org.codehaus.plexus.rbac.profile.RoleProfileConstants; + +import java.util.List; +import java.util.Collections; +/* + * Copyright 2006 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. + */ + +/** + * ContinuumSystemAdministrator: + * + * @author: Jesse McConnell + * @version: $ID:$ + */ +public class ContinuumSystemAdministrator + extends AbstractRoleProfile +{ + + + public String getRoleName() + { + return RoleProfileConstants.SYSTEM_ADMINISTRATOR_ROLE; + } + + public List getOperations() + { + return Collections.EMPTY_LIST; + } +} Propchange: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumSystemAdministrator.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java?view=diff&rev=449740&r1=449739&r2=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java (original) +++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java Mon Sep 25 10:04:56 2006 @@ -1,6 +1,7 @@ package org.apache.maven.continuum.security.profile; import org.codehaus.plexus.rbac.profile.AbstractDynamicRoleProfile; +import org.apache.maven.continuum.security.ContinuumRoleConstants; import java.util.List; import java.util.ArrayList; Modified: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java?view=diff&rev=449740&r1=449739&r2=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java (original) +++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java Mon Sep 25 10:04:56 2006 @@ -1,6 +1,7 @@ package org.apache.maven.continuum.security.profile; import org.codehaus.plexus.rbac.profile.AbstractDynamicRoleProfile; +import org.apache.maven.continuum.security.ContinuumRoleConstants; import java.util.List; import java.util.ArrayList; Added: maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml?view=auto&rev=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml (added) +++ maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml Mon Sep 25 10:04:56 2006 @@ -0,0 +1,24 @@ + + + + org.codehaus.plexus.rbac.profile.RoleProfileManager + continuum + org.apache.maven.continuum.security.ContinuumRoleProfileManager + ContinuumRoleProfileManager: + + + org.codehaus.plexus.PlexusContainer + container + + + org.codehaus.plexus.rbac.profile.RoleProfile + knownRoleProfiles + + + org.codehaus.plexus.rbac.profile.DynamicRoleProfile + knownDynamicRoleProfiles + + + + + Propchange: maven/continuum/branches/rbac-integration/continuum-security/src/main/resources/META-INF/plexus/components.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml?view=diff&rev=449740&r1=449739&r2=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml (original) +++ maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml Mon Sep 25 10:04:56 2006 @@ -158,6 +158,10 @@ org.apache.maven.continuum continuum-core + + org.apache.maven.continuum + continuum-security + org.codehaus.plexus plexus-utils Added: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java?view=auto&rev=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java (added) +++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java Mon Sep 25 10:04:56 2006 @@ -0,0 +1,58 @@ +package org.apache.maven.continuum.web.checks.security; + +/* + * Copyright 2006 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 org.codehaus.plexus.security.system.check.EnvironmentCheck; +import org.codehaus.plexus.rbac.profile.RoleProfileManager; +import org.codehaus.plexus.rbac.profile.RoleProfileException; + +import java.util.List; + +/** + * RoleProfileEnvironmentCheck: + * + * @author: Jesse McConnell + * @version: $ID:$ + * + * @plexus.component + * role="org.codehaus.plexus.security.system.check.EnvironmentCheck" + * role-hint="continuum-role-profile-check" + */ +public class RoleProfileEnvironmentCheck + implements EnvironmentCheck +{ + /** + * @plexus.requirement role-hint="continuum" + */ + private RoleProfileManager continuumRoleManager; + + + public void validateEnvironment( List list ) + { + try + { + if ( !continuumRoleManager.isInitialized() ) + { + continuumRoleManager.initialize(); + } + } + catch ( RoleProfileException rpe ) + { + list.add( "error inititalizing the continuum role manager" ); + } + } +} Propchange: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=449740&r1=449739&r2=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original) +++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Mon Sep 25 10:04:56 2006 @@ -454,6 +454,45 @@ + + + + + org.codehaus.plexus.security.system.SecuritySystem + org.codehaus.plexus.security.system.DefaultSecuritySystem + default + + + org.codehaus.plexus.security.authentication.AuthenticationManager + default + + + org.codehaus.plexus.security.authorization.Authorizer + rbac + + + org.codehaus.plexus.security.user.UserManager + jdo + + + + + + org.codehaus.plexus.security.authorization.Authorizer + rbac + org.codehaus.plexus.security.authorization.rbac.RbacAuthorizer + + + org.codehaus.plexus.security.rbac.RBACManager + jdo + + + org.codehaus.plexus.security.authorization.rbac.evaluator.PermissionEvaluator + default + + + + Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/Menu.jsp URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/Menu.jsp?view=diff&rev=449740&r1=449739&r2=449740 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original) +++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/Menu.jsp Mon Sep 25 10:04:56 2006 @@ -1,7 +1,6 @@ <%@ taglib uri="/webwork" prefix="ww" %> <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %> <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %> -<%@ taglib uri="continuum" prefix="c1" %>