Author: olamy
Date: Thu Nov 3 23:45:37 2011
New Revision: 1197355
URL: http://svn.apache.org/viewvc?rev=1197355&view=rev
Log:
ensure we cleanup Maven IndexingContext on shutdown
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MavenIndexerCleaner.java
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1197355&r1=1197354&r2=1197355&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Thu Nov 3 23:45:37 2011
@@ -29,7 +29,7 @@
<name>Archiva Web :: REST support :: Services</name>
<properties>
-<archiva.baseRestUrl />
+ <archiva.baseRestUrl />
<tomcatVersion>7.0.21</tomcatVersion>
<rest.admin.pwd />
<test.useTomcat>false</test.useTomcat>
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MavenIndexerCleaner.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MavenIndexerCleaner.java?rev=1197355&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MavenIndexerCleaner.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MavenIndexerCleaner.java
Thu Nov 3 23:45:37 2011
@@ -0,0 +1,54 @@
+package org.apache.archiva.rest.services.utils;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.maven.index.NexusIndexer;
+import org.apache.maven.index.context.IndexingContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
+/**
+ * @author Olivier Lamy
+ */
+@Service
+public class MavenIndexerCleaner
+{
+ Logger log = LoggerFactory.getLogger( getClass() );
+
+ @Inject
+ private PlexusSisuBridge plexusSisuBridge;
+
+ @PreDestroy
+ public void shutdown()
+ throws Exception
+ {
+
+ log.info( "cleanup IndexingContext" );
+ NexusIndexer nexusIndexer = plexusSisuBridge.lookup(
NexusIndexer.class );
+ for ( IndexingContext context :
nexusIndexer.getIndexingContexts().values() )
+ {
+ nexusIndexer.removeIndexingContext( context, true );
+ }
+ }
+}
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MavenIndexerCleaner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MavenIndexerCleaner.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml?rev=1197355&r1=1197354&r2=1197355&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
Thu Nov 3 23:45:37 2011
@@ -20,8 +20,18 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs";
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";
default-lazy-init="true">
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://cxf.apache.org/jaxrs
+ http://cxf.apache.org/schemas/jaxrs.xsd"; default-lazy-init="true">
+
+ <context:annotation-config/>
+ <context:component-scan
+ base-package="org.apache.archiva.rest.services.utils"/>
<bean name="scheduler"
class="org.codehaus.redback.components.scheduler.DefaultScheduler">
<property name="properties">
@@ -36,7 +46,7 @@
</bean>
<!-- wire up more basic configuration so it doesn't overwrite any config
files -->
- <bean name="archivaConfiguration#default"
class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
+ <bean name="archivaConfiguration#default"
class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
<property name="registry" ref="registry#default"/>
</bean>
@@ -57,7 +67,8 @@
</property>
</bean>
- <bean name="taskQueueExecutor#repository-scanning"
class="org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor"
lazy-init="false">
+ <bean name="taskQueueExecutor#repository-scanning"
+
class="org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor"
lazy-init="false">
<property name="name" value="repository-scanning"/>
<property name="executor" ref="taskExecutor#repository-scanning"/>
<property name="queue" ref="taskQueue#repository-scanning"/>
