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:53:50 UTC
svn commit: r755318 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-security/src/main/java/org/apache/maven/archiva/security/
archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/
archiva-webapp/src/main/java/org/apache/maven/archi...
Author: brett
Date: Tue Mar 17 16:53:49 2009
New Revision: 755318
URL: http://svn.apache.org/viewvc?rev=755318&view=rev
Log:
clean up warnings in webapp
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AddAdminDatabaseConsumerClosure.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AdminDatabaseConsumerComparator.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AddAdminRepoConsumerClosure.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AdminRepositoryConsumerComparator.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ProjectModelDAOStub.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryContentStatisticsDAOStub.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/ArtifactDAOStub.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java Tue Mar 17 16:53:49 2009
@@ -34,7 +34,7 @@
*/
public class ArchivaXworkUser
{
- public String getActivePrincipal( Map<String, Object> sessionMap )
+ public String getActivePrincipal( Map<String, ?> sessionMap )
{
SecuritySession securitySession =
(SecuritySession) sessionMap.get( SecuritySystemConstants.SECURITY_SESSION_KEY );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java Tue Mar 17 16:53:49 2009
@@ -204,6 +204,7 @@
}
}
+ @SuppressWarnings("unchecked")
private String getPrincipal()
{
return archivaXworkUser.getActivePrincipal( ActionContext.getContext().getSession() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java Tue Mar 17 16:53:49 2009
@@ -213,8 +213,6 @@
TimeZone timezone = TimeZone.getTimeZone( "UTC" );
DateFormat fmt = new SimpleDateFormat( "yyyyMMdd.HHmmss" );
fmt.setTimeZone( timezone );
- String timestamp = fmt.format( lastUpdatedTimestamp );
-
ManagedRepositoryConfiguration repoConfig =
configuration.getConfiguration().findManagedRepositoryById( repositoryId );
@@ -296,6 +294,7 @@
}
}
+ @SuppressWarnings("unchecked")
private String getPrincipal()
{
return archivaXworkUser.getActivePrincipal( ActionContext.getContext().getSession() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java Tue Mar 17 16:53:49 2009
@@ -34,13 +34,13 @@
extends ActionSupport
implements SessionAware
{
- protected Map session;
+ protected Map<?, ?> session;
protected Logger log = LoggerFactory.getLogger( getClass() );
+ @SuppressWarnings("unchecked")
public void setSession( Map map )
{
- //noinspection AssignmentToCollectionOrArrayFieldFromParameter
this.session = map;
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java Tue Mar 17 16:53:49 2009
@@ -28,6 +28,8 @@
import org.apache.maven.archiva.database.ObjectNotFoundException;
import org.apache.maven.archiva.database.browsing.RepositoryBrowsing;
import org.apache.maven.archiva.model.ArchivaProjectModel;
+import org.apache.maven.archiva.model.Dependency;
+import org.apache.maven.archiva.model.MailingList;
import org.apache.maven.archiva.security.AccessDeniedException;
import org.apache.maven.archiva.security.ArchivaSecurityException;
import org.apache.maven.archiva.security.PrincipalNotFoundException;
@@ -85,16 +87,11 @@
/**
* The list of artifacts that depend on this versioned project.
*/
- private List dependees;
+ private List<ArchivaProjectModel> dependees;
- /**
- * The reports associated with this versioned project.
- */
- private List reports;
-
- private List mailingLists;
+ private List<MailingList> mailingLists;
- private List dependencies;
+ private List<Dependency> dependencies;
private List<String> snapshotVersions;
@@ -168,10 +165,8 @@
public String reports()
throws ObjectNotFoundException, ArchivaDatabaseException
{
- System.out.println( "#### In reports." );
// TODO: hook up reports on project - this.reports = artifactsDatabase.findArtifactResults( groupId, artifactId,
// version );
- System.out.println( "#### Found " + reports.size() + " reports." );
return SUCCESS;
}
@@ -200,6 +195,7 @@
return SUCCESS;
}
+ @SuppressWarnings("unchecked")
private String getPrincipal()
{
return archivaXworkUser.getActivePrincipal( ActionContext.getContext().getSession() );
@@ -281,22 +277,17 @@
this.version = version;
}
- public List getReports()
- {
- return reports;
- }
-
- public List getMailingLists()
+ public List<MailingList> getMailingLists()
{
return mailingLists;
}
- public List getDependencies()
+ public List<Dependency> getDependencies()
{
return dependencies;
}
- public List getDependees()
+ public List<ArchivaProjectModel> getDependees()
{
return dependees;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java Tue Mar 17 16:53:49 2009
@@ -121,31 +121,11 @@
private File artifactFile;
/**
- * The content type of the artifact to be deployed.
- */
- private String artifactContentType;
-
- /**
- * The original filename of the uploaded artifact file.
- */
- private String artifactFilename;
-
- /**
* The temporary file representing the pom to be deployed alongside the artifact.
*/
private File pomFile;
/**
- * The content type of the pom file.
- */
- private String pomContentType;
-
- /**
- * The original filename of the uploaded pom file.
- */
- private String pomFilename;
-
- /**
* The repository where the artifact is to be deployed.
*/
private String repositoryId;
@@ -191,12 +171,12 @@
public void setArtifactContentType( String contentType )
{
- this.artifactContentType = StringUtils.trim( contentType );
+ StringUtils.trim( contentType );
}
public void setArtifactFileName( String filename )
{
- this.artifactFilename = StringUtils.trim( filename );
+ StringUtils.trim( filename );
}
public void setPom( File file )
@@ -206,12 +186,12 @@
public void setPomContentType( String contentType )
{
- this.pomContentType = StringUtils.trim( contentType );
+ StringUtils.trim( contentType );
}
public void setPomFileName( String filename )
{
- this.pomFilename = StringUtils.trim( filename );
+ StringUtils.trim( filename );
}
public String getGroupId()
@@ -314,11 +294,7 @@
packaging = "";
classifier = "";
artifactFile = null;
- artifactContentType = "";
- artifactFilename = "";
pomFile = null;
- pomContentType = "";
- pomFilename = "";
repositoryId = "";
generatePom = false;
}
@@ -456,6 +432,7 @@
}
}
+ @SuppressWarnings("unchecked")
private String getPrincipal()
{
return archivaXworkUser.getActivePrincipal( ActionContext.getContext().getSession() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java Tue Mar 17 16:53:49 2009
@@ -43,10 +43,6 @@
extends PlexusActionSupport
implements SecureAction
{
- private static final String REPO_SUCCESS = "repoSucces";
-
- private static final String DB_SUCCESS = "dbSuccess";
-
/**
* @plexus.requirement
*/
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java Tue Mar 17 16:53:49 2009
@@ -19,7 +19,11 @@
* under the License.
*/
-import com.opensymphony.xwork2.Preparable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.maven.archiva.policies.DownloadErrorPolicy;
@@ -27,11 +31,7 @@
import org.apache.maven.archiva.policies.PostDownloadPolicy;
import org.apache.maven.archiva.policies.PreDownloadPolicy;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import com.opensymphony.xwork2.Preparable;
/**
* AbstractProxyConnectorFormAction - generic fields and methods for either add or edit actions related with the
@@ -160,6 +160,7 @@
return INPUT;
}
+ @SuppressWarnings("unchecked")
public String addProperty()
{
String key = getPropertyKey();
@@ -419,6 +420,7 @@
return new ArrayList<String>( getConfig().getRemoteRepositoriesAsMap().keySet() );
}
+ @SuppressWarnings("unchecked")
protected void validateConnector()
{
if ( connector.getPolicies() == null )
@@ -440,11 +442,9 @@
continue;
}
- Map properties = connector.getProperties();
- for ( Iterator j = properties.keySet().iterator(); j.hasNext(); )
+ Map<String, Object> properties = connector.getProperties();
+ for ( String key : properties.keySet() )
{
- String key = (String) j.next();
-
Object value = properties.get( key );
if ( value.getClass().isArray() )
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AddAdminDatabaseConsumerClosure.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AddAdminDatabaseConsumerClosure.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AddAdminDatabaseConsumerClosure.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AddAdminDatabaseConsumerClosure.java Tue Mar 17 16:53:49 2009
@@ -33,11 +33,11 @@
public class AddAdminDatabaseConsumerClosure
implements Closure
{
- private List list = new ArrayList();
+ private List<AdminDatabaseConsumer> list = new ArrayList<AdminDatabaseConsumer>();
- private List selectedIds;
+ private List<String> selectedIds;
- public AddAdminDatabaseConsumerClosure( List selectedIds )
+ public AddAdminDatabaseConsumerClosure( List<String> selectedIds )
{
this.selectedIds = selectedIds;
}
@@ -59,7 +59,7 @@
}
}
- public List getList()
+ public List<AdminDatabaseConsumer> getList()
{
return list;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AdminDatabaseConsumerComparator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AdminDatabaseConsumerComparator.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AdminDatabaseConsumerComparator.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AdminDatabaseConsumerComparator.java Tue Mar 17 16:53:49 2009
@@ -27,7 +27,7 @@
* @version $Id$
*/
public class AdminDatabaseConsumerComparator
- implements Comparator
+ implements Comparator<AdminDatabaseConsumer>
{
private static AdminDatabaseConsumerComparator INSTANCE = new AdminDatabaseConsumerComparator();
@@ -36,7 +36,7 @@
return INSTANCE;
}
- public int compare( Object o1, Object o2 )
+ public int compare( AdminDatabaseConsumer o1, AdminDatabaseConsumer o2 )
{
if ( o1 == null && o2 == null )
{
@@ -53,14 +53,8 @@
return -1;
}
- if ( ( o1 instanceof AdminDatabaseConsumer ) && ( o2 instanceof AdminDatabaseConsumer ) )
- {
- String id1 = ( (AdminDatabaseConsumer) o1 ).getId();
- String id2 = ( (AdminDatabaseConsumer) o2 ).getId();
- return id1.compareToIgnoreCase( id2 );
- }
-
- return 0;
+ String id1 = o1.getId();
+ String id2 = o2.getId();
+ return id1.compareToIgnoreCase( id2 );
}
-
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java Tue Mar 17 16:53:49 2009
@@ -19,7 +19,9 @@
* under the License.
*/
-import com.opensymphony.xwork2.Preparable;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.commons.collections.CollectionUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
@@ -27,17 +29,15 @@
import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
import org.apache.maven.archiva.database.updater.DatabaseConsumers;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.apache.maven.archiva.web.action.admin.scanning.AdminRepositoryConsumerComparator;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.registry.RegistryException;
-
-import java.util.Collections;
-import java.util.List;
import org.codehaus.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
+import com.opensymphony.xwork2.Preparable;
+
/**
* DatabaseAction
*
@@ -63,22 +63,22 @@
/**
* List of available {@link AdminDatabaseConsumer} objects for unprocessed artifacts.
*/
- private List unprocessedConsumers;
+ private List<AdminDatabaseConsumer> unprocessedConsumers;
/**
* List of enabled {@link AdminDatabaseConsumer} objects for unprocessed artifacts.
*/
- private List enabledUnprocessedConsumers;
+ private List<String> enabledUnprocessedConsumers;
/**
* List of {@link AdminDatabaseConsumer} objects for "to cleanup" artifacts.
*/
- private List cleanupConsumers;
+ private List<AdminDatabaseConsumer> cleanupConsumers;
/**
* List of enabled {@link AdminDatabaseConsumer} objects for "to cleanup" artifacts.
*/
- private List enabledCleanupConsumers;
+ private List<String> enabledCleanupConsumers;
public void prepare()
throws Exception
@@ -93,12 +93,12 @@
addAdminDbConsumer = new AddAdminDatabaseConsumerClosure( dbscanning.getUnprocessedConsumers() );
CollectionUtils.forAllDo( databaseConsumers.getAvailableUnprocessedConsumers(), addAdminDbConsumer );
this.unprocessedConsumers = addAdminDbConsumer.getList();
- Collections.sort( this.unprocessedConsumers, AdminRepositoryConsumerComparator.getInstance() );
+ Collections.sort( this.unprocessedConsumers, AdminDatabaseConsumerComparator.getInstance() );
addAdminDbConsumer = new AddAdminDatabaseConsumerClosure( dbscanning.getCleanupConsumers() );
CollectionUtils.forAllDo( databaseConsumers.getAvailableCleanupConsumers(), addAdminDbConsumer );
this.cleanupConsumers = addAdminDbConsumer.getList();
- Collections.sort( this.cleanupConsumers, AdminRepositoryConsumerComparator.getInstance() );
+ Collections.sort( this.cleanupConsumers, AdminDatabaseConsumerComparator.getInstance() );
}
public String updateUnprocessedConsumers()
@@ -166,32 +166,32 @@
this.cron = cron;
}
- public List getCleanupConsumers()
+ public List<AdminDatabaseConsumer> getCleanupConsumers()
{
return cleanupConsumers;
}
- public List getUnprocessedConsumers()
+ public List<AdminDatabaseConsumer> getUnprocessedConsumers()
{
return unprocessedConsumers;
}
- public List getEnabledUnprocessedConsumers()
+ public List<String> getEnabledUnprocessedConsumers()
{
return enabledUnprocessedConsumers;
}
- public void setEnabledUnprocessedConsumers( List enabledUnprocessedConsumers )
+ public void setEnabledUnprocessedConsumers( List<String> enabledUnprocessedConsumers )
{
this.enabledUnprocessedConsumers = enabledUnprocessedConsumers;
}
- public List getEnabledCleanupConsumers()
+ public List<String> getEnabledCleanupConsumers()
{
return enabledCleanupConsumers;
}
- public void setEnabledCleanupConsumers( List enabledCleanupConsumers )
+ public void setEnabledCleanupConsumers( List<String> enabledCleanupConsumers )
{
this.enabledCleanupConsumers = enabledCleanupConsumers;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java Tue Mar 17 16:53:49 2009
@@ -49,7 +49,7 @@
{
log.info( "remove [" + path + "] from legacy artifact path resolution" );
Configuration configuration = archivaConfiguration.getConfiguration();
- for ( Iterator iterator = configuration.getLegacyArtifactPaths().iterator(); iterator.hasNext(); )
+ for ( Iterator<LegacyArtifactPath> iterator = configuration.getLegacyArtifactPaths().iterator(); iterator.hasNext(); )
{
LegacyArtifactPath legacyArtifactPath = (LegacyArtifactPath) iterator.next();
if (legacyArtifactPath.match( path ))
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java Tue Mar 17 16:53:49 2009
@@ -22,6 +22,7 @@
import com.opensymphony.xwork2.Preparable;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.NetworkProxyConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.codehaus.plexus.redback.rbac.Resource;
@@ -47,7 +48,7 @@
*/
private ArchivaConfiguration configuration;
- private List networkProxies;
+ private List<NetworkProxyConfiguration> networkProxies;
public void prepare()
throws Exception
@@ -66,12 +67,12 @@
return bundle;
}
- public List getNetworkProxies()
+ public List<NetworkProxyConfiguration> getNetworkProxies()
{
return networkProxies;
}
- public void setNetworkProxies( List networkProxies )
+ public void setNetworkProxies( List<NetworkProxyConfiguration> networkProxies )
{
this.networkProxies = networkProxies;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AddAdminRepoConsumerClosure.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AddAdminRepoConsumerClosure.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AddAdminRepoConsumerClosure.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AddAdminRepoConsumerClosure.java Tue Mar 17 16:53:49 2009
@@ -33,11 +33,11 @@
public class AddAdminRepoConsumerClosure
implements Closure
{
- private List list = new ArrayList();
+ private List<AdminRepositoryConsumer> list = new ArrayList<AdminRepositoryConsumer>();
- private List selectedIds;
+ private List<String> selectedIds;
- public AddAdminRepoConsumerClosure( List selectedIds )
+ public AddAdminRepoConsumerClosure( List<String> selectedIds )
{
this.selectedIds = selectedIds;
}
@@ -58,7 +58,7 @@
}
}
- public List getList()
+ public List<AdminRepositoryConsumer> getList()
{
return list;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AdminRepositoryConsumerComparator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AdminRepositoryConsumerComparator.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AdminRepositoryConsumerComparator.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/AdminRepositoryConsumerComparator.java Tue Mar 17 16:53:49 2009
@@ -27,7 +27,7 @@
* @version $Id$
*/
public class AdminRepositoryConsumerComparator
- implements Comparator
+ implements Comparator<AdminRepositoryConsumer>
{
private static AdminRepositoryConsumerComparator INSTANCE = new AdminRepositoryConsumerComparator();
@@ -36,7 +36,7 @@
return INSTANCE;
}
- public int compare( Object o1, Object o2 )
+ public int compare( AdminRepositoryConsumer o1, AdminRepositoryConsumer o2 )
{
if ( o1 == null && o2 == null )
{
@@ -53,13 +53,8 @@
return -1;
}
- if ( ( o1 instanceof AdminRepositoryConsumer ) && ( o2 instanceof AdminRepositoryConsumer ) )
- {
- String id1 = ( (AdminRepositoryConsumer) o1 ).getId();
- String id2 = ( (AdminRepositoryConsumer) o2 ).getId();
- return id1.compareToIgnoreCase( id2 );
- }
-
- return 0;
+ String id1 = o1.getId();
+ String id2 = o2.getId();
+ return id1.compareToIgnoreCase( id2 );
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java Tue Mar 17 16:53:49 2009
@@ -65,29 +65,29 @@
*/
private RepositoryContentConsumers repoconsumerUtil;
- private Map fileTypeMap;
+ private Map<String, FileType> fileTypeMap;
- private List fileTypeIds;
+ private List<String> fileTypeIds;
/**
* List of {@link AdminRepositoryConsumer} objects for consumers of known content.
*/
- private List knownContentConsumers;
+ private List<AdminRepositoryConsumer> knownContentConsumers;
/**
* List of enabled {@link AdminRepositoryConsumer} objects for consumers of known content.
*/
- private List enabledKnownContentConsumers;
+ private List<String> enabledKnownContentConsumers;
/**
* List of {@link AdminRepositoryConsumer} objects for consumers of invalid/unknown content.
*/
- private List invalidContentConsumers;
+ private List<AdminRepositoryConsumer> invalidContentConsumers;
/**
* List of enabled {@link AdminRepositoryConsumer} objects for consumers of invalid/unknown content.
*/
- private List enabledInvalidContentConsumers;
+ private List<String> enabledInvalidContentConsumers;
private String pattern;
@@ -141,22 +141,22 @@
return fileTypeId;
}
- public List getFileTypeIds()
+ public List<String> getFileTypeIds()
{
return fileTypeIds;
}
- public Map getFileTypeMap()
+ public Map<String, FileType> getFileTypeMap()
{
return fileTypeMap;
}
- public List getInvalidContentConsumers()
+ public List<AdminRepositoryConsumer> getInvalidContentConsumers()
{
return invalidContentConsumers;
}
- public List getKnownContentConsumers()
+ public List<AdminRepositoryConsumer> getKnownContentConsumers()
{
return knownContentConsumers;
}
@@ -200,7 +200,7 @@
this.invalidContentConsumers = addAdminRepoConsumer.getList();
Collections.sort( invalidContentConsumers, AdminRepositoryConsumerComparator.getInstance() );
- fileTypeIds = new ArrayList();
+ fileTypeIds = new ArrayList<String>();
fileTypeIds.addAll( fileTypeMap.keySet() );
Collections.sort( fileTypeIds );
}
@@ -298,22 +298,22 @@
return SUCCESS;
}
- public List getEnabledInvalidContentConsumers()
+ public List<String> getEnabledInvalidContentConsumers()
{
return enabledInvalidContentConsumers;
}
- public void setEnabledInvalidContentConsumers( List enabledInvalidContentConsumers )
+ public void setEnabledInvalidContentConsumers( List<String> enabledInvalidContentConsumers )
{
this.enabledInvalidContentConsumers = enabledInvalidContentConsumers;
}
- public List getEnabledKnownContentConsumers()
+ public List<String> getEnabledKnownContentConsumers()
{
return enabledKnownContentConsumers;
}
- public void setEnabledKnownContentConsumers( List enabledKnownContentConsumers )
+ public void setEnabledKnownContentConsumers( List<String> enabledKnownContentConsumers )
{
this.enabledKnownContentConsumers = enabledKnownContentConsumers;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java Tue Mar 17 16:53:49 2009
@@ -90,7 +90,7 @@
}
else
{
- Map params = new HashMap();
+ Map<String, String> params = new HashMap<String, String>();
if ( path.charAt( 0 ) == '/' )
{
@@ -144,10 +144,11 @@
return super.getMapping( httpServletRequest, manager );
}
+ @SuppressWarnings("unchecked")
@Override
public String getUriFromActionMapping( ActionMapping actionMapping )
{
- Map params = actionMapping.getParams();
+ Map<String, String> params = actionMapping.getParams();
if ( ACTION_BROWSE.equals( actionMapping.getName() ) )
{
return BROWSE_PREFIX;
@@ -184,7 +185,7 @@
return super.getUriFromActionMapping( actionMapping );
}
- private String toUri( Map params, boolean artifactId, boolean version, String method )
+ private String toUri( Map<String, String> params, boolean artifactId, boolean version, String method )
{
StringBuffer buf = new StringBuffer();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java Tue Mar 17 16:53:49 2009
@@ -39,7 +39,6 @@
import org.apache.maven.archiva.database.ArchivaDatabaseException;
import org.apache.maven.archiva.security.AccessDeniedException;
import org.apache.maven.archiva.security.ArchivaSecurityException;
-import org.apache.maven.archiva.security.ArchivaXworkUser;
import org.apache.maven.archiva.security.PrincipalNotFoundException;
import org.apache.maven.archiva.security.ServletAuthenticator;
import org.apache.maven.archiva.security.UserRepositories;
@@ -91,8 +90,6 @@
private HttpAuthenticator httpAuth;
- private ArchivaXworkUser archivaXworkUser;
-
public void init( javax.servlet.ServletConfig servletConfig )
throws ServletException
{
@@ -104,7 +101,6 @@
(ServletAuthenticator) wac.getBean( PlexusToSpringUtils.buildSpringId( ServletAuthenticator.class.getName() ) );
httpAuth =
(HttpAuthenticator) wac.getBean( PlexusToSpringUtils.buildSpringId( HttpAuthenticator.ROLE, "basic" ) );
- archivaXworkUser = (ArchivaXworkUser) wac.getBean( PlexusToSpringUtils.buildSpringId( ArchivaXworkUser.class ) );
}
public void doGet( HttpServletRequest req, HttpServletResponse res )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java Tue Mar 17 16:53:49 2009
@@ -45,8 +45,8 @@
SecuritySynchronization securitySync = (SecuritySynchronization) wac.getBean(PlexusToSpringUtils.buildSpringId(SecuritySynchronization.class));
ResolverFactoryInit resolverFactory = (ResolverFactoryInit) wac.getBean(PlexusToSpringUtils.buildSpringId(ResolverFactoryInit.class));
ArchivaTaskScheduler taskScheduler = (ArchivaTaskScheduler) wac.getBean(PlexusToSpringUtils.buildSpringId(ArchivaTaskScheduler.class));
- TaskQueueExecutor databaseUpdateQueue = (TaskQueueExecutor) wac.getBean(PlexusToSpringUtils.buildSpringId(TaskQueueExecutor.class, "database-update"));
- TaskQueueExecutor repositoryScanningQueue = (TaskQueueExecutor) wac.getBean(PlexusToSpringUtils.buildSpringId(TaskQueueExecutor.class, "repository-scanning"));
+ wac.getBean(PlexusToSpringUtils.buildSpringId(TaskQueueExecutor.class, "database-update"));
+ wac.getBean(PlexusToSpringUtils.buildSpringId(TaskQueueExecutor.class, "repository-scanning"));
try
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java Tue Mar 17 16:53:49 2009
@@ -60,11 +60,12 @@
private String artifactId;
+ @SuppressWarnings("unused")
private String version;
private String nodevar;
- private Iterator treeIterator;
+ private Iterator<TreeEntry> treeIterator;
private List<TreeEntry> tree;
@@ -104,6 +105,7 @@
unExposeVariables();
}
+ @SuppressWarnings("unchecked")
public int doStartTag()
throws JspException
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java Tue Mar 17 16:53:49 2009
@@ -19,16 +19,15 @@
* under the License.
*/
-import com.opensymphony.xwork2.util.ValueStack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.views.jsp.TagUtils;
-
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.struts2.components.Component;
import org.apache.struts2.views.jsp.ComponentTagSupport;
+import com.opensymphony.xwork2.util.ValueStack;
+
/**
* DownloadArtifactTag
*
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java Tue Mar 17 16:53:49 2009
@@ -116,6 +116,7 @@
return determineActionURL( "browse", NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, encode, false, false );
}
+ @SuppressWarnings("unchecked")
private String determineBrowseGroupActionUrl( String gid )
{
parameters.put( "groupId", gid );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java Tue Mar 17 16:53:49 2009
@@ -33,7 +33,7 @@
*/
public class PlexusTagUtil
{
- public static Object lookup( PageContext pageContext, Class clazz )
+ public static Object lookup( PageContext pageContext, Class<?> clazz )
throws ComponentLookupException
{
return getContainer( pageContext ).lookup( clazz );
@@ -45,7 +45,7 @@
return getContainer( pageContext ).lookup( role );
}
- public static Object lookup( PageContext pageContext, Class clazz, String hint )
+ public static Object lookup( PageContext pageContext, Class<?> clazz, String hint )
throws ComponentLookupException
{
return getContainer( pageContext ).lookup( clazz, hint );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.java Tue Mar 17 16:53:49 2009
@@ -34,11 +34,11 @@
*/
public class ContextUtils
{
- private static final Map defaultSchemePortMap;
+ private static final Map<String, Integer> defaultSchemePortMap;
static
{
- defaultSchemePortMap = new HashMap();
+ defaultSchemePortMap = new HashMap<String, Integer>();
defaultSchemePortMap.put( "http", new Integer( 80 ) );
defaultSchemePortMap.put( "https", new Integer( 443 ) );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java Tue Mar 17 16:53:49 2009
@@ -73,6 +73,7 @@
*
* NOTE: Don't forget to run {@link #preRequest(ActionSupport)} before each request to your action!
*/
+ @SuppressWarnings("unchecked")
protected void assertNoErrors( ActionSupport action )
{
List<String> errors = (List<String>) action.getActionErrors();
@@ -91,6 +92,7 @@
}
}
+ @SuppressWarnings("unchecked")
protected void assertRequestStatus( ActionSupport action, String expectedStatus, String methodName )
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java Tue Mar 17 16:53:49 2009
@@ -20,7 +20,7 @@
*/
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.List;
import org.apache.archiva.indexer.search.RepositorySearch;
@@ -153,7 +153,7 @@
versions.add( "1.0" );
versions.add( "1.1" );
- archivaXworkUserControl.expectAndReturn( archivaXworkUser.getActivePrincipal( new HashMap() ), "user", 3 );
+ archivaXworkUserControl.expectAndReturn( getActivePrincipal(), "user", 3 );
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos, 2 );
@@ -177,6 +177,11 @@
searchControl.verify();
daoControl.verify();
}
+
+ private String getActivePrincipal()
+ {
+ return archivaXworkUser.getActivePrincipal( Collections.<String,Object>emptyMap() );
+ }
public void testSearchWithinSearchResults()
throws Exception
@@ -213,7 +218,7 @@
versions.add( "1.0" );
versions.add( "1.1" );
- archivaXworkUserControl.expectAndReturn( archivaXworkUser.getActivePrincipal( new HashMap() ), "user", 3 );
+ archivaXworkUserControl.expectAndReturn( getActivePrincipal(), "user", 3 );
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos, 2 );
@@ -247,7 +252,7 @@
List<String> selectedRepos = new ArrayList<String>();
- archivaXworkUserControl.expectAndReturn( archivaXworkUser.getActivePrincipal( new HashMap() ), "user" );
+ archivaXworkUserControl.expectAndReturn( getActivePrincipal(), "user" );
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos );
@@ -279,7 +284,7 @@
SearchResults results = new SearchResults();
- archivaXworkUserControl.expectAndReturn( archivaXworkUser.getActivePrincipal( new HashMap() ), "user", 2 );
+ archivaXworkUserControl.expectAndReturn( getActivePrincipal(), "user", 2 );
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos );
@@ -334,7 +339,7 @@
SearchFields searchFields = new SearchFields( "org", null, null, null, null, selectedRepos );
- archivaXworkUserControl.expectAndReturn( archivaXworkUser.getActivePrincipal( new HashMap() ), "user" );
+ archivaXworkUserControl.expectAndReturn( getActivePrincipal(), "user" );
searchControl.expectAndReturn( search.search( "user", searchFields, limits ), results );
@@ -384,7 +389,7 @@
SearchFields searchFields = new SearchFields( "org", null, null, null, null, selectedRepos );
- archivaXworkUserControl.expectAndReturn( archivaXworkUser.getActivePrincipal( new HashMap() ), "user", 2 );
+ archivaXworkUserControl.expectAndReturn( getActivePrincipal(), "user", 2 );
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos );
@@ -429,7 +434,7 @@
SearchFields searchFields = new SearchFields( "org", null, null, null, null, selectedRepos );
- archivaXworkUserControl.expectAndReturn( archivaXworkUser.getActivePrincipal( new HashMap() ), "user" );
+ archivaXworkUserControl.expectAndReturn( getActivePrincipal(), "user" );
searchControl.expectAndReturn( search.search( "user", searchFields, limits ), results );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java Tue Mar 17 16:53:49 2009
@@ -19,11 +19,9 @@
* under the License.
*/
-import com.opensymphony.xwork2.Action;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.OrganisationInformation;
-import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
+
+import com.opensymphony.xwork2.Action;
/**
*/
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java Tue Mar 17 16:53:49 2009
@@ -117,6 +117,7 @@
assertEquals( 1, connector.getProperties().size() );
}
+ @SuppressWarnings("unchecked")
public void testAddProxyConnectorCommit()
throws Exception
{
@@ -385,6 +386,7 @@
archivaConfiguration.save( config );
}
+ @SuppressWarnings("unchecked")
private void populateProxyConnector( ProxyConnectorConfiguration connector )
{
connector.setProxyId( AbstractProxyConnectorFormAction.DIRECT_CONNECTION );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java Tue Mar 17 16:53:49 2009
@@ -159,6 +159,7 @@
assertEquals( 1, connector.getWhiteListPatterns().size() );
}
+ @SuppressWarnings("unchecked")
public void testEditProxyConnectorCommit()
throws Exception
{
@@ -375,6 +376,7 @@
assertEquals( TEST_TARGET_ID, connector.getTargetRepoId() );
}
+ @SuppressWarnings("unchecked")
private Configuration createInitialConfiguration()
{
Configuration config = new Configuration();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java Tue Mar 17 16:53:49 2009
@@ -28,6 +28,7 @@
import org.apache.maven.archiva.database.RepositoryContentStatisticsDAO;
import org.apache.maven.archiva.database.RepositoryProblemDAO;
import org.apache.maven.archiva.database.SimpleConstraint;
+import org.apache.maven.archiva.model.RepositoryContentStatistics;
/**
* AbstractManagedRepositoryArchivaDAOStub
@@ -52,7 +53,7 @@
*/
private RepositoryContentStatisticsDAO repoContentStatisticsDAO;
- public List query( SimpleConstraint constraint )
+ public List<RepositoryContentStatistics> query( SimpleConstraint constraint )
{
return null;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java Tue Mar 17 16:53:49 2009
@@ -44,7 +44,7 @@
{
private ArchivaConfiguration configuration;
- public List query( SimpleConstraint constraint )
+ public List<RepositoryContentStatistics> query( SimpleConstraint constraint )
{
Assert.assertEquals( RepositoryContentStatistics.class, constraint.getResultClass() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ProjectModelDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ProjectModelDAOStub.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ProjectModelDAOStub.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ProjectModelDAOStub.java Tue Mar 17 16:53:49 2009
@@ -60,7 +60,7 @@
return projectModel;
}
- public List queryProjectModels( Constraint constraint )
+ public List<ArchivaProjectModel> queryProjectModels( Constraint constraint )
throws ObjectNotFoundException, ArchivaDatabaseException
{
// TODO Auto-generated method stub
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryContentStatisticsDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryContentStatisticsDAOStub.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryContentStatisticsDAOStub.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryContentStatisticsDAOStub.java Tue Mar 17 16:53:49 2009
@@ -46,7 +46,7 @@
Assert.assertEquals( "repo-ident", stats.getRepositoryId() );
}
- public List queryRepositoryContentStatistics( Constraint constraint )
+ public List<RepositoryContentStatistics> queryRepositoryContentStatistics( Constraint constraint )
throws ObjectNotFoundException, ArchivaDatabaseException
{
Assert.assertTrue( constraint instanceof RepositoryContentStatisticsByRepositoryConstraint );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java Tue Mar 17 16:53:49 2009
@@ -20,6 +20,7 @@
*/
import java.util.Collections;
+import java.util.List;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
@@ -177,7 +178,7 @@
assertNotNull( action.getGroupToRepositoryMap() );
assertEquals( 1, action.getGroupToRepositoryMap().size() );
- java.util.List repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
+ List<String> repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
assertEquals( 1, repos.size() );
assertEquals( REPO2_ID, repos.get( 0 ) );
}
@@ -207,7 +208,7 @@
assertNotNull( action.getGroupToRepositoryMap() );
assertEquals( 1, action.getGroupToRepositoryMap().size() );
- java.util.List repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
+ List<String> repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
assertEquals( 1, repos.size() );
assertEquals( REPO2_ID, repos.get( 0 ) );
@@ -256,7 +257,7 @@
assertNotNull( action.getGroupToRepositoryMap() );
assertEquals( 1, action.getGroupToRepositoryMap().size() );
- java.util.List repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
+ List<String> repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
assertEquals( 1, repos.size() );
assertEquals( REPO2_ID, repos.get( 0 ) );
@@ -307,7 +308,7 @@
assertNotNull( action.getGroupToRepositoryMap() );
assertEquals( 1, action.getGroupToRepositoryMap().size() );
- java.util.List repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
+ List<String> repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
assertEquals( 1, repos.size() );
assertEquals( REPO2_ID, repos.get( 0 ) );
@@ -343,7 +344,7 @@
assertNotNull( action.getGroupToRepositoryMap() );
assertEquals( 1, action.getGroupToRepositoryMap().size() );
- java.util.List repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
+ List<String> repos = action.getGroupToRepositoryMap().get( repoGroup.getId() );
assertEquals( 1, repos.size() );
assertEquals( REPO2_ID, repos.get( 0 ) );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/ArtifactDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/ArtifactDAOStub.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/ArtifactDAOStub.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/ArtifactDAOStub.java Tue Mar 17 16:53:49 2009
@@ -61,7 +61,7 @@
return null;
}
- public List queryArtifacts( Constraint constraint )
+ public List<ArchivaArtifact> queryArtifacts( Constraint constraint )
throws ObjectNotFoundException, ArchivaDatabaseException
{
List<ArchivaArtifact> artifacts = new ArrayList<ArchivaArtifact>();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java?rev=755318&r1=755317&r2=755318&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java Tue Mar 17 16:53:49 2009
@@ -19,8 +19,6 @@
* under the License.
*/
-import java.io.IOException;
-
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.codec.Encoder;
@@ -113,7 +111,8 @@
try
{
- WebResponse response = client.getResponse( "http://localhost/feeds?invalid_param=xxx" );
+ client.getResponse( "http://localhost/feeds?invalid_param=xxx" );
+ fail( "Expected exception" );
}
catch ( HttpException he )
{
@@ -139,7 +138,8 @@
try
{
- WebResponse response = client.getResponse( request );
+ client.getResponse( request );
+ fail( "Expected exception" );
}
catch ( HttpException he )
{
@@ -165,7 +165,8 @@
try
{
- WebResponse response = client.getResponse( request );
+ client.getResponse( request );
+ fail( "Expected exception" );
}
catch ( HttpException he )
{