You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/11/04 09:57:00 UTC
svn commit: r1197434 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test:
java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
resources/repository-servlet-simple.xml
resources/spring-context-servlet-security-test.xml
Author: olamy
Date: Fri Nov 4 08:56:59 2011
New Revision: 1197434
URL: http://svn.apache.org/viewvc?rev=1197434&view=rev
Log:
fix component in charge of cleaning maven index @Inject comes from a lot of packages: just use the good one :-)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java?rev=1197434&r1=1197433&r2=1197434&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java Fri Nov 4 08:56:59 2011
@@ -18,7 +18,6 @@ package org.apache.archiva.webdav.util;
* under the License.
*/
-import com.opensymphony.xwork2.inject.Inject;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
@@ -31,6 +30,7 @@ import org.springframework.web.context.s
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import javax.inject.Inject;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -44,7 +44,25 @@ public class MavenIndexerCleaner
Logger log = LoggerFactory.getLogger( getClass() );
- PlexusSisuBridge plexusSisuBridge;
+ private PlexusSisuBridge plexusSisuBridge;
+
+ @Inject
+ private ApplicationContext applicationContext;
+
+ @PostConstruct
+ public void startup() throws Exception
+ {
+ plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class );
+ cleanupIndex( );
+ }
+
+ @PreDestroy
+ public void shutdown()
+ throws Exception
+ {
+ cleanupIndex( );
+ }
+
public void contextInitialized( ServletContextEvent servletContextEvent )
{
@@ -88,22 +106,5 @@ public class MavenIndexerCleaner
}
}
- @Inject
- private ApplicationContext applicationContext;
-
- @PostConstruct
- public void startup() throws Exception
- {
- plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class );
- cleanupIndex( );
- }
-
- @PreDestroy
- public void shutdown()
- throws Exception
- {
- cleanupIndex( );
- }
-
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml?rev=1197434&r1=1197433&r2=1197434&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml Fri Nov 4 08:56:59 2011
@@ -27,6 +27,10 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="false">
+
+ <context:annotation-config/>
+ <context:component-scan base-package="org.apache.archiva.webdav.util,org.apache.archiva.common.plexusbridge"/>
+
<bean name="archivaConfiguration#default" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
<property name="registry" ref="registry#default"/>
</bean>
@@ -52,7 +56,5 @@
<bean name="componentContainer" class="org.codehaus.redback.components.springutils.ComponentContainer"/>
- <context:annotation-config/>
- <context:component-scan base-package="org.apache.archiva.webdav.util"/>
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml?rev=1197434&r1=1197433&r2=1197434&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml Fri Nov 4 08:56:59 2011
@@ -30,7 +30,8 @@
<context:property-placeholder system-properties-mode="OVERRIDE"/>
<context:annotation-config/>
- <context:component-scan base-package="org.apache.archiva.webdav,org.apache.archiva.metadata.repository"/>
+ <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">
<property name="properties">
@@ -46,7 +47,7 @@
<bean name="servletAuthenticator" class="org.apache.archiva.webdav.MockServletAuthenticator"/>
- <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>