continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joak...@apache.org
Subject svn commit: r483232 - in /maven/continuum/trunk: ./ continuum-core/ continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-core/src/test/resources/org/apache/maven/continuum/ continuum-security/ continuum-security/src/main/resou...
Date Wed, 06 Dec 2006 21:16:04 GMT
Author: joakime
Date: Wed Dec  6 13:16:02 2006
New Revision: 483232

URL: http://svn.apache.org/viewvc?view=rev&rev=483232
Log:
Various cleanup of continuum build issues introduced by latest p-sec changes.


Modified:
    maven/continuum/trunk/continuum-core/pom.xml
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
    maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
    maven/continuum/trunk/continuum-security/pom.xml
    maven/continuum/trunk/continuum-security/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/pom.xml?view=diff&rev=483232&r1=483231&r2=483232
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Wed Dec  6 13:16:02 2006
@@ -12,16 +12,6 @@
   <name>Continuum Core</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-mail-sender-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-quartz</artifactId>
     </dependency>
@@ -30,25 +20,10 @@
       <artifactId>plexus-mail-sender-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.continuum</groupId>
-      <artifactId>continuum-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-local</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-notification</artifactId>
     </dependency>
     <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
@@ -57,12 +32,6 @@
       <artifactId>maven-settings</artifactId>
     </dependency>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-notifier-api</artifactId>
     </dependency>
@@ -116,12 +85,6 @@
       <artifactId>plexus-formica</artifactId>
     </dependency>
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-action</artifactId>
       <version>1.0-alpha-6</version>
@@ -148,11 +111,6 @@
       <version>1.4</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-mail-sender-simple</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-release</artifactId>
     </dependency>
@@ -160,29 +118,73 @@
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-security</artifactId>
     </dependency>
-    <!--
     <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
       <artifactId>plexus-security-rbac-profile</artifactId>
     </dependency>
-    -->
-    <!--
+    <!-- === Testing Dependencies === -->
     <dependency>
-      <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-ui-web-integration</artifactId>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
       <scope>test</scope>
     </dependency>
-    -->
-<!--    <dependency>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-security</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-configuration</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.scm</groupId>
+      <artifactId>maven-scm-provider-local</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-mail-sender-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.0.b2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-mail-sender-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
-      <artifactId>plexus-security-authorization-rbac-model</artifactId>
+      <artifactId>plexus-security-ui-web-integration</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <artifactId>plexus-security-authorization-rbac-store-memory</artifactId>
       <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-authorization-rbac-store-memory</artifactId>
       <scope>test</scope>
     </dependency>
-    -->
   </dependencies>
   <build>
     <plugins>

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java?view=diff&rev=483232&r1=483231&r2=483232
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
Wed Dec  6 13:16:02 2006
@@ -55,7 +55,7 @@
 
         ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( projectGroupId
);
 
-        //todo make the resource the name of the project group and hide the id from the user
+        // TODO: make the resource the name of the project group and hide the id from the
user
 
         try
         {

Modified: maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml?view=diff&rev=483232&r1=483231&r2=483232
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
(original)
+++ maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
Wed Dec  6 13:16:02 2006
@@ -41,6 +41,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
         </requirement>
       </requirements>
     </component>
@@ -51,16 +52,18 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
         </requirement>
       </requirements>
     </component>
-    <component>
+     <component>
       <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
       <role-hint>continuum-group-administrator</role-hint>
       <implementation>org.apache.maven.continuum.security.profile.ContinuumGroupAdministratorRoleProfile</implementation>
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -68,13 +71,14 @@
         </requirement>
       </requirements>
     </component>
-    <component>
+     <component>
       <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
       <role-hint>continuum-guest</role-hint>
       <implementation>org.apache.maven.continuum.security.profile.ContinuumGuestRoleProfile</implementation>
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -84,11 +88,44 @@
     </component>
     <component>
       <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
+      <role-hint>continuum-system-administrator</role-hint>
+      <implementation>org.apache.maven.continuum.security.profile.ContinuumSystemAdministratorRoleProfile</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.PlexusContainer</role>
+          <field-name>container</field-name>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
+      <role-hint>continuum-user-administrator</role-hint>
+      <implementation>org.apache.maven.continuum.security.profile.ContinuumUserAdministratorRoleProfile</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.PlexusContainer</role>
+          <field-name>container</field-name>
+        </requirement>
+      </requirements>
+    </component>
+    
+    <!-- 
+     <component>
+      <role>org.codehaus.plexus.rbac.profile.RoleProfile</role>
       <role-hint>user-administrator</role-hint>
       <implementation>org.codehaus.plexus.security.ui.web.role.profile.UserAdministratorRoleProfile</implementation>
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -104,6 +141,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -119,6 +157,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -134,6 +173,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>memory</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -141,5 +181,6 @@
         </requirement>
       </requirements>
     </component>
+     -->
   </components>
 </plexus>

Modified: maven/continuum/trunk/continuum-security/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-security/pom.xml?view=diff&rev=483232&r1=483231&r2=483232
==============================================================================
--- maven/continuum/trunk/continuum-security/pom.xml (original)
+++ maven/continuum/trunk/continuum-security/pom.xml Wed Dec  6 13:16:02 2006
@@ -1,4 +1,7 @@
-<project>
+<?xml version="1.0" encoding="UTF-8" ?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
@@ -16,7 +19,16 @@
   </dependencies>
   <build>
     <!--
-    need to fix pulling requirements from other artifacts
+    TODO: fix cdc pulling requirements from other artifacts.
+      This is disabled and done manually, due to the inability of
+      plexus-cdc to generate a proper component descriptor when
+      the component is extended off of another component.
+
+      We have RoleProfile's based off of p-sec AbstractDynamicRoleProfile and
+      a RoleProfileManager based off of p-sec DefaultRoleProfileManager.
+
+      This arrangement will not work with the current version of plexus-cdc.
+      
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/trunk/continuum-security/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-security/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=483232&r1=483231&r2=483232
==============================================================================
--- maven/continuum/trunk/continuum-security/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-security/src/main/resources/META-INF/plexus/components.xml
Wed Dec  6 13:16:02 2006
@@ -27,6 +27,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
       </requirements>
     </component>
@@ -37,6 +38,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
       </requirements>
     </component>
@@ -47,6 +49,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -61,6 +64,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -75,6 +79,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -89,6 +94,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -103,7 +109,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>jdo</role-hint>
+          <role-hint>cached</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=483232&r1=483231&r2=483232
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Wed Dec  6 13:16:02 2006
@@ -65,7 +65,7 @@
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-maven-plugin</artifactId>
-          <version>1.3.2</version>
+          <version>1.3.3</version>
           <extensions>true</extensions>
         </plugin>
         <plugin>



Mime
View raw message