You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2009/02/25 04:44:18 UTC
svn commit: r747651 - in
/archiva/branches/archiva-with-new-repoapi/archiva-modules:
archiva-base/archiva-repository-api/
archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/
archiva-web/archiva-repository-servlet/ archi...
Author: jdumay
Date: Wed Feb 25 03:44:17 2009
New Revision: 747651
URL: http://svn.apache.org/viewvc?rev=747651&view=rev
Log:
Add security bypass back to repo servlet tests
resourcecontext should have accessor for principal
Modified:
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/pom.xml
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/MutableResourceContext.java
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/ResourceContext.java
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/pom.xml
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/test/resources/org/apache/archiva/web/servlet/RepositoryServletTest.xml
Modified: archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/pom.xml?rev=747651&r1=747650&r2=747651&view=diff
==============================================================================
--- archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/pom.xml (original)
+++ archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/pom.xml Wed Feb 25 03:44:17 2009
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-repository-api</artifactId>
<version>1.2-SNAPSHOT</version>
- <name>Apache Base :: Repository API</name>
+ <name>Archiva Base :: Repository API</name>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
Modified: archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/MutableResourceContext.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/MutableResourceContext.java?rev=747651&r1=747650&r2=747651&view=diff
==============================================================================
--- archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/MutableResourceContext.java (original)
+++ archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/MutableResourceContext.java Wed Feb 25 03:44:17 2009
@@ -31,6 +31,8 @@
private String repositoryId;
+ private String principal;
+
public MutableResourceContext(ResourceContext context)
{
this.context = context;
@@ -54,6 +56,24 @@
return context.getRepositoryId();
}
+ public String getPrincipal()
+ {
+ if (principal != null)
+ {
+ return principal;
+ }
+ return context.getPrincipal();
+ }
+
+ /**
+ * Sets the principal overriding the internal principal value
+ * @param principal
+ */
+ public void setPrincipal(String principal)
+ {
+ this.principal = principal;
+ }
+
/**
* Sets the logicalPath overriding the internal logical path value
* @param logicalPath
Modified: archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/ResourceContext.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/ResourceContext.java?rev=747651&r1=747650&r2=747651&view=diff
==============================================================================
--- archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/ResourceContext.java (original)
+++ archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/api/ResourceContext.java Wed Feb 25 03:44:17 2009
@@ -35,4 +35,10 @@
* @return
*/
String getRepositoryId();
+
+ /**
+ * Get the principal used for the resource request
+ * @return
+ */
+ String getPrincipal();
}
Modified: archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/pom.xml?rev=747651&r1=747650&r2=747651&view=diff
==============================================================================
--- archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/pom.xml (original)
+++ archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/pom.xml Wed Feb 25 03:44:17 2009
@@ -43,6 +43,10 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy</artifactId>
<scope>test</scope>
</dependency>
Modified: archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/test/resources/org/apache/archiva/web/servlet/RepositoryServletTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/test/resources/org/apache/archiva/web/servlet/RepositoryServletTest.xml?rev=747651&r1=747650&r2=747651&view=diff
==============================================================================
--- archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/test/resources/org/apache/archiva/web/servlet/RepositoryServletTest.xml (original)
+++ archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/test/resources/org/apache/archiva/web/servlet/RepositoryServletTest.xml Wed Feb 25 03:44:17 2009
@@ -62,6 +62,12 @@
</properties>
</configuration>
</component>
+
+ <component>
+ <role>org.codehaus.plexus.redback.system.SecuritySystem</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.archiva.web.servlet.BypassSecuritySystem</implementation>
+ </component>
<component>
<role>org.codehaus.plexus.cache.Cache</role>