Return-Path: 
 <continuum-commits-return-2641-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 75557 invoked from network); 6 Dec 2006 04:41:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 6 Dec 2006 04:41:09 -0000
Received: (qmail 6314 invoked by uid 500); 6 Dec 2006 04:41:18 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 6280 invoked by uid 500); 6 Dec 2006 04:41:18 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 6267 invoked by uid 99); 6 Dec 2006 04:41:17 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Dec 2006 20:41:17 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Dec 2006 20:40:44 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id C45F31A9846; Tue,  5 Dec 2006 20:39:47 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r482892 - in /maven/continuum/trunk/continuum-webapp:
 pom.xml
 src/main/resources/META-INF/plexus/application.xml
Date: Wed, 06 Dec 2006 04:39:47 -0000
To: continuum-commits@maven.apache.org
From: jmcconnell@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061206043947.C45F31A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jmcconnell
Date: Tue Dec  5 20:39:46 2006
New Revision: 482892

URL: http://svn.apache.org/viewvc?view=rev&rev=482892
Log:
updated to latest plexus-security snapshots that joakim published, application.xml has a lot less p-sec references and the dependencies have been majorly consolidated

Modified:
    maven/continuum/trunk/continuum-webapp/pom.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml

Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?view=diff&rev=482892&r1=482891&r2=482892
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Tue Dec  5 20:39:46 2006
@@ -360,56 +360,13 @@
       -->
     <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-system</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
       <artifactId>plexus-security-ui-web</artifactId>
       <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-ui-web-integration</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
       <artifactId>plexus-security-ui-web-taglib</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-authentication-provider-user-manager</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-user-management-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-user-management-provider-jdo</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-authorization-rbac-store-cached</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-authorization-rbac-store-jdo</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-keys-jdo</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-authentication-provider-keystore</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-authorization-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-authorization-rbac-authorizer</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=482892&r1=482891&r2=482892
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Tue Dec  5 20:39:46 2006
@@ -1,3 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+~ Copyright 2005-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.
+-->
 <plexus>
   <load-on-start>
     <component>
@@ -281,50 +297,6 @@
       </configuration>
     </component>
 
-    <component>
-      <role>org.codehaus.plexus.jdo.JdoFactory</role>
-      <role-hint>users</role-hint>
-      <implementation>org.codehaus.plexus.jdo.DataSourceConfigurableJdoFactory</implementation>
-      <configuration>
-
-        <connectionFactoryName>java:comp/env/jdbc/users</connectionFactoryName>
-        <shutdownConnectionFactoryName>java:comp/env/jdbc/users_shutdown</shutdownConnectionFactoryName>
-
-        <!-- JPOX and JDO configuration -->
-        <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
-        <otherProperties>
-          <property>
-            <name>org.jpox.autoCreateSchema</name>
-            <value>true</value>
-          </property>
-          <property>
-            <name>org.jpox.validateTables</name>
-            <value>false</value>
-          </property>
-          <property>
-            <name>org.jpox.validateColumns</name>
-            <value>false</value>
-          </property>
-          <property>
-            <name>org.jpox.validateConstraints</name>
-            <value>false</value>
-          </property>
-          <property>
-            <name>org.jpox.autoStartMechanism</name>
-            <value>None</value>
-          </property>
-          <property>
-            <name>org.jpox.poid.transactionIsolation</name>
-            <value>READ_UNCOMMITTED</value>
-          </property>
-          <property>
-            <name>org.jpox.rdbms.dateTimezone</name>
-            <value>JDK_DEFAULT_TIMEZONE</value>
-          </property>
-        </otherProperties>
-      </configuration>
-    </component>
-
     <!--
      | Logger manager
      -->
@@ -449,249 +421,14 @@
     </component>
 
     <component>
-      <role>org.codehaus.plexus.security.system.SecuritySystem</role>
-      <implementation>org.codehaus.plexus.security.system.DefaultSecuritySystem</implementation>
-      <role-hint>default</role-hint>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.security.authentication.AuthenticationManager</role>
-          <role-hint>default</role-hint>
-          <field-name>authnManager</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.authorization.Authorizer</role>
-          <role-hint>rbac</role-hint>
-          <field-name>authorizer</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.user.UserManager</role>
-          <role-hint>jdo</role-hint>
-          <field-name>userManager</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.keys.KeyManager</role>
-          <role-hint>jdo</role-hint>
-          <field-name>keyManager</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.policy.UserSecurityPolicy</role>
-          <role-hint>default</role-hint>
-          <field-name>policy</field-name>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.security.authorization.Authorizer</role>
-      <role-hint>rbac</role-hint>
-      <implementation>org.codehaus.plexus.security.authorization.rbac.RbacAuthorizer</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>cached</role-hint>
-          <field-name>manager</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.user.UserManager</role>
-          <role-hint>jdo</role-hint>
-          <field-name>userManager</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.authorization.rbac.evaluator.PermissionEvaluator</role>
-          <role-hint>default</role-hint>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-      <role-hint>cached</role-hint>
-      <implementation>org.codehaus.plexus.security.authorization.rbac.store.cached.CachedRbacManager</implementation>
-      <description>CachedRbacManager is a wrapped RBACManager with caching.</description>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>jdo</role-hint>
-          <field-name>rbacImpl</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-          <role-hint>operations</role-hint>
-          <field-name>operationsCache</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-          <role-hint>permissions</role-hint>
-          <field-name>permissionsCache</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-          <role-hint>resources</role-hint>
-          <field-name>resourcesCache</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-          <role-hint>roles</role-hint>
-          <field-name>rolesCache</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-          <role-hint>userAssignments</role-hint>
-          <field-name>userAssignmentsCache</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-          <role-hint>userPermissions</role-hint>
-          <field-name>userPermissionsCache</field-name>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.security.policy.UserSecurityPolicy</role>
-      <role-hint>default</role-hint>
-      <implementation>org.codehaus.plexus.security.policy.DefaultUserSecurityPolicy</implementation>
-      <description>User Security Policy.</description>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.security.configuration.UserConfiguration</role>
-          <field-name>config</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.policy.PasswordEncoder</role>
-          <role-hint>sha256</role-hint>
-          <field-name>passwordEncoder</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.policy.UserValidationSettings</role>
-          <field-name>userValidationSettings</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.policy.PasswordRule</role>
-          <field-name>rules</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.policy.RememberMeSettings</role>
-          <field-name>rememberMeSettings</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.policy.SingleSignOnSettings</role>
-          <field-name>singleSignOnSettings</field-name>
-        </requirement>
-      </requirements>
-      <configuration>
-        <previous-passwords-count>6</previous-passwords-count>
-        <login-attempt-count>3</login-attempt-count>
-        <password-expiration-days>90</password-expiration-days>
-      </configuration>
-    </component>
-
-    <component>
       <role>org.codehaus.plexus.security.configuration.UserConfiguration</role>
       <implementation>org.codehaus.plexus.security.configuration.UserConfiguration</implementation>
       <configuration>
         <configs>
           <config>${user.home}/.m2/security.properties</config>
-          <config>${user.home}/.m2/security-example.properties</config>
+          <config>${user.home}/.m2/continuum.properties</config>
+          <config>/org/apache/maven/archiva/security.properties</config>
         </configs>
-      </configuration>
-    </component>
-
-    <!-- ================================================================
-           Caches with Long Term entries
-         ================================================================ -->
-
-    <component>
-      <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-      <role-hint>operations</role-hint>
-      <implementation>org.codehaus.plexus.ehcache.MemoryCache</implementation>
-      <description>MemoryCache for Operations</description>
-      <configuration>
-        <eternal>false</eternal>
-        <max-elements-in-memory>1000</max-elements-in-memory>
-        <memory-eviction-policy>LRU</memory-eviction-policy>
-        <name>operationsCache</name>
-        <time-to-idle-seconds>1800</time-to-idle-seconds>
-        <time-to-live-seconds>14400</time-to-live-seconds>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-      <role-hint>permissions</role-hint>
-      <implementation>org.codehaus.plexus.ehcache.MemoryCache</implementation>
-      <description>MemoryCache for Permissions</description>
-      <configuration>
-        <eternal>false</eternal>
-        <max-elements-in-memory>1000</max-elements-in-memory>
-        <memory-eviction-policy>LRU</memory-eviction-policy>
-        <name>permissionsCache</name>
-        <time-to-idle-seconds>1800</time-to-idle-seconds>
-        <time-to-live-seconds>14400</time-to-live-seconds>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-      <role-hint>resources</role-hint>
-      <implementation>org.codehaus.plexus.ehcache.MemoryCache</implementation>
-      <description>MemoryCache for Resources</description>
-      <configuration>
-        <eternal>false</eternal>
-        <max-elements-in-memory>1000</max-elements-in-memory>
-        <memory-eviction-policy>LRU</memory-eviction-policy>
-        <name>resourcesCache</name>
-        <time-to-idle-seconds>1800</time-to-idle-seconds>
-        <time-to-live-seconds>14400</time-to-live-seconds>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-      <role-hint>roles</role-hint>
-      <implementation>org.codehaus.plexus.ehcache.MemoryCache</implementation>
-      <description>MemoryCache for Roles</description>
-      <configuration>
-        <eternal>false</eternal>
-        <max-elements-in-memory>1000</max-elements-in-memory>
-        <memory-eviction-policy>LRU</memory-eviction-policy>
-        <name>rolesCache</name>
-        <time-to-idle-seconds>1800</time-to-idle-seconds>
-        <time-to-live-seconds>14400</time-to-live-seconds>
-      </configuration>
-    </component>
-
-    <!-- ================================================================
-           Caches with Short Term entries
-         ================================================================ -->
-
-    <component>
-      <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-      <role-hint>userAssignments</role-hint>
-      <implementation>org.codehaus.plexus.ehcache.MemoryCache</implementation>
-      <description>MemoryCache for UserAssignments</description>
-      <configuration>
-        <eternal>false</eternal>
-        <max-elements-in-memory>10000</max-elements-in-memory>
-        <memory-eviction-policy>LRU</memory-eviction-policy>
-        <name>userAssignmentsCache</name>
-        <time-to-idle-seconds>300</time-to-idle-seconds>
-        <time-to-live-seconds>600</time-to-live-seconds>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
-      <role-hint>userPermissions</role-hint>
-      <implementation>org.codehaus.plexus.ehcache.MemoryCache</implementation>
-      <description>MemoryCache for User Permissions Map</description>
-      <configuration>
-        <eternal>false</eternal>
-        <max-elements-in-memory>10000</max-elements-in-memory>
-        <memory-eviction-policy>LRU</memory-eviction-policy>
-        <name>userPermissionsCache</name>
-        <time-to-idle-seconds>300</time-to-idle-seconds>
-        <time-to-live-seconds>600</time-to-live-seconds>
       </configuration>
     </component>