continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r449106 - in /maven/continuum/branches/rbac-integration: ./ continuum-security/ continuum-security/src/ continuum-security/src/main/ continuum-security/src/main/java/ continuum-security/src/main/java/org/ continuum-security/src/main/java/or...
Date Fri, 22 Sep 2006 22:09:10 GMT
Author: jmcconnell
Date: Fri Sep 22 15:09:09 2006
New Revision: 449106

URL: http://svn.apache.org/viewvc?view=rev&rev=449106
Log:
plexus-integration overlaying and login action coming up.  started specifying the roles for
continuum project groups...fyi, no expecting things to be functional yet..

Added:
    maven/continuum/branches/rbac-integration/continuum-security/
    maven/continuum/branches/rbac-integration/continuum-security/pom.xml   (with props)
    maven/continuum/branches/rbac-integration/continuum-security/src/
    maven/continuum/branches/rbac-integration/continuum-security/src/main/
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumRoleConstants.java
  (with props)
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java
  (with props)
    maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java
  (with props)
    maven/continuum/branches/rbac-integration/continuum-security/src/test/
    maven/continuum/branches/rbac-integration/continuum-security/src/test/java/
    maven/continuum/branches/rbac-integration/continuum-security/src/test/java/org/
    maven/continuum/branches/rbac-integration/continuum-security/src/test/java/org/apache/
    maven/continuum/branches/rbac-integration/continuum-security/src/test/java/org/apache/maven/
    maven/continuum/branches/rbac-integration/continuum-security/src/test/java/org/apache/maven/continuum/
    maven/continuum/branches/rbac-integration/continuum-security/src/test/java/org/apache/maven/continuum/security/
    maven/continuum/branches/rbac-integration/continuum-security/src/test/java/org/apache/maven/continuum/security/profile/
Removed:
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/IfAuthorizedTag.java
Modified:
    maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
    maven/continuum/branches/rbac-integration/pom.xml

Added: 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=auto&rev=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-security/pom.xml (added)
+++ maven/continuum/branches/rbac-integration/continuum-security/pom.xml Fri Sep 22 15:09:09
2006
@@ -0,0 +1,35 @@
+<project>
+  <parent>
+    <artifactId>continuum-parent</artifactId>
+    <groupId>org.apache.maven.continuum</groupId>
+    <version>1.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>continuum-security</artifactId>
+  <name>Continuum Security</name>
+  <packaging>jar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-rbac-profile</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
+

Propchange: maven/continuum/branches/rbac-integration/continuum-security/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/profile/ContinuumRoleConstants.java?view=auto&rev=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumRoleConstants.java
(added)
+++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumRoleConstants.java
Fri Sep 22 15:09:09 2006
@@ -0,0 +1,56 @@
+package org.apache.maven.continuum.security.profile;
+/*
+ * 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.
+ */
+
+/**
+ * ContinuumRoleConstants:
+ *
+ * @author: Jesse McConnell <jmcconnell@apache.org>
+ * @version: $ID:$
+ */
+public class ContinuumRoleConstants
+{
+    public static final String DELIMITER = " - ";
+
+    // roles
+    public static final String CONTINUUM_PROJECT_DEVELOPER_ROLE_PREFIX = "Project Developer";
+    public static final String CONTINUUM_PROJECT_USER_ROLE_PREFIX = "Project User";
+
+    // global operations
+
+    // dynamic operations
+    public static final String CONTINUUM_VIEW_GROUP_OPERATION = "continuum-view-group";
+    public static final String CONTINUUM_ADD_GROUP_OPERATION = "continuum-add-group";
+    public static final String CONTINUUM_REMOVE_GROUP_OPERATION = "continuum-remove-group";
+    public static final String CONTINUUM_MODIFY_GROUP_OPERATION = "continuum-modify-group";
+    public static final String CONTINUUM_ADD_PROJECT_TO_GROUP_OPERATION = "continuum-add-project-to-group";
+    public static final String CONTINUUM_REMOVE_PROJECT_FROM_GROUP_OPERATION ="continuum-remove-project-from-group";
+    public static final String CONTINUUM_MODIFY_PROJECT_IN_GROUP_OPERATION = "continuum-modify-project-in-group";
+    public static final String CONTINUUM_BUILD_PROJECT_IN_GROUP_OPERATION = "continuum-build-project-in-group";
+    public static final String CONTINUUM_ADD_GROUP_BUILD_DEFINTION_OPERATION = "continuum-add-group-build-definition";
+    public static final String CONTINUUM_REMOVE_GROUP_BUILD_DEFINITION_OPERATION = "continuum-remove-group-build-definition";
+    public static final String CONTINUUM_MODIFY_GROUP_BUILD_DEFINITION_OPERATION = "continuum-modify-group-build-definition";
+    public static final String CONTINUUM_ADD_GROUP_NOTIFIER_OPERATION = "continuum-add-group-notifier";
+    public static final String CONTINUUM_REMOVE_GROUP_NOTIFIER_OPERATION = "continuum-remove-group-notifier";
+    public static final String CONTINUUM_MODIFY_GROUP_NOTIFIER_OPERATION = "continuum-modify-group-notifier";
+    public static final String CONTINUUM_ADD_PROJECT_BUILD_DEFINTION_OPERATION = "continuum-add-project-build-definition";
+    public static final String CONTINUUM_REMOVE_PROJECT_BUILD_DEFINITION_OPERATION = "continuum-remove-project-build-definition";
+    public static final String CONTINUUM_MODIFY_PROJECT_BUILD_DEFINITION_OPERATION = "continuum-modify-project-build-definition";
+    public static final String CONTINUUM_ADD_PROJECT_NOTIFIER_OPERATION = "continuum-add-project-notifier";
+    public static final String CONTINUUM_REMOVE_PROJECT_NOTIFIER_OPERATION = "continuum-remove-project-notifier";
+    public static final String CONTINUUM_MODIFY_PROJECT_NOTIFIER_OPERATION = "continuum-modify-project-notifier";
+
+}

Propchange: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ContinuumRoleConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=auto&rev=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java
(added)
+++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java
Fri Sep 22 15:09:09 2006
@@ -0,0 +1,54 @@
+package org.apache.maven.continuum.security.profile;
+
+import org.codehaus.plexus.rbac.profile.AbstractDynamicRoleProfile;
+
+import java.util.List;
+import java.util.ArrayList;
+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.
+ */
+
+/**
+ * ProjectGroupDeveloperDynamicRoleProfile:
+ *
+ * @author: Jesse McConnell <jmcconnell@apache.org>
+ * @version: $ID:$
+ */
+public class ProjectGroupDeveloperDynamicRoleProfile
+    extends AbstractDynamicRoleProfile
+{
+
+
+    public String getRoleName( String string )
+    {
+        return ContinuumRoleConstants.CONTINUUM_PROJECT_DEVELOPER_ROLE_PREFIX + ContinuumRoleConstants.DELIMITER
+ string;
+    }
+
+    public List getOperations()
+    {
+        List operations = new ArrayList();
+
+        operations.add( ContinuumRoleConstants.CONTINUUM_MODIFY_GROUP_OPERATION );
+
+        return operations;
+    }
+
+
+    public List getDynamicChildRoles( String string )
+    {
+        return Collections.singletonList( ContinuumRoleConstants.CONTINUUM_PROJECT_USER_ROLE_PREFIX
+ ContinuumRoleConstants.DELIMITER + string );
+    }
+}

Propchange: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupDeveloperDynamicRoleProfile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=auto&rev=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java
(added)
+++ maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java
Fri Sep 22 15:09:09 2006
@@ -0,0 +1,47 @@
+package org.apache.maven.continuum.security.profile;
+
+import org.codehaus.plexus.rbac.profile.AbstractDynamicRoleProfile;
+
+import java.util.List;
+import java.util.ArrayList;
+/*
+ * 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.
+ */
+
+/**
+ * ProjectGroupUserDynamicRoleProfile:
+ *
+ * @author: Jesse McConnell <jmcconnell@apache.org>
+ * @version: $ID:$
+ */
+public class ProjectGroupUserDynamicRoleProfile
+    extends AbstractDynamicRoleProfile
+{
+
+
+    public String getRoleName( String string )
+    {
+        return ContinuumRoleConstants.CONTINUUM_PROJECT_USER_ROLE_PREFIX + ContinuumRoleConstants.DELIMITER
+ string;
+    }
+
+    public List getOperations()
+    {
+        List operations = new ArrayList();
+
+        operations.add( ContinuumRoleConstants.CONTINUUM_VIEW_GROUP_OPERATION );
+
+        return operations;
+    }
+}

Propchange: maven/continuum/branches/rbac-integration/continuum-security/src/main/java/org/apache/maven/continuum/security/profile/ProjectGroupUserDynamicRoleProfile.java
------------------------------------------------------------------------------
    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=449106&r1=449105&r2=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml (original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/pom.xml Fri Sep 22 15:09:09
2006
@@ -29,6 +29,57 @@
       </resource>
     </resources>
     <plugins>
+           <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.1.1-20060724.192148-1</version>
+        <!-- This configuration is added to cleanup from war:inplace -->
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${basedir}/</directory>
+              <includes>
+                <include>derby.log</include>
+              </includes>
+            </fileset>
+            <fileset>
+              <directory>${basedir}/src/main/webapp</directory>
+              <includes>
+                <!-- TODO: META-INF shouldn't be required, seems to be an issue with the
current war plugin -->
+                <include>META-INF</include>
+                <include>WEB-INF/classes</include>      <!-- Classes and Resources
from other wars -->
+                <include>WEB-INF/lib</include>          <!-- Dependencies
from other wars -->
+                <include>WEB-INF/database</include>     <!-- Database location
configured in application.xml -->
+                <include>WEB-INF/logs</include>         <!-- Log file location
specified in application.xml -->
+                <include>pss</include>                  <!-- plexus-security
css and javascript -->
+                <include>WEB-INF/jsp/pss</include>      <!-- plexus-security
jsps -->
+                <include>WEB-INF/template/pss</include> <!-- plexus-security
xwork templates -->
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+            <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.0.1</version>
+        <configuration>
+          <!-- Some versions of maven-war-plugin (snapshots) have this incorrectly defaulted
to true.
+               Specifically setting this to false to avoid accidental jar file creation.
-->
+          <archiveClasses>false</archiveClasses>
+          <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml</dependentWarExcludes>
+        </configuration>
+        <!-- TODO: would be good to make the jetty plugin aware of these and remove the
below -->
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <!-- Needed to get the plexus-security war overlay to do its thing before
jetty:run -->
+              <goal>inplace</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>
@@ -100,22 +151,6 @@
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>src/main/webapp/WEB-INF</directory>
-              <includes>
-                <include>database</include>
-                <include>temp</include>
-                <include>logs</include>
-                <include>working-directory</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -249,6 +284,102 @@
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-ssh</artifactId>
       <scope>runtime</scope>
+    </dependency>
+    <!--
+      Plexus Security Dependencies
+      -->
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-system</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-ui-web</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-ui-web-integration</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-ui-web-taglib</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-ui-web-rbac</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-authentication-provider-user-manager</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-user-management-api</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-user-management-provider-jdo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-authorization-rbac-store-jdo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-authorization-api</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-authorization-rbac-authorizer</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+        <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-jdo2</artifactId>
+      <version>1.0-alpha-7-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xmlParserAPIs</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.1.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>jpox</groupId>
+      <artifactId>jpox</artifactId>
+      <version>1.1.1</version>
+      <exclusions>
+        <!-- targeting JDK 1.4 we don't need this -->
+        <exclusion>
+          <groupId>javax.sql</groupId>
+          <artifactId>jdbc-stdext</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?view=diff&rev=449106&r1=449105&r2=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
Fri Sep 22 15:09:09 2006
@@ -18,7 +18,6 @@
 
 import com.opensymphony.xwork.Preparable;
 import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.initialization.ContinuumInitializationException;
 import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
@@ -41,12 +40,12 @@
     {
         
 
-        getLogger().info("checking the continuum configuration");
+        //getLogger().info("checking the continuum configuration");
 
-        if ( !continuum.getConfiguration().isInitialized() )
-        {
-            throw new ContinuumInitializationException( "continuum not initialized" );
-        }
+        //if ( !continuum.getConfiguration().isInitialized() )
+        //{
+        //    throw new ContinuumInitializationException( "continuum not initialized" );
+        //}
 
     }
 

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=449106&r1=449105&r2=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml
Fri Sep 22 15:09:09 2006
@@ -2,28 +2,23 @@
 
 <xwork>
   <include file="webwork-default.xml"/>
+
+  <!-- Include plexus-security xwork configurations. -->  
+  <include file="xwork-security.xml" />
+
+
   <package name="default" extends="webwork-default">
 
     <interceptors>
       <interceptor name="exception-logging" class="exceptionLogging"/>
-      <interceptor name="user" class="userInterceptor"/>
+      <interceptor name="pssSecureActions" class="pssSecureActionInterceptor"/>
+      <interceptor name="pssEnvironmentChecker" class="pssEnvironmentCheckInterceptor"/>
+      
       <interceptor-stack name="defaultContinuumStack">
-        <interceptor-ref name="user"/>
+        <interceptor-ref name="defaultStack"/>
         <interceptor-ref name="exception-logging"/>
-        <!--<interceptor-ref name="defaultStack"/>-->
-
-
-        <interceptor-ref name="prepare"/>
-        <interceptor-ref name="servlet-config"/>
-        <interceptor-ref name="chain"/>
-        <interceptor-ref name="model-driven"/>
-        <interceptor-ref name="component"/>
-        <interceptor-ref name="fileUpload"/>
-        <interceptor-ref name="static-params"/>
-        <interceptor-ref name="params"/>
-        <!-- interceptor-ref name="conversionError"/ -->
-       <interceptor-ref name="validation"/>
-        <interceptor-ref name="workflow"/>
+        <interceptor-ref name="pssEnvironmentChecker"/>
+        <interceptor-ref name="pssSecureActions"/>
       </interceptor-stack>
     </interceptors>
 
@@ -33,6 +28,23 @@
       <result name="error">/error.jsp</result>
       <result name="internalError" type="redirect">/error.jsp</result>
       <result name="continuumInitialization" type="redirect">/configuration!input.action</result>
+
+       <!-- The following security-* result names arrive from the plexus-security package
-->
+      <result name="security-login-success" type="redirect-action">browse</result>
+      <result name="security-login-cancel" type="redirect-action">browse</result>
+      <result name="security-login-locked" type="redirect-action">browse</result>
+      <result name="security-logout" type="redirect-action">browse</result>
+      <result name="security-register-success" type="redirect-action">
+        <param name="actionName">login</param>
+        <param name="namespace">/security</param>
+      </result>
+      <result name="security-register-cancel" type="redirect-action">
+        <param name="actionName">login</param>
+        <param name="namespace">/security</param>
+      </result>
+      <result name="security-account-success" type="redirect-action">browse</result>
+      <result name="security-account-cancel" type="redirect-action">browse</result>
+      
     </global-results>
 
     <global-exception-mappings>
@@ -40,6 +52,13 @@
       <exception-mapping exception="java.lang.Exception" result="internalError"/>
     </global-exception-mappings>
 
+    <!-- This is the redirection facility for plexus-security,
+             allowing plexus-security to call out from its own set of actions
+             into the application webapp, using global result names. -->
+    <action name="pssRedirect" class="pss-redirect" method="redirect">
+      <result type="redirect-action">groupSummary</result>
+    </action>
+
     <action name="checkConfiguration" class="checkConfiguration">
       <result name="input">/redirectToContinuumInitialization.jsp</result>
     </action>
@@ -101,62 +120,6 @@
     <action name="projectSave" class="projectEdit" method="save">
       <result name="success" type="chain">projectView</result>
       <result name="input">projectEdit.jsp</result>
-    </action>
-
-    <!--
-    * Session Influencing actions
-    -->
-    <action name="login" class="session" method="login">
-      <result name="input">login.jsp</result>
-      <result name="error">login.jsp</result>
-      <result name="success" type="chain">groupSummary</result>
-    </action>
-
-    <action name="logout" class="session" method="logout">
-      <result name="success" type="chain">groupSummary</result>
-    </action>
-
-
-    <!--
-    * user management actions
-    -->
-    <action name="users" class="userManagement" method="summary">
-      <result name="success">users.jsp</result>
-    </action>
-
-    <action name="user" class="userManagement" method="input">
-      <result name="success">user.jsp</result>
-    </action>
-
-    <action name="saveUser" class="userManagement" method="save">
-      <result name="input">user.jsp</result>
-      <result name="success" type="chain">users</result>
-    </action>
-
-    <action name="removeUser" class="userManagement" method="remove">
-      <result name="success" type="chain">users</result>
-      <result name="confirm">confirmation.jsp</result>
-    </action>
-
-    <!--
-    * user group management actions
-    -->
-    <action name="userGroups" class="userGroupManagement" method="summary">
-      <result name="success">userGroups.jsp</result>
-    </action>
-
-    <action name="userGroup" class="userGroupManagement" method="input">
-      <result name="success">userGroup.jsp</result>
-    </action>
-
-    <action name="saveUserGroup" class="userGroupManagement" method="save">
-      <result name="input">userGroup.jsp</result>
-      <result name="success" type="chain">userGroups</result>
-    </action>
-
-    <action name="removeUserGroup" class="userGroupManagement" method="remove">
-      <result name="success" type="chain">userGroups</result>
-      <result name="confirm">confirmation.jsp</result>
     </action>
 
     <!--

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld?view=diff&rev=449106&r1=449105&r2=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
Fri Sep 22 15:09:09 2006
@@ -112,15 +112,4 @@
     </attribute>
   </tag>
 
-  <tag>
-    <name>ifAuthorized</name>
-    <tagclass>org.apache.maven.continuum.web.view.jsp.ui.IfAuthorizedTag</tagclass>
-    <bodycontent>JSP</bodycontent>
-    <attribute>
-      <name>permission</name>
-      <required>true</required>
-      <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
 </taglib>

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp?view=diff&rev=449106&r1=449105&r2=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
Fri Sep 22 15:09:09 2006
@@ -20,22 +20,15 @@
 </div>
 
 <div id="breadcrumbs">
+
+  <div style="float: left;">
+    <c:import url="/WEB-INF/jsp/pss/include/securityLinks.jspf" />
+  </div>
+
   <div style="float: right;">
     <a href="http://maven.apache.org/continuum">Continuum</a> |
     <a href="http://maven.apache.org/">Maven</a> |
     <a href="http://www.apache.org/">Apache</a>
-  </div>
-
-  <div>
-    <ww:url id="loginUrl" action="login"/>
-    <ww:url id="logoutUrl" action="logout"/>
-    <ww:if test="${sessionScope.loggedIn != true}">
-      Welcome, <b>${sessionScope.user.username}</b> - <ww:a href="%{loginUrl}">Login</ww:a>
-    </ww:if>
-    <ww:else>
-      Welcome, <b>${sessionScope.user.username}</b> - <ww:a href="%{logoutUrl}">Logout</ww:a>
-    </ww:else>
-
   </div>
 </div>
 </ww:i18n>

Modified: maven/continuum/branches/rbac-integration/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/pom.xml?view=diff&rev=449106&r1=449105&r2=449106
==============================================================================
--- maven/continuum/branches/rbac-integration/pom.xml (original)
+++ maven/continuum/branches/rbac-integration/pom.xml Fri Sep 22 15:09:09 2006
@@ -74,6 +74,7 @@
   </build>
   <modules>
     <module>continuum-api</module>
+    <module>continuum-security</module>
     <module>continuum-cc</module>
     <!-- module>continuum-core-it</module -->    <!-- TODO RE-ADD it when
continuum-plexus-application will be back -->
     <module>continuum-core</module>



Mime
View raw message