Author: oching
Date: Thu Oct 16 03:38:50 2008
New Revision: 705202
URL: http://svn.apache.org/viewvc?rev=705202&view=rev
Log:
- added the ArchivaTaskScheduler in AdministrationServiceImpl
- uncommented methods for executing db and repo scanners
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=705202&r1=705201&r2=705202&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Thu Oct 16 03:38:50 2008
@@ -40,13 +40,12 @@
<constructor-arg ref="repositoryContentFactory"/>
<constructor-arg ref="artifactDAO#jdo"/>
<constructor-arg
ref="databaseCleanupConsumer#not-present-remove-db-artifact"/>
- <constructor-arg
ref="databaseCleanupConsumer#not-present-remove-db-project"/>
+ <constructor-arg
ref="databaseCleanupConsumer#not-present-remove-db-project"/>
+ <constructor-arg ref="archivaTaskScheduler"/>
</bean>
<bean name="xmlrpcServicesList" lazy-init="true" scope="singleton"
class="java.util.ArrayList">
- <constructor-arg>
- <ref bean="administrationService"/>
- </constructor-arg>
+ <constructor-arg ref="administrationService"/>
</bean>
<bean name="xmlRpcAuthenticator"
class="org.apache.archiva.web.xmlrpc.security.XmlRpcAuthenticator">
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java?rev=705202&r1=705201&r2=705202&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
Thu Oct 16 03:38:50 2008
@@ -69,7 +69,16 @@
*/
public List<String> getAllRepositoryConsumers();
- // TODO should we already implement config of consumers per repository?
+ // TODO should we already implement config of consumers per repository?
+ /**
+ * Configures (enable or disable) repository consumer.
+ *
+ * @param repoId
+ * @param consumerId
+ * @param enable
+ * @return
+ * @throws Exception
+ */
public Boolean configureRepositoryConsumer( String repoId, String
consumerId, boolean enable ) throws Exception;
/**
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java?rev=705202&r1=705201&r2=705202&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
Thu Oct 16 03:38:50 2008
@@ -69,9 +69,7 @@
private RepositoryContentConsumers repoConsumersUtil;
private DatabaseConsumers dbConsumersUtil;
-
- //private ArchivaTaskScheduler taskScheduler;
-
+
private RepositoryContentFactory repoFactory;
private ArtifactDAO artifactDAO;
@@ -80,10 +78,12 @@
private DatabaseCleanupConsumer cleanupProjects;
+ private ArchivaTaskScheduler taskScheduler;
+
public AdministrationServiceImpl( ArchivaConfiguration archivaConfig,
RepositoryContentConsumers repoConsumersUtil,
DatabaseConsumers dbConsumersUtil,
RepositoryContentFactory repoFactory,
ArtifactDAO artifactDAO,
DatabaseCleanupConsumer cleanupArtifacts,
- DatabaseCleanupConsumer cleanupProjects )
+ DatabaseCleanupConsumer cleanupProjects,
ArchivaTaskScheduler taskScheduler )
{
this.archivaConfiguration = archivaConfig;
this.repoConsumersUtil = repoConsumersUtil;
@@ -92,6 +92,7 @@
this.artifactDAO = artifactDAO;
this.cleanupArtifacts = cleanupArtifacts;
this.cleanupProjects = cleanupProjects;
+ this.taskScheduler = taskScheduler;
}
/**
@@ -288,7 +289,7 @@
*/
public Boolean executeDatabaseScanner() throws Exception
{
- /*if ( taskScheduler.isProcessingDatabaseTask() )
+ if ( taskScheduler.isProcessingDatabaseTask() )
{
return false;
}
@@ -297,7 +298,7 @@
task.setName( DefaultArchivaTaskScheduler.DATABASE_JOB +
":user-requested-via-web-service" );
task.setQueuePolicy( ArchivaTask.QUEUE_POLICY_WAIT );
- taskScheduler.queueDatabaseTask( task ); */
+ taskScheduler.queueDatabaseTask( task );
return new Boolean( true );
}
@@ -307,7 +308,7 @@
*/
public Boolean executeRepositoryScanner( String repoId ) throws Exception
{
- /* Configuration config = archivaConfiguration.getConfiguration();
+ Configuration config = archivaConfiguration.getConfiguration();
if( config.findManagedRepositoryById( repoId ) == null )
{
throw new Exception( "Repository does not exist." );
@@ -326,7 +327,7 @@
task.setName( DefaultArchivaTaskScheduler.REPOSITORY_JOB + ":" +
repoId );
task.setQueuePolicy( ArchivaTask.QUEUE_POLICY_WAIT );
- taskScheduler.queueRepositoryTask( task ); */
+ taskScheduler.queueRepositoryTask( task );
return new Boolean( true );
}
@@ -396,8 +397,6 @@
managedRepos.add( repo );
}
- System.out.println( "\n++++++MANAGED REPOS --> " + managedRepos );
-
return managedRepos;
}
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java?rev=705202&r1=705201&r2=705202&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
Thu Oct 16 03:38:50 2008
@@ -172,7 +172,7 @@
cleanupConsumer = ( DatabaseCleanupConsumer ) cleanupControl.getMock();
service = new AdministrationServiceImpl( archivaConfig,
repoConsumersUtil, dbConsumersUtil,
- repositoryFactory, artifactDao, cleanupConsumer,
cleanupConsumer );
+ repositoryFactory, artifactDao, cleanupConsumer,
cleanupConsumer, taskScheduler );
}
/* Tests for database consumers */
