Author: joakime
Date: Tue Dec 5 13:53:44 2006
New Revision: 482798
URL: http://svn.apache.org/viewvc?view=rev&rev=482798
Log:
Work done to integrate latest p-sec userlist enhancements.
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=482798&r1=482797&r2=482798
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Tue Dec 5 13:53:44 2006
@@ -161,282 +161,6 @@
</configuration>
</component>
- <!-- plexus security components -->
- <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>
- </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/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.transactionIsolation</name>
- <value>READ_UNCOMMITTED</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>
-
- <!-- ================================================================
- 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</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>
-
</components>
<!-- Override default configuration of components -->
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css?view=diff&rev=482798&r1=482797&r2=482798
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css Tue Dec 5
13:53:44 2006
@@ -124,3 +124,242 @@
ul.dependencyTree span.artifact-link {
padding-left: 0px;
}
+
+// --- Extreme Components Table
+
+.eXtremeTable {
+ margin: 0;
+ padding: 0;
+}
+
+.eXtremeTable select {
+ font-family: Verdana;
+ font-size: 9px;
+ border: solid 1px #EEE;
+ width: 75px;
+}
+
+.eXtremeTable .tableRegion {
+ border: 1px solid silver;
+ padding: 2px;
+ font-family: Verdana;
+ font-size: 10px;
+ margin-top: 7px;
+ width: 100%;
+}
+
+div.users .eXtremeTable .tableRegion {
+ margin-top: 0px;
+ border-top: 0px;
+}
+
+div.users .extraFilters form {
+ margin: 0 0 0 0;
+ padding: 0 0 0 0;
+ text-align: right;
+}
+
+div.users .extraFilters {
+ border: 1px solid silver;
+ border-bottom: 0;
+}
+
+.eXtremeTable .filter {
+ background-color: #efefef;
+}
+
+.eXtremeTable .filter input {
+ font-family: Verdana;
+ font-size: 10px;
+ width: 100%;
+}
+
+div.users .reports {
+ float: right;
+ font-family: Verdana;
+ font-size: 10px;
+ height: 1.3em;
+ padding-right: 0.5em;
+}
+
+div.users .reports img {
+ border: 0;
+ vertical-align: middle;
+}
+
+div.users .extraFilters input {
+ font-family: Verdana;
+ font-size: 10px;
+}
+
+div.users .extraFilters select,div.users .extraFilters label {
+ font-family: Verdana;
+ font-size: 9px;
+ margin-right: 3px;
+}
+
+.eXtremeTable .filter select {
+ font-family: Verdana;
+ font-size: 9px;
+ border: solid 1px #EEE;
+ width: 100%;
+}
+
+.eXtremeTable .tableHeader {
+ xbackground-color: #308dbb;
+ background-color: #F3B455;
+ color: white;
+ font-family: Verdana;
+ font-size: 11px;
+ font-weight: bold;
+ text-align: left;
+ padding-right: 3px;
+ padding-left: 3px;
+ padding-top: 4;
+ padding-bottom: 4;
+ margin: 0;
+ border-right-style: solid;
+ border-right-width: 1px;
+ border-color: white;
+}
+
+.eXtremeTable .tableHeaderSort {
+ xbackground-color: #3a95c2;
+ background-color: #FFBF5F;
+ color: white;
+ font-family: Verdana;
+ font-size: 11px;
+ font-weight: bold;
+ text-align: left;
+ padding-right: 3px;
+ padding-left: 3px;
+ padding-top: 4;
+ padding-bottom: 4;
+ border-right-style: solid;
+ border-right-width: 1px;
+ border-color: white;
+}
+
+.eXtremeTable .odd a,.even a {
+ color: Black;
+ font-size: 10px;
+}
+
+.eXtremeTable .odd td,.eXtremeTable .even td {
+ padding-top: 2px;
+ padding-right: 3px;
+ padding-bottom: 2px;
+ padding-left: 3px;
+ vertical-align: middle;
+ font-family: Verdana;
+ font-size: 10px;
+}
+
+.eXtremeTable .odd {
+ background-color: #FFFFFF;
+}
+
+.eXtremeTable .even {
+ background-color: #dfe4e8;
+}
+
+.eXtremeTable .highlight td {
+ color: black;
+ font-size: 10px;
+ padding-top: 2px;
+ padding-right: 3px;
+ padding-bottom: 2px;
+ padding-left: 3px;
+ vertical-align: middle;
+ background-color: #fdecae;
+}
+
+.eXtremeTable .highlight a,.highlight a {
+ color: black;
+ font-size: 10px;
+}
+
+.eXtremeTable .toolbar {
+ background-color: #F4F4F4;
+ font-family: Verdana;
+ font-size: 9px;
+ margin-right: 1px;
+ border-right: 1px solid silver;
+ border-left: 1px solid silver;
+ border-top: 1px solid silver;
+ border-bottom: 1px solid silver;
+}
+
+.eXtremeTable .toolbar td {
+ color: #444444;
+ padding: 0px 3px 0px 3px;
+ text-align: center;
+}
+
+.eXtremeTable .separator {
+ width: 7px;
+}
+
+.eXtremeTable .statusBar {
+ background-color: #F4F4F4;
+ font-family: Verdana;
+ font-size: 10px;
+ width: 100%;
+}
+
+.eXtremeTable .filterButtons {
+ background-color: #efefef;
+ text-align: right;
+}
+
+.eXtremeTable .title {
+ color: #444444;
+ font-weight: bold;
+ font-family: Verdana;
+ font-size: 15px;
+ vertical-align: middle;
+}
+
+.eXtremeTable .title span {
+ margin-left: 7px;
+}
+
+.eXtremeTable .formButtons {
+ display: block;
+ margin-top: 10px;
+ margin-left: 5px;
+}
+
+.eXtremeTable .formButton {
+ cursor: pointer;
+ font-family: Verdana;
+ font-size: 10px;
+ font-weight: bold;
+ background-color: #308dbb;
+ color: white;
+ margin-top: 5px;
+ border: outset 1px #333;
+ vertical-align: middle;
+}
+
+.eXtremeTable .tableTotal {
+ background-color: #FFFFFF;
+ border-top: solid 1px Silver;
+}
+
+.eXtremeTable .tableTotalEmpty {
+ background-color: #FFFFFF;
+}
+
+.eXtremeTable img {
+ border: 0px;
+}
+
+.eXtremeTable .tasks {
+ text-align: center;
+}
+
+.eXtremeTable .tasks form {
+ padding: 0px;
+ margin: 0px;
+}
