continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r483153 - 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-test/src/main/java/org/apache/maven/continuum/
Date Wed, 06 Dec 2006 17:13:14 GMT
Author: jmcconnell
Date: Wed Dec  6 09:13:13 2006
New Revision: 483153

URL: http://svn.apache.org/viewvc?view=rev&rev=483153
Log:
fixing up a couple of issues with the latest plexus-security update

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-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java

Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/pom.xml?view=diff&rev=483153&r1=483152&r2=483153
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Wed Dec  6 09:13:13 2006
@@ -160,24 +160,29 @@
       <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>
+    -->
+    <!--
     <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
       <artifactId>plexus-security-ui-web-integration</artifactId>
       <scope>test</scope>
     </dependency>
-     <dependency>
+    -->
+<!--    <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
       <artifactId>plexus-security-authorization-rbac-model</artifactId>
     </dependency>
-     <dependency>
+    <dependency>
       <artifactId>plexus-security-authorization-rbac-store-memory</artifactId>
       <groupId>org.codehaus.plexus.security</groupId>
       <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=483153&r1=483152&r2=483153
==============================================================================
--- 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 09:13:13 2006
@@ -44,7 +44,7 @@
     private ContinuumStore store;
 
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="continuum"
      */
     private RoleProfileManager roleManager;
 
@@ -65,6 +65,7 @@
         }
         catch ( RoleProfileException rpe )
         {
+            rpe.printStackTrace();
             throw new ContinuumException( "error generating dynamic role for project " +
projectGroup.getName(), rpe );
         }
     }

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=483153&r1=483152&r2=483153
==============================================================================
--- 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 09:13:13 2006
@@ -41,7 +41,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>memory</role-hint>
+     >
         </requirement>
       </requirements>
     </component>
@@ -52,7 +52,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>memory</role-hint>
+
         </requirement>
       </requirements>
     </component>
@@ -63,7 +63,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>memory</role-hint>
+
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -78,7 +78,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>memory</role-hint>
+
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -93,7 +93,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>memory</role-hint>
+
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -109,7 +109,7 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>memory</role-hint>
+
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.PlexusContainer</role>
@@ -125,7 +125,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,7 +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>

Modified: maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?view=diff&rev=483153&r1=483152&r2=483153
==============================================================================
--- maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
(original)
+++ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
Wed Dec  6 09:13:13 2006
@@ -27,14 +27,12 @@
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.jdo.ConfigurableJdoFactory;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.codehaus.plexus.jdo.JdoFactory;
 import org.jpox.SchemaTool;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
-
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;



Mime
View raw message