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 2009/03/17 17:58:49 UTC
svn commit: r755319 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src:
main/java/org/apache/maven/archiva/webdav/
main/java/org/apache/maven/archiva/webdav/util/
test/java/org/apache/maven/archiva/webdav/ test/java/org/apache/maven/arc...
Author: brett
Date: Tue Mar 17 16:58:49 2009
New Revision: 755319
URL: http://svn.apache.org/viewvc?rev=755319&view=rev
Log:
clean up warnings in webdav module
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSession.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaVirtualDavResource.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/WebdavMethodUtil.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProviderTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java Tue Mar 17 16:58:49 2009
@@ -19,11 +19,9 @@
* under the License.
*/
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.webdav.DavLocatorFactory;
import org.apache.jackrabbit.webdav.DavResourceLocator;
-import org.apache.jackrabbit.util.Text;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.maven.archiva.webdav.util.RepositoryPathUtil;
/**
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java Tue Mar 17 16:58:49 2009
@@ -44,7 +44,6 @@
import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.VersionedReference;
import org.apache.maven.archiva.policies.ProxyDownloadException;
import org.apache.maven.archiva.proxy.RepositoryProxyConnectors;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
@@ -80,7 +79,6 @@
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession;
-import org.codehaus.plexus.redback.system.SecuritySystemConstants;
import org.codehaus.plexus.redback.users.User;
import org.codehaus.plexus.redback.users.UserManager;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -986,7 +984,7 @@
{
try
{
- VersionedReference versionRef = metadataTools.toVersionedReference( requestedResource );
+ metadataTools.toVersionedReference( requestedResource );
return false;
}
catch ( RepositoryMetadataException re )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSession.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSession.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSession.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSession.java Tue Mar 17 16:58:49 2009
@@ -24,7 +24,7 @@
public class ArchivaDavSession implements DavSession
{
- private final HashSet lockTokens = new HashSet();
+ private final HashSet<String> lockTokens = new HashSet<String>();
public void addLockToken(String token)
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java Tue Mar 17 16:58:49 2009
@@ -34,27 +34,20 @@
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.users.UserManager;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
*/
public class ArchivaDavSessionProvider
implements DavSessionProvider
{
- private Logger log = LoggerFactory.getLogger( ArchivaDavSessionProvider.class );
-
private ServletAuthenticator servletAuth;
private HttpAuthenticator httpAuth;
- private ArchivaXworkUser archivaXworkUser;
-
public ArchivaDavSessionProvider( ServletAuthenticator servletAuth, HttpAuthenticator httpAuth, ArchivaXworkUser archivaXworkUser )
{
this.servletAuth = servletAuth;
this.httpAuth = httpAuth;
- this.archivaXworkUser = archivaXworkUser;
}
public boolean attachSession( WebdavRequest request )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaVirtualDavResource.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaVirtualDavResource.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaVirtualDavResource.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaVirtualDavResource.java Tue Mar 17 16:58:49 2009
@@ -63,8 +63,6 @@
private static final String COMPLIANCE_CLASS = "1";
- private MimeTypes mimeTypes;
-
private ArchivaDavResourceLocator locator;
private DavResourceFactory factory;
@@ -84,7 +82,6 @@
{
this.localResources = localResources;
this.logicalResource = logicalResource;
- this.mimeTypes = mimeTypes;
this.locator = locator;
this.factory = factory;
this.properties = new DavPropertySet();
@@ -122,6 +119,7 @@
}
+ @SuppressWarnings("unchecked")
public MultiStatusResponse alterProperties( List arg0 )
throws DavException
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java Tue Mar 17 16:58:49 2009
@@ -37,8 +37,6 @@
*/
public class IndexWriter
{
- private final DavResource resource;
-
private final String logicalResource;
private final List<File> localResources;
@@ -47,7 +45,6 @@
public IndexWriter(DavResource resource, File localResource, String logicalResource)
{
- this.resource = resource;
this.localResources = new ArrayList<File>();
this.localResources.add( localResource );
this.logicalResource = logicalResource;
@@ -56,7 +53,6 @@
public IndexWriter( DavResource resource, List<File> localResources, String logicalResource )
{
- this.resource = resource;
this.logicalResource = logicalResource;
this.localResources = localResources;
this.isVirtual = true;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java Tue Mar 17 16:58:49 2009
@@ -52,7 +52,7 @@
private String resource = "org/apache/maven/archiva/webdav/util/mime.types";
- private Map mimeMap = new HashMap();
+ private Map<String, String> mimeMap = new HashMap<String, String>();
private Logger log = LoggerFactory.getLogger( MimeTypes.class );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/WebdavMethodUtil.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/WebdavMethodUtil.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/WebdavMethodUtil.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/WebdavMethodUtil.java Tue Mar 17 16:58:49 2009
@@ -31,11 +31,11 @@
*/
public class WebdavMethodUtil
{
- private static final List READ_METHODS;
+ private static final List<String> READ_METHODS;
static
{
- READ_METHODS = new ArrayList();
+ READ_METHODS = new ArrayList<String>();
READ_METHODS.add( "HEAD" );
READ_METHODS.add( "GET" );
READ_METHODS.add( "PROPFIND" );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProviderTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProviderTest.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProviderTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProviderTest.java Tue Mar 17 16:58:49 2009
@@ -85,6 +85,7 @@
assertNull(request.getDavSession());
}
+ @SuppressWarnings("unchecked")
private class HttpServletRequestMock implements HttpServletRequest
{
public Object getAttribute(String arg0) {
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java Tue Mar 17 16:58:49 2009
@@ -20,6 +20,7 @@
*/
import java.io.File;
+import java.util.Collections;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.webdav.DavException;
@@ -36,13 +37,12 @@
import org.apache.jackrabbit.webdav.lock.SimpleLockManager;
import org.apache.jackrabbit.webdav.lock.Type;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.repository.audit.AuditListener;
import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers;
import org.apache.maven.archiva.webdav.util.MimeTypes;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.codehaus.plexus.spring.PlexusToSpringUtils;
-import edu.emory.mathcs.backport.java.util.Collections;
-
public class DavResourceTest extends PlexusInSpringTestCase
{
private DavSession session;
@@ -98,7 +98,7 @@
private DavResource getDavResource(String logicalPath, File file)
{
return new ArchivaDavResource( file.getAbsolutePath(), logicalPath, repository, session, resourceLocator,
- resourceFactory, mimeTypes, Collections.emptyList(), consumers );
+ resourceFactory, mimeTypes, Collections.<AuditListener>emptyList(), consumers );
}
public void testDeleteNonExistantResourceShould404()
@@ -299,7 +299,7 @@
public DavResource createResource(DavResourceLocator locator, DavSession session) throws DavException {
return new ArchivaDavResource( baseDir.getAbsolutePath(), "/", repository, session, resourceLocator,
- resourceFactory, mimeTypes, Collections.emptyList(), consumers );
+ resourceFactory, mimeTypes, Collections.<AuditListener>emptyList(), consumers );
}
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java Tue Mar 17 16:58:49 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import java.io.File;
/**
* RepositoryServlet Tests, Proxied, Get of Metadata, exists on remote repository only.
@@ -45,7 +44,7 @@
String expectedMetadata = createVersionMetadata( "org.apache.archiva", "archivatest-maven-plugin",
version, timestamp, buildNumber, lastUpdated);
- File metadataFile = populateRepo( remoteSnapshots, path, expectedMetadata );
+ populateRepo( remoteSnapshots, path, expectedMetadata );
setupConnector( REPOID_INTERNAL, remoteSnapshots );
setupConnector( REPOID_INTERNAL, remotePrivateSnapshots );
@@ -74,7 +73,7 @@
String expectedMetadata = createVersionMetadata( "org.apache.maven.plugins", "maven-assembly-plugin", version,
timestamp, buildNumber, lastUpdated );
- File metadataFile = populateRepo( remoteSnapshots, path, expectedMetadata );
+ populateRepo( remoteSnapshots, path, expectedMetadata );
setupConnector( REPOID_INTERNAL, remoteSnapshots );
setupConnector( REPOID_INTERNAL, remotePrivateSnapshots );
@@ -99,7 +98,7 @@
String expectedMetadata = createVersionMetadata( "org.apache.archiva", "archivatest-maven-plugin",
"4.0-alpha-2" );
- File managedFile = populateRepo( remoteSnapshots, path, expectedMetadata );
+ populateRepo( remoteSnapshots, path, expectedMetadata );
setupConnector( REPOID_INTERNAL, remoteSnapshots );
setupConnector( REPOID_INTERNAL, remotePrivateSnapshots );
@@ -126,7 +125,7 @@
String expectedMetadata = createProjectMetadata( "org.apache.archiva", "archivatest-maven-plugin",
latest, release, new String[] { "1.0-alpha-4" } );
- File managedFile = populateRepo( remoteSnapshots, path, expectedMetadata );
+ populateRepo( remoteSnapshots, path, expectedMetadata );
setupConnector( REPOID_INTERNAL, remoteSnapshots );
setupConnector( REPOID_INTERNAL, remotePrivateSnapshots );
@@ -150,7 +149,7 @@
String path = "org/apache/archiva/maven-metadata.xml";
String expectedMetadata = createGroupMetadata( "org.apache.archiva", new String[] { "archivatest-maven-plugin" } );
- File managedFile = populateRepo( remoteSnapshots, path, expectedMetadata );
+ populateRepo( remoteSnapshots, path, expectedMetadata );
setupConnector( REPOID_INTERNAL, remoteSnapshots );
setupConnector( REPOID_INTERNAL, remotePrivateSnapshots );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java?rev=755319&r1=755318&r2=755319&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/httpunit/MkColMethodWebRequest.java Tue Mar 17 16:58:49 2009
@@ -20,7 +20,6 @@
*/
import com.meterware.httpunit.HeaderOnlyWebRequest;
-import java.net.URL;
/**
* MkColMethodWebRequest