@@ -119,12 +119,6 @@ | |||
<artifactId>commons-collections</artifactId> | |||
<version>3.2.2</version> | |||
</dependency> | |||
<!-- | |||
<dependency> | |||
<groupId>org.apache.archiva.redback.components</groupId> | |||
<artifactId>spring-utils</artifactId> | |||
</dependency> | |||
--> | |||
<dependency> | |||
<groupId>commons-io</groupId> | |||
<artifactId>commons-io</artifactId> |
@@ -52,12 +52,6 @@ | |||
<requiredProperty key="guavaVersion"> | |||
<defaultValue>${guava.version}</defaultValue> | |||
</requiredProperty> | |||
<requiredProperty key="redbackRegistryVersion"> | |||
<defaultValue>${redback.registry.version}</defaultValue> | |||
</requiredProperty> | |||
<requiredProperty key="redbackCacheVersion"> | |||
<defaultValue>${redback.cache.version}</defaultValue> | |||
</requiredProperty> | |||
<requiredProperty key="springockitoVersion"> | |||
<defaultValue>${springockito.version}</defaultValue> | |||
</requiredProperty> |
@@ -42,7 +42,7 @@ | |||
<bean name="networkProxyAdmin#mock" class="org.apache.archiva.mock.MockNetworkProxyAdmin"/> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -34,8 +34,6 @@ | |||
<slf4j.version>${slf4jVersion}</slf4j.version> | |||
<log4j.version>${log4jVersion}</log4j.version> | |||
<spring.version>${springVersion}</spring.version> | |||
<redback.registry.version>${redbackRegistryVersion}</redback.registry.version> | |||
<redback.cache.version>${redbackCacheVersion}</redback.cache.version> | |||
<guava.version>${guavaVersion}</guava.version> | |||
<springockito.version>${springockitoVersion}</springockito.version> | |||
<mockito.version>${mockitoVersion}</mockito.version> |
@@ -23,7 +23,7 @@ | |||
xsi:schemaLocation="http://www.springframework.org/schema/beans | |||
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd" default-lazy-init="true"> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -45,7 +45,7 @@ | |||
</property> | |||
</bean> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -78,13 +78,6 @@ | |||
<artifactId>maven-artifact</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<!-- | |||
<dependency> | |||
<groupId>org.apache.archiva.redback.components</groupId> | |||
<artifactId>spring-utils</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
--> | |||
</dependencies> | |||
</project> |
@@ -165,8 +165,8 @@ | |||
<artifactId>commons-validator</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback.components</groupId> | |||
<artifactId>spring-quartz</artifactId> | |||
<groupId>org.apache.archiva.components</groupId> | |||
<artifactId>archiva-components-spring-quartz</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback</groupId> |
@@ -26,7 +26,7 @@ import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.components.registry.Registry; | |||
import org.apache.archiva.redback.components.scheduler.CronExpressionValidator; | |||
import org.apache.archiva.components.scheduler.CronExpressionValidator; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.apache.commons.validator.GenericValidator; | |||
import org.springframework.stereotype.Service; |
@@ -33,7 +33,7 @@ | |||
<context:annotation-config/> | |||
<context:component-scan base-package="org.apache.archiva.admin.mock,org.apache.archiva.repository.content.maven2"/> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -33,7 +33,7 @@ | |||
<bean name="wagon#file" scope="prototype" class="org.apache.maven.wagon.providers.file.FileWagon"/> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -35,7 +35,7 @@ | |||
<alias name="archivaConfiguration#mock" alias="archivaConfiguration"/> | |||
<alias name="archivaTaskScheduler#repositoryMock" alias="archivaTaskScheduler#repository" /> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -39,7 +39,7 @@ | |||
<alias name="archivaTaskScheduler#repositoryMock" alias="archivaTaskScheduler#repository" /> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -40,7 +40,7 @@ | |||
<alias name="archivaTaskScheduler#repositoryMock" alias="archivaTaskScheduler#repository" /> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -27,7 +27,7 @@ | |||
<context:component-scan base-package="org.apache.archiva.repository.content.maven2,org.apache.archiva.indexer.maven" /> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -41,22 +41,12 @@ | |||
<artifactId>commons-io</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback.components</groupId> | |||
<artifactId>spring-quartz</artifactId> | |||
<groupId>org.apache.archiva.components</groupId> | |||
<artifactId>archiva-components-spring-quartz</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.quartz-scheduler</groupId> | |||
<artifactId>quartz</artifactId> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>c3p0</groupId> | |||
<artifactId>c3p0</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.transaction</groupId> | |||
<artifactId>jta</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> |
@@ -46,22 +46,12 @@ | |||
<artifactId>commons-io</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback.components</groupId> | |||
<artifactId>spring-quartz</artifactId> | |||
<groupId>org.apache.archiva.components</groupId> | |||
<artifactId>archiva-components-spring-quartz</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.quartz-scheduler</groupId> | |||
<artifactId>quartz</artifactId> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>c3p0</groupId> | |||
<artifactId>c3p0</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.transaction</groupId> | |||
<artifactId>jta</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> |
@@ -29,8 +29,8 @@ import org.apache.archiva.metadata.repository.MetadataRepositoryException; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.metadata.repository.RepositorySessionFactory; | |||
import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager; | |||
import org.apache.archiva.redback.components.scheduler.CronExpressionValidator; | |||
import org.apache.archiva.redback.components.scheduler.Scheduler; | |||
import org.apache.archiva.components.scheduler.CronExpressionValidator; | |||
import org.apache.archiva.components.scheduler.Scheduler; | |||
import org.apache.archiva.components.taskqueue.TaskQueue; | |||
import org.apache.archiva.components.taskqueue.TaskQueueException; | |||
import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler; |
@@ -19,7 +19,7 @@ package org.apache.archiva.scheduler.repository; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.redback.components.scheduler.AbstractJob; | |||
import org.apache.archiva.components.scheduler.AbstractJob; | |||
import org.apache.archiva.components.taskqueue.TaskQueue; | |||
import org.apache.archiva.components.taskqueue.TaskQueueException; | |||
import org.apache.archiva.scheduler.repository.model.RepositoryTask; |
@@ -42,7 +42,7 @@ | |||
<!-- | |||
olamy we can use this if one day we move away from the old plexus stuff :-) | |||
btw comment this as it breaks unit tests in web as depending on classloader loading | |||
it override beans with same name but with type org.apache.archiva.redback.components.scheduler.DefaultScheduler | |||
it override beans with same name but with type org.apache.archiva.components.scheduler.DefaultScheduler | |||
<task:scheduler id="scheduler" pool-size="10"/> | |||
--> | |||
</beans> |
@@ -18,7 +18,7 @@ package org.apache.archiva.rest.services; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.redback.components.scheduler.CronExpressionValidator; | |||
import org.apache.archiva.components.scheduler.CronExpressionValidator; | |||
import org.apache.archiva.redback.rest.api.services.RedbackServiceException; | |||
import org.apache.archiva.redback.rest.api.services.UtilServices; | |||
import org.apache.archiva.rest.api.services.ArchivaRestServiceException; |
@@ -34,7 +34,7 @@ | |||
<context:component-scan | |||
base-package="org.apache.archiva.redback.keys,org.apache.archiva.rest.services.utils,org.apache.archiva.repository.content.maven2"/> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -105,7 +105,7 @@ | |||
<bean name="archivaTaskScheduler#repository" class="org.apache.archiva.security.mock.MockBeanServices"/> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -194,22 +194,12 @@ | |||
<artifactId>archiva-components-spring-taskqueue</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback.components</groupId> | |||
<artifactId>spring-quartz</artifactId> | |||
<groupId>org.apache.archiva.components</groupId> | |||
<artifactId>archiva-components-spring-quartz</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.quartz-scheduler</groupId> | |||
<artifactId>quartz</artifactId> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>c3p0</groupId> | |||
<artifactId>c3p0</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.transaction</groupId> | |||
<artifactId>jta</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework</groupId> |
@@ -20,7 +20,7 @@ package org.apache.archiva.web.startup; | |||
*/ | |||
import org.apache.archiva.common.ArchivaException; | |||
import org.apache.archiva.redback.components.scheduler.DefaultScheduler; | |||
import org.apache.archiva.components.scheduler.DefaultScheduler; | |||
import org.apache.archiva.components.taskqueue.Task; | |||
import org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor; | |||
import org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler; |
@@ -31,7 +31,7 @@ | |||
<context:component-scan | |||
base-package="org.apache.archiva.redback.keys,org.apache.archiva.rest.services.utils"/> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -33,7 +33,7 @@ | |||
<context:component-scan | |||
base-package="org.apache.archiva.repository.content.maven2,org.apache.archiva.redback.keys,org.apache.archiva.rest.services.utils"/> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -45,7 +45,7 @@ | |||
</constructor-arg> | |||
</bean> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -518,22 +518,12 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback.components</groupId> | |||
<artifactId>spring-quartz</artifactId> | |||
<groupId>org.apache.archiva.components</groupId> | |||
<artifactId>archiva-components-spring-quartz</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.quartz-scheduler</groupId> | |||
<artifactId>quartz</artifactId> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>c3p0</groupId> | |||
<artifactId>c3p0</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.transaction</groupId> | |||
<artifactId>jta</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> |
@@ -100,7 +100,7 @@ | |||
</bean> | |||
<!-- END SNIPPET: configuration-files-list --> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -33,7 +33,7 @@ | |||
<context:component-scan | |||
base-package="org.apache.archiva.redback.keys,org.apache.archiva.webdav,org.apache.archiva.metadata.repository,org.apache.archiva.webdav.util,org.apache.archiva.common.plexusbridge"/> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -32,7 +32,7 @@ | |||
<context:annotation-config/> | |||
<context:component-scan base-package="org.apache.archiva.redback.keys,org.apache.archiva.webdav,org.apache.archiva.metadata.repository" /> | |||
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> | |||
<bean name="scheduler" class="org.apache.archiva.components.scheduler.DefaultScheduler"> | |||
<property name="properties"> | |||
<props> | |||
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop> |
@@ -62,11 +62,6 @@ | |||
<wagon.version>3.3.3</wagon.version> | |||
<redback.version>3.0.0-SNAPSHOT</redback.version> | |||
<redback.cache.version>2.2</redback.cache.version> | |||
<redback.quartz.version>2.1</redback.quartz.version> | |||
<redback.registry.version>2.4</redback.registry.version> | |||
<redback.spring-utils.version>2.1</redback.spring-utils.version> | |||
<redback.taskqueue.version>2.1</redback.taskqueue.version> | |||
<!-- dependencies of maven modules --> | |||
<jsoup.version>1.12.1</jsoup.version> | |||
@@ -956,27 +951,28 @@ | |||
<version>${archiva.comp.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback.components</groupId> | |||
<artifactId>spring-quartz</artifactId> | |||
<version>${redback.quartz.version}</version> | |||
<groupId>org.apache.archiva.components</groupId> | |||
<artifactId>archiva-components-spring-quartz</artifactId> | |||
<version>${archiva.comp.version}</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>jsr250-api</artifactId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
</exclusion> | |||
</exclusions> </dependency> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.quartz-scheduler</groupId> | |||
<artifactId>quartz</artifactId> | |||
<version>2.2.1</version> | |||
<version>${quartz.version}</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>c3p0</groupId> | |||
<groupId>com.mchange</groupId> | |||
<artifactId>c3p0</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.transaction</groupId> | |||
<artifactId>jta</artifactId> | |||
<groupId>com.zaxxer</groupId> | |||
<artifactId>HikariCP-java7</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> |