You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/06/19 21:14:38 UTC
svn commit: r548828 - in /maven/archiva/trunk:
archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/
archiva...
Author: joakime
Date: Tue Jun 19 12:14:37 2007
New Revision: 548828
URL: http://svn.apache.org/viewvc?view=rev&rev=548828
Log:
Turning down the noise in the log.
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java?view=diff&rev=548828&r1=548827&r2=548828
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java Tue Jun 19 12:14:37 2007
@@ -71,8 +71,8 @@
if ( !"http://maven.apache.org/POM/4.0.0".equals( xml.getDefaultNamespaceURI() ) )
{
+ // No namespace defined
// TODO: Output to monitor the problem with the Namespace.
- System.out.println( "No namespace defined: " + pomFile );
}
xml.removeNamespaces();
@@ -220,16 +220,11 @@
if ( dependencyList.contains( dependency ) )
{
// TODO: throw into monitor as issue.
- System.err.println( "Duplicate non-unique dependency detected [" + StringUtils.join( parts, ":" )
- + "]: " + toDependencyKey( dependency ) );
}
dependencyList.add( dependency );
- System.out.println( "Added (list.size:" + dependencyList.size() + ") dependency: "
- + toDependencyKey( dependency ) );
}
- System.out.println( "## Returning dependency list: size=" + dependencyList.size() );
return dependencyList;
}
@@ -559,11 +554,4 @@
return defaultValue;
}
}
-
- private String toDependencyKey( Dependency dep )
- {
- return "[" + dep.getGroupId() + ":" + dep.getArtifactId() + ":" + dep.getVersion() + ":" + dep.getClassifier()
- + ":" + dep.getType() + "]";
- }
-
}
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java?view=diff&rev=548828&r1=548827&r2=548828
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java Tue Jun 19 12:14:37 2007
@@ -19,15 +19,12 @@
* under the License.
*/
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
+import com.opensymphony.xwork.Preparable;
import org.apache.commons.collections.CollectionUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.DatabaseScanningConfiguration;
-import org.apache.maven.archiva.configuration.InvalidConfigurationException;
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;
@@ -35,10 +32,10 @@
import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
-import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-import com.opensymphony.xwork.Preparable;
+import java.util.Collections;
+import java.util.List;
/**
* DatabaseAction
@@ -94,9 +91,6 @@
AddAdminDatabaseConsumerClosure addAdminDbConsumer;
- getLogger().info( "Total Available Unprocessed Consumers: " + databaseConsumers.getAvailableUnprocessedConsumers().size() );
- getLogger().info( "Total Available Cleanup Consumers: " + databaseConsumers.getAvailableCleanupConsumers().size() );
-
addAdminDbConsumer = new AddAdminDatabaseConsumerClosure( dbscanning.getUnprocessedConsumers() );
CollectionUtils.forAllDo( databaseConsumers.getAvailableUnprocessedConsumers(), addAdminDbConsumer );
this.unprocessedConsumers = addAdminDbConsumer.getList();
@@ -110,8 +104,6 @@
public String updateUnprocessedConsumers()
{
- getLogger().info( "updateUnprocesedConsumers()" );
-
archivaConfiguration.getConfiguration().getDatabaseScanning().setUnprocessedConsumers( enabledUnprocessedConsumers );
return saveConfiguration();
@@ -119,8 +111,6 @@
public String updateCleanupConsumers()
{
- getLogger().info( "updateCleanupConsumers()" );
-
archivaConfiguration.getConfiguration().getDatabaseScanning().setCleanupConsumers( enabledCleanupConsumers );
return saveConfiguration();
@@ -128,8 +118,6 @@
public String updateSchedule()
{
- getLogger().info( "updateSchedule()" );
-
archivaConfiguration.getConfiguration().getDatabaseScanning().setCronExpression( cron );
return saveConfiguration();
@@ -137,8 +125,6 @@
private String saveConfiguration()
{
- getLogger().info( ".saveConfiguration()" );
-
try
{
archivaConfiguration.save( archivaConfiguration.getConfiguration() );
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java?view=diff&rev=548828&r1=548827&r2=548828
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java Tue Jun 19 12:14:37 2007
@@ -101,7 +101,7 @@
configuration = (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName() );
configuration.addChangeListener( this );
-
+
updateRepositoryMap();
}
@@ -140,7 +140,10 @@
public RepositoryConfiguration getRepository( DavServerRequest request )
{
- return (RepositoryConfiguration) repositoryMap.get( request.getPrefix() );
+ synchronized ( this.repositoryMap )
+ {
+ return (RepositoryConfiguration) repositoryMap.get( request.getPrefix() );
+ }
}
public String getRepositoryName( DavServerRequest request )
@@ -159,9 +162,12 @@
RepositoryConfigurationToMapClosure repoMapClosure = new RepositoryConfigurationToMapClosure();
Closure localRepoMap = IfClosure.getInstance( LocalRepositoryPredicate.getInstance(), repoMapClosure );
CollectionUtils.forAllDo( configuration.getConfiguration().getRepositories(), localRepoMap );
-
- this.repositoryMap.clear();
- this.repositoryMap.putAll( repoMapClosure.getMap() );
+
+ synchronized ( this.repositoryMap )
+ {
+ this.repositoryMap.clear();
+ this.repositoryMap.putAll( repoMapClosure.getMap() );
+ }
}
public boolean isAuthenticated( DavServerRequest davRequest, HttpServletResponse response )
@@ -227,7 +233,8 @@
if ( authzResult.getException() != null )
{
log( "Authorization Denied [ip=" + request.getRemoteAddr() + ",isWriteRequest=" + isWriteRequest
- + ",permission=" + permission + ",repo=" + davRequest.getPrefix() + "] : " + authzResult.getException().getMessage() );
+ + ",permission=" + permission + ",repo=" + davRequest.getPrefix() + "] : "
+ + authzResult.getException().getMessage() );
}
// Issue HTTP Challenge.
@@ -253,18 +260,25 @@
{
if ( ConfigurationNames.isRepositories( propertyName ) )
{
- updateRepositoryMap();
+ // Attempt to reduce the number of times we refresh the repository map.
+ if ( propertyName.endsWith( ".id" ) || propertyName.endsWith( ".url" ) )
+ {
+ synchronized ( this.repositoryMap )
+ {
+ updateRepositoryMap();
- getDavManager().removeAllServers();
+ getDavManager().removeAllServers();
- try
- {
- initServers( getServletConfig() );
- }
- catch ( DavServerException e )
- {
- log( "Error restarting WebDAV server after configuration change - service disabled: " + e.getMessage(),
- e );
+ try
+ {
+ initServers( getServletConfig() );
+ }
+ catch ( DavServerException e )
+ {
+ log( "Error restarting WebDAV server after configuration change - service disabled: "
+ + e.getMessage(), e );
+ }
+ }
}
}
}