Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-21 01:15:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

use o.a.a package namespace for spring-quartz component

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325047 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-11 22:26:10 +00:00
parent f255d0216a
commit 870ce2c4d8
24 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
View File

@ -38,7 +38,7 @@
<constructor-arg ref="jcr-config"/>
</bean>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
View File

@ -26,7 +26,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd" default-lazy-init="true">
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
View File

@ -45,7 +45,7 @@
</property>
</bean>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml
View File

@ -33,7 +33,7 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.indexer.search.mock"/>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
View File

@ -33,7 +33,7 @@
<alias name="archivaConfiguration#mock" alias="archivaConfiguration#default"/>
<alias name="archivaConfiguration#mock" alias="archivaConfiguration"/>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
View File

@ -25,10 +25,10 @@
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.GenericValidator;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.redback.components.scheduler.CronExpressionValidator;
import org.springframework.stereotype.Service;
import javax.inject.Inject;

2
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
View File

@ -29,7 +29,7 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.admin.mock"/>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml
View File

@ -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.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

4
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
View File

@ -24,6 +24,7 @@
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
import org.apache.archiva.redback.components.scheduler.Scheduler;
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.common.ArchivaException;
import org.apache.archiva.configuration.ArchivaConfiguration;
@ -32,8 +33,7 @@
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.codehaus.plexus.taskqueue.TaskQueue;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.redback.components.scheduler.CronExpressionValidator;
import org.codehaus.redback.components.scheduler.Scheduler;
import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
import org.quartz.SchedulerException;
import org.quartz.impl.JobDetailImpl;
import org.quartz.impl.triggers.CronTriggerImpl;

2
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
View File

@ -19,9 +19,9 @@
* under the License.
*/
import org.apache.archiva.redback.components.scheduler.AbstractJob;
import org.codehaus.plexus.taskqueue.TaskQueue;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.redback.components.scheduler.AbstractJob;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;

2
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/spring-context.xml
View File

@ -44,7 +44,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.codehaus.redback.components.scheduler.DefaultScheduler
it override beans with same name but with type org.apache.archiva.redback.components.scheduler.DefaultScheduler
<task:scheduler id="scheduler" pool-size="10"/>
-->
</beans>

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
View File

@ -22,7 +22,7 @@
import org.apache.archiva.rest.api.services.CommonServices;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.codehaus.redback.components.scheduler.CronExpressionValidator;
import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import org.apache.archiva.redback.rest.api.services.UtilServices;
import org.slf4j.Logger;

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
View File

@ -33,7 +33,7 @@
<context:component-scan
base-package="org.apache.archiva.rest.services.utils"/>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
View File

@ -101,7 +101,7 @@
</property>
</bean>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
View File

@ -22,12 +22,12 @@
import org.apache.archiva.common.ArchivaException;
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.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor;
import org.codehaus.redback.components.scheduler.DefaultScheduler;
import org.quartz.SchedulerException;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
View File

@ -124,7 +124,7 @@
</bean>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/META-INF/spring-context-test.xml
View File

@ -33,7 +33,7 @@
<context:component-scan
base-package="org.apache.archiva.rest.services.utils"/>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
View File

@ -23,8 +23,8 @@
import com.opensymphony.xwork2.Validateable;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
import org.apache.commons.lang.StringUtils;
import org.codehaus.redback.components.scheduler.CronExpressionValidator;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;

2
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
View File

@ -24,7 +24,7 @@
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.commons.lang.StringUtils;
import org.codehaus.redback.components.scheduler.CronExpressionValidator;
import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;

4
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/CronExpressionValidator.java
View File

@ -34,8 +34,8 @@ public void validate( Object obj )
{
String cron = (String) getFieldValue( "cron", obj );
org.codehaus.redback.components.scheduler.CronExpressionValidator cronExpressionValidator =
new org.codehaus.redback.components.scheduler.CronExpressionValidator();
org.apache.archiva.redback.components.scheduler.CronExpressionValidator cronExpressionValidator =
new org.apache.archiva.redback.components.scheduler.CronExpressionValidator();
ValidatorContext ctxt = getValidatorContext();
if ( !cronExpressionValidator.validate( String.valueOf( cron ) ) )

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
View File

@ -145,7 +145,7 @@
</bean>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-web/archiva-webapp/src/test/resources/META-INF/spring-context.xml
View File

@ -23,7 +23,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
View File

@ -33,7 +33,7 @@
<context:component-scan
base-package="org.apache.archiva.webdav,org.apache.archiva.metadata.repository,org.apache.archiva.webdav.util,org.apache.archiva.common.plexusbridge"/>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>

2
archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
View File

@ -32,7 +32,7 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.webdav,org.apache.archiva.metadata.repository"/>
<bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>