You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/03/04 09:21:21 UTC
svn commit: r918887 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav: ./
src/test/java/org/apache/maven/archiva/webdav/
src/test/resources/org/apache/archiva/
src/test/resources/org/apache/archiva/repository/
src/test/resources/org/apache...
Author: brett
Date: Thu Mar 4 08:21:21 2010
New Revision: 918887
URL: http://svn.apache.org/viewvc?rev=918887&view=rev
Log:
[MRM-1355] merge test for audit log username setting from branch, with adjustments
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/TestAuditListener.java (with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 4 08:21:21 2010
@@ -0,0 +1,7 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav:918857
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav:699795-705848
+/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webdav:898632
+/archiva/trunk/archiva-modules/archiva-web/archiva-webdav:825850-909464
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java?rev=918887&r1=918886&r2=918887&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java Thu Mar 4 08:21:21 2010
@@ -22,16 +22,19 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.List;
import javax.servlet.http.HttpServletResponse;
import net.sf.ehcache.CacheManager;
+import org.apache.archiva.repository.audit.TestAuditListener;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.webdav.DavSessionProvider;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.repository.audit.AuditListener;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.security.ServletAuthenticator;
import org.codehaus.plexus.redback.authentication.AuthenticationException;
@@ -347,6 +350,8 @@
archivaDavResourceFactory.setHttpAuth( httpAuth );
archivaDavResourceFactory.setServletAuth( servletAuth );
+ TestAuditListener listener = new TestAuditListener();
+ archivaDavResourceFactory.addAuditListener( listener );
servlet.setResourceFactory( archivaDavResourceFactory );
AuthenticationResult result = new AuthenticationResult();
@@ -376,6 +381,8 @@
servletAuthControl.verify();
// assertEquals(HttpServletResponse.SC_CREATED, response.getResponseCode());
+
+ assertEquals( "admin", listener.getEvents().get( 0 ).getUserId() );
}
// test get with invalid user, and guest has read access to repo
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/TestAuditListener.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/TestAuditListener.java?rev=918887&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/TestAuditListener.java (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/TestAuditListener.java Thu Mar 4 08:21:21 2010
@@ -0,0 +1,42 @@
+package org.apache.archiva.repository.audit;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.archiva.repository.audit.AuditEvent;
+import org.apache.maven.archiva.repository.audit.AuditListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestAuditListener
+ implements AuditListener
+{
+ public List<AuditEvent> getEvents()
+ {
+ return events;
+ }
+
+ private List<AuditEvent> events = new ArrayList<AuditEvent>();
+
+ public void auditEvent( AuditEvent event )
+ {
+ events.add( event );
+ }
+}
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/archiva/repository/audit/TestAuditListener.java
------------------------------------------------------------------------------
svn:eol-style = native