Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-677] 

-upgraded redback to 1.1-SNAPSHOT
-updated the archiva redback models to the new redback model


git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@638845 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maria Odea B. Ching 2008-03-19 14:36:08 +00:00
parent 3985b652f5
commit 58f7a148ae
6 changed files with 425 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml
View File

@ -1,6 +1,9 @@
<redback-role-model>
<version>1.0.0</version>
<application>Archiva</application>
<modelVersion>1.0.0</modelVersion>
<applications>
<application>
<id>Archiva</id>
<version>1.0</version>
<operations>
<operation>
<id>archiva-manage-users</id>
@ -220,4 +223,6 @@
</parentRoles>
</template>
</templates>
</application>
</applications>
</redback-role-model>

10
archiva-web/archiva-security/src/test/resources/META-INF/redback/redback-core.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<redback-role-model>
<version>1.0.0</version>
<application>Redback XWork Integration Security Core</application>
<modelVersion>1.0.0</modelVersion>
<applications>
<application>
<id>Redback XWork Integration Security Core</id>
<version>1.0</version>
<resources>
<resource>
<id>global</id>
@ -192,4 +194,6 @@
</permissions>
</role>
</roles>
</application>
</applications>
</redback-role-model>

5
archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml
View File

@ -110,11 +110,6 @@
<implementation>org.codehaus.plexus.redback.role.DefaultRoleManager</implementation>
<description>RoleProfileManager:</description>
<requirements>
<requirement>
<role>org.codehaus.plexus.redback.role.merger.RoleModelMerger</role>
<role-hint>default</role-hint>
<field-name>modelMerger</field-name>
</requirement>
<requirement>
<role>org.codehaus.plexus.redback.role.validator.RoleModelValidator</role>
<role-hint>default</role-hint>

5
archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/RoleManagerTest.xml
View File

@ -7,11 +7,6 @@
<implementation>org.codehaus.plexus.redback.role.DefaultRoleManager</implementation>
<description>RoleProfileManager:</description>
<requirements>
<requirement>
<role>org.codehaus.plexus.redback.role.merger.RoleModelMerger</role>
<role-hint>default</role-hint>
<field-name>modelMerger</field-name>
</requirement>
<requirement>
<role>org.codehaus.plexus.redback.role.validator.RoleModelValidator</role>
<role-hint>default</role-hint>

5
archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml
View File

@ -100,11 +100,6 @@
<instantiation-strategy>singleton</instantiation-strategy>
<description>RoleProfileManager:</description>
<requirements>
<requirement>
<role>org.codehaus.plexus.redback.role.merger.RoleModelMerger</role>
<role-hint>default</role-hint>
<field-name>modelMerger</field-name>
</requirement>
<requirement>
<role>org.codehaus.plexus.redback.role.validator.RoleModelValidator</role>
<role-hint>default</role-hint>

2
pom.xml
View File

@ -915,7 +915,7 @@
<properties>
<maven.version>2.0.5</maven.version>
<wagon.version>1.0-rc1-SNAPSHOT</wagon.version>
<redback.version>1.0-alpha-4</redback.version>
<redback.version>1.1-SNAPSHOT</redback.version>
</properties>
<repositories>
<repository>