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/12/03 04:37:01 UTC
svn commit: r886669 - in
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action:
admin/repositories/ reports/
Author: brett
Date: Thu Dec 3 03:36:57 2009
New Revision: 886669
URL: http://svn.apache.org/viewvc?rev=886669&view=rev
Log:
[MRM-1293] some clean up in preparation for changes to repository statistics
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java?rev=886669&r1=886668&r2=886669&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java Thu Dec 3 03:36:57 2009
@@ -139,7 +139,8 @@
removeRepositoryRoles( cleanupRepository );
cleanupDatabase( cleanupRepository.getId() );
cleanupScanStats( cleanupRepository.getId() );
-
+ // TODO: delete all content for a repository from the content API?
+
List<ProxyConnectorConfiguration> proxyConnectors = getProxyConnectors();
for ( ProxyConnectorConfiguration proxyConnector : proxyConnectors )
{
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java?rev=886669&r1=886668&r2=886669&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java Thu Dec 3 03:36:57 2009
@@ -19,9 +19,12 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
import com.opensymphony.xwork2.Preparable;
import com.opensymphony.xwork2.Validateable;
-
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -35,15 +38,10 @@
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.scheduler.CronExpressionValidator;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
/**
- * AddManagedRepositoryAction
+ * AddManagedRepositoryAction
*
* @version $Id$
- *
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editManagedRepositoryAction" instantiation-strategy="per-lookup"
*/
public class EditManagedRepositoryAction
@@ -56,7 +54,7 @@
private ManagedRepositoryConfiguration repository;
private String repoid;
-
+
private final String action = "editRepository";
/**
@@ -90,10 +88,10 @@
public String confirmUpdate()
{
- // location was changed
+ // location was changed
return save( true );
}
-
+
public String commit()
{
ManagedRepositoryConfiguration existingConfig =
@@ -102,17 +100,17 @@
boolean resetStats = false;
// check if the location was changed
- if( !StringUtils.equalsIgnoreCase( existingConfig.getLocation().trim(), repository.getLocation().trim() ) )
+ if ( !StringUtils.equalsIgnoreCase( existingConfig.getLocation().trim(), repository.getLocation().trim() ) )
{
resetStats = true;
File dir = new File( repository.getLocation() );
- if( dir.exists() )
+ if ( dir.exists() )
{
return CONFIRM;
}
}
-
+
return save( resetStats );
}
@@ -120,7 +118,7 @@
{
// Ensure that the fields are valid.
Configuration configuration = archivaConfiguration.getConfiguration();
-
+
// We are in edit mode, remove the old repository configuration.
removeRepository( repository.getId(), configuration );
@@ -132,7 +130,10 @@
triggerAuditEvent( repository.getId(), null, AuditEvent.MODIFY_MANAGED_REPO );
addRepositoryRoles( repository );
result = saveConfiguration( configuration );
- resetStatistics( resetStats );
+ if ( resetStats )
+ {
+ resetStatistics();
+ }
}
catch ( IOException e )
{
@@ -157,7 +158,7 @@
return result;
}
-
+
@Override
public void validate()
{
@@ -169,14 +170,9 @@
}
}
- private void resetStatistics( boolean reset )
+ private void resetStatistics()
throws ObjectNotFoundException, ArchivaDatabaseException
{
- if ( !reset )
- {
- return;
- }
-
RepositoryContentStatisticsDAO repoContentStatsDao = archivaDAO.getRepositoryContentStatisticsDAO();
List<RepositoryContentStatistics> contentStats = repoContentStatsDao.queryRepositoryContentStatistics(
@@ -189,7 +185,7 @@
repoContentStatsDao.deleteRepositoryContentStatistics( stats );
}
}
- }
+ }
public String getRepoid()
{
@@ -210,7 +206,7 @@
{
this.repository = repository;
}
-
+
public String getAction()
{
return action;
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java?rev=886669&r1=886668&r2=886669&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java Thu Dec 3 03:36:57 2009
@@ -19,8 +19,21 @@
* under the License.
*/
-import com.opensymphony.xwork2.Preparable;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import javax.servlet.http.HttpServletRequest;
+import com.opensymphony.xwork2.Preparable;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -44,29 +57,14 @@
import org.apache.maven.archiva.reporting.RepositoryStatistics;
import org.apache.maven.archiva.reporting.RepositoryStatisticsReportGenerator;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.codehaus.plexus.redback.rbac.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.http.HttpServletRequest;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.apache.struts2.interceptor.ServletRequestAware;
+import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="generateReport" instantiation-strategy="per-lookup"
@@ -76,19 +74,17 @@
implements SecureAction, ServletRequestAware, Preparable
{
private Logger log = LoggerFactory.getLogger( GenerateReportAction.class );
-
+
/**
* @plexus.requirement role-hint="jdo"
*/
protected ArchivaDAO dao;
-
+
/**
* @plexus.requirement
*/
private ArchivaConfiguration archivaConfiguration;
- protected Constraint constraint;
-
protected HttpServletRequest request;
protected List<RepositoryProblemReport> reports = new ArrayList<RepositoryProblemReport>();
@@ -357,8 +353,8 @@
addFieldError( "startDate", "Start Date must be earlier than the End Date" );
return INPUT;
}
-
- List<RepositoryContentStatistics> contentStats = repoContentStatsDao.queryRepositoryContentStatistics(
+
+ List<RepositoryContentStatistics> contentStats = repoContentStatsDao.queryRepositoryContentStatistics(
new RepositoryContentStatisticsByRepositoryConstraint( selectedRepo, startDateInDF, endDateInDF ) );
if( contentStats == null || contentStats.isEmpty() )