Author: olamy
Date: Mon Oct 29 20:58:54 2012
New Revision: 1403504
URL: http://svn.apache.org/viewvc?rev=1403504&view=rev
Log:
[MRM-1704] Refactor to remove maven specific part from various
repository/metadata apis
Added:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
(contents, props changed)
- copied, changed from r1403503,
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
Removed:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
archiva/trunk/archiva-modules/archiva-scheduler/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml Mon Oct 29
20:58:54 2012
@@ -39,10 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-scheduler-repository</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-layer</artifactId>
<exclusions>
<exclusion>
@@ -59,10 +55,10 @@
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-scanner</artifactId>
</dependency>
- <!--dependency>
+ <dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-scheduler-repository</artifactId>
- </dependency-->
+ <artifactId>archiva-scheduler-repository-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy-common</artifactId>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
Mon Oct 29 20:58:54 2012
@@ -37,9 +37,9 @@
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-security-common</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-scheduler-repository</artifactId>
+ <artifactId>archiva-scheduler-repository-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -47,6 +47,10 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>repository-statistics</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-plexus-bridge</artifactId>
</dependency>
<dependency>
@@ -58,6 +62,10 @@
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.redback.components</groupId>
+ <artifactId>spring-taskqueue</artifactId>
+ </dependency>
+ <dependency>
<groupId>net.sf.beanlib</groupId>
<artifactId>beanlib</artifactId>
<exclusions>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml
Mon Oct 29 20:58:54 2012
@@ -30,10 +30,4 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.repository"/>
- <bean name="pathParser#legacy"
class="org.apache.archiva.repository.content.LegacyPathParser">
- <constructor-arg>
- <ref bean="archivaConfiguration#default"/>
- </constructor-arg>
- </bean>
-
</beans>
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
Mon Oct 29 20:58:54 2012
@@ -33,6 +33,11 @@
<artifactId>archiva-scheduler-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-scheduler-repository-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
Copied:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
(from r1403503,
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java?p2=archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java&p1=archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java&r1=1403503&r2=1403504&rev=1403504&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
Mon Oct 29 20:58:54 2012
@@ -55,10 +55,10 @@ import java.util.Set;
* Default implementation of a scheduling component for archiva.
*/
@Service ("archivaTaskScheduler#repository")
-public class RepositoryArchivaTaskScheduler
- implements ArchivaTaskScheduler<RepositoryTask>, ConfigurationListener
+public class DefaultRepositoryArchivaTaskScheduler
+ implements RepositoryArchivaTaskScheduler, ConfigurationListener
{
- private Logger log = LoggerFactory.getLogger(
RepositoryArchivaTaskScheduler.class );
+ private Logger log = LoggerFactory.getLogger( getClass() );
/**
*
@@ -200,8 +200,7 @@ public class RepositoryArchivaTaskSchedu
}
}
- @SuppressWarnings ("unchecked")
- private boolean isProcessingRepositoryTask( RepositoryTask task )
+ public boolean isProcessingRepositoryTask( RepositoryTask task )
{
synchronized ( repositoryScanningQueue )
{
Propchange:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 29 20:58:54 2012
@@ -0,0 +1,7 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:1214301
+/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:1066068-1091313,1098897,1102210,1103608
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:699795-705848
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:825850-909464,960322
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
Mon Oct 29 20:58:54 2012
@@ -44,9 +44,9 @@ public class RepositoryTaskJob
JobDataMap dataMap = context.getJobDetail().getJobDataMap();
setJobDataMap( dataMap );
- TaskQueue taskQueue = (TaskQueue) dataMap.get(
RepositoryArchivaTaskScheduler.TASK_QUEUE );
+ TaskQueue taskQueue = (TaskQueue) dataMap.get(
DefaultRepositoryArchivaTaskScheduler.TASK_QUEUE );
- String repositoryId = (String) dataMap.get(
RepositoryArchivaTaskScheduler.TASK_REPOSITORY );
+ String repositoryId = (String) dataMap.get(
DefaultRepositoryArchivaTaskScheduler.TASK_REPOSITORY );
RepositoryTask task = new RepositoryTask();
task.setRepositoryId( repositoryId );
Modified: archiva/trunk/archiva-modules/archiva-scheduler/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/pom.xml?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/pom.xml Mon Oct 29 20:58:54
2012
@@ -31,6 +31,7 @@
<modules>
<module>archiva-scheduler-api</module>
<module>archiva-scheduler-indexing</module>
+ <module>archiva-scheduler-repository-api</module>
<module>archiva-scheduler-repository</module>
</modules>
</project>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
Mon Oct 29 20:58:54 2012
@@ -38,7 +38,7 @@ import org.apache.archiva.repository.Rep
import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.services.utils.ArtifactBuilder;
-import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
+import
org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.RepositoryTask;
import org.apache.archiva.security.AccessDeniedException;
import org.apache.archiva.security.ArchivaSecurityException;
@@ -93,7 +93,7 @@ public abstract class AbstractRestServic
@Inject
@Named ( value = "archivaTaskScheduler#repository" )
- protected RepositoryArchivaTaskScheduler repositoryTaskScheduler;
+ protected DefaultRepositoryArchivaTaskScheduler repositoryTaskScheduler;
@Context
protected HttpServletRequest httpServletRequest;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
Mon Oct 29 20:58:54 2012
@@ -23,7 +23,7 @@ import org.apache.archiva.common.Archiva
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.redback.components.scheduler.DefaultScheduler;
-import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
+import
org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.apache.archiva.redback.components.taskqueue.Task;
@@ -52,7 +52,7 @@ public class ArchivaStartup
private ThreadedTaskQueueExecutor tqeIndexing;
- private RepositoryArchivaTaskScheduler repositoryTaskScheduler;
+ private DefaultRepositoryArchivaTaskScheduler repositoryTaskScheduler;
private PlexusSisuBridge plexusSisuBridge;
@@ -66,7 +66,7 @@ public class ArchivaStartup
SecuritySynchronization securitySync = wac.getBean(
SecuritySynchronization.class );
repositoryTaskScheduler =
- wac.getBean( "archivaTaskScheduler#repository",
RepositoryArchivaTaskScheduler.class );
+ wac.getBean( "archivaTaskScheduler#repository",
DefaultRepositoryArchivaTaskScheduler.class );
Properties archivaRuntimeProperties = wac.getBean(
"archivaRuntimeProperties", Properties.class );
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml
Mon Oct 29 20:58:54 2012
@@ -31,4 +31,11 @@
<context:component-scan
base-package="org.apache.archiva.dependency.tree.maven2,org.apache.archiva.metadata.repository.storage.maven2,
org.apache.archiva.repository.content.maven2,org.apache.archiva.repository.content.legacy"/>
+
+ <bean name="pathParser#legacy"
class="org.apache.archiva.repository.content.LegacyPathParser">
+ <constructor-arg>
+ <ref bean="archivaConfiguration#default"/>
+ </constructor-arg>
+ </bean>
+
</beans>
\ No newline at end of file
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1403504&r1=1403503&r2=1403504&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Oct 29 20:58:54 2012
@@ -372,6 +372,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-scheduler-repository-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
<version>${project.version}</version>
</dependency>
