continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r472550 - in /maven/continuum/trunk/continuum-webapp: pom.xml src/main/resources/META-INF/plexus/application.xml
Date Wed, 08 Nov 2006 17:17:13 GMT
Author: jmcconnell
Date: Wed Nov  8 09:17:12 2006
New Revision: 472550

URL: http://svn.apache.org/viewvc?view=rev&rev=472550
Log:
align with latest plexus-security configuration mechanism

update the pom.xml with a dependency on commons-lang v 2.1 til we get it coming in correctly
transitively

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=472550&r1=472549&r2=472550
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Wed Nov  8 09:17:12 2006
@@ -389,10 +389,17 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
     </dependency>
+    -->
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>8.0-312.jdbc3</version>
+    </dependency>
     <dependency>
       <groupId>jpox</groupId>
       <artifactId>jpox</artifactId>
@@ -403,6 +410,11 @@
           <artifactId>jdbc-stdext</artifactId>
         </exclusion>
       </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.1</version>
     </dependency>
   </dependencies>
 </project>

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=472550&r1=472549&r2=472550
==============================================================================
--- 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
Wed Nov  8 09:17:12 2006
@@ -333,12 +333,6 @@
       </configuration>
     </component>
 
-    <component>
-      <role>org.codehaus.plexus.rememberme.RememberMeServices</role>
-      <implementation>org.apache.maven.continuum.web.rememberme.DefaultRememberMeServices</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-
     <!--
      | Logger manager
      -->
@@ -429,31 +423,6 @@
       </configuration>
     </component>
 
-
-    <!-- plexus security components -->
-            <component>
-      <role>org.codehaus.plexus.security.system.ApplicationDetails</role>
-      <implementation>org.codehaus.plexus.security.system.DefaultApplicationDetails</implementation>
-      <description>DefaultApplicationDetails</description>
-      <configuration>
-        <application-name>Unconfigured Application Name</application-name>
-        <!-- Do not include the trailing '/' on the url. -->
-        <application-url>http://localhost:9090</application-url>
-        <timestamp-format>EEE, d MMM yyyy HH:mm:ss Z</timestamp-format>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.security.system.EmailSettings</role>
-      <implementation>org.codehaus.plexus.security.system.DefaultEmailSettings</implementation>
-      <description>DefaultEmailSettings</description>
-      <configuration>
-        <feedback>/feedback.action</feedback>
-        <from-address>security@unconfigured.com</from-address>
-        <from-username>Unconfigured Username</from-username>
-      </configuration>
-    </component>
-
     <component>
       <role>org.codehaus.plexus.security.system.SecuritySystem</role>
       <implementation>org.codehaus.plexus.security.system.DefaultSecuritySystem</implementation>
@@ -484,14 +453,6 @@
           <role-hint>default</role-hint>
           <field-name>policy</field-name>
         </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.system.ApplicationDetails</role>
-          <field-name>applicationDetails</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.system.EmailSettings</role>
-          <field-name>emailSettings</field-name>
-        </requirement>
       </requirements>
     </component>
 
@@ -517,66 +478,16 @@
     </component>
 
     <component>
-      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
-      <role-hint>character-length</role-hint>
-      <implementation>org.codehaus.plexus.security.policy.rules.CharacterLengthPasswordRule</implementation>
-      <description>Basic Password Rule, Checks for non-empty passwords that have between
{@link #setMinimumCharacters(int)} and {@link #setMaximumCharacters(int)} characters in length.</description>
-      <configuration>
-        <enabled>true</enabled>
-        <minimum-characters>1</minimum-characters>
-        <maximum-characters>8</maximum-characters>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
-      <role-hint>reuse</role-hint>
-      <implementation>org.codehaus.plexus.security.policy.rules.ReusePasswordRule</implementation>
-      <description>Password Rule, Checks supplied password found at {@link User#getPassword()}
against the {@link User#getPreviousEncodedPasswords()} to ensure that a password is not reused.</description>
-      <configuration>
-        <enabled>true</enabled>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
-      <role-hint>numerical-count</role-hint>
-      <implementation>org.codehaus.plexus.security.policy.rules.NumericalPasswordRule</implementation>
-      <description>Basic Password Rule, Checks for non-empty passwords that have at
least {@link #setMinimumCount(int)} of numerical characters contained within.</description>
-      <configuration>
-        <enabled>true</enabled>
-        <minimum-count>1</minimum-count>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
-      <role-hint>must-have</role-hint>
-      <implementation>org.codehaus.plexus.security.policy.rules.MustHavePasswordRule</implementation>
-      <description>Basic Password Rule, Checks for non-empty Passwords in non guest
users.</description>
-      <configuration>
-        <enabled>true</enabled>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.security.policy.PasswordRule</role>
-      <role-hint>alpha-count</role-hint>
-      <implementation>org.codehaus.plexus.security.policy.rules.AlphaPasswordRule</implementation>
-      <description>Basic Password Rule, Checks for non-empty passwords that have at
least {@link #setMinimumCount(int)} of alpha characters contained within.</description>
-      <configuration>
-        <enabled>true</enabled>
-        <minimum-count>1</minimum-count>
-      </configuration>
-    </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>
@@ -606,50 +517,13 @@
     </component>
 
     <component>
-         <role>org.codehaus.plexus.security.policy.RememberMeSettings</role>
-         <implementation>org.codehaus.plexus.security.policy.DefaultRememberMeSettings</implementation>
-         <description>DefaultRememberMeSettings</description>
-         <configuration>
-           <enabled>true</enabled>
-           <cookie-timeout>525600</cookie-timeout>
-         </configuration>
-       </component>
-
-       <component>
-         <role>org.codehaus.plexus.security.policy.SingleSignOnSettings</role>
-         <implementation>org.codehaus.plexus.security.policy.DefaultSingleSignOnSettings</implementation>
-         <description>DefaultSingleSignOnSettings</description>
-         <configuration>
-           <enabled>true</enabled>
-           <cookie-timeout>30</cookie-timeout>
-         </configuration>
-       </component>
-
-    <component>
-      <role>org.codehaus.plexus.security.policy.UserValidationSettings</role>
-      <implementation>org.codehaus.plexus.security.policy.DefaultUserValidationSettings</implementation>
-      <description>DefaultUserValidationSettings</description>
-      <configuration>
-        <email-validation-required>false</email-validation-required>
-        <!-- This is a timeout for the validation url (in minutes) - 2880 = 48 hours -->
-        <email-validation-timeout>2880</email-validation-timeout>
-        <email-login-path>/security/login!login.action</email-login-path>
-        <email-subject>Unconfigured Subject Line</email-subject>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.mailsender.MailSender</role>
-      <implementation>org.codehaus.plexus.mailsender.javamail.JavamailMailSender</implementation>
+      <role>org.codehaus.plexus.security.configuration.UserConfiguration</role>
+      <implementation>org.codehaus.plexus.security.configuration.UserConfiguration</implementation>
       <configuration>
-        <smtp-host>localhost</smtp-host>
-        <smtp-port>25</smtp-port>
-        <sslProvider>com.sun.net.ssl.internal.ssl.Provider</sslProvider>
-        <!--
-        <username>mylogin</username>
-        <password>mypassword</password>
-        <sslMode>true</sslMode>
-        -->
+        <configs>
+          <config>${user.home}/.m2/security.properties</config>
+          <config>${user.home}/.m2/security-example.properties</config>
+        </configs>
       </configuration>
     </component>
 



Mime
View raw message