Author: olamy
Date: Sat Sep 3 08:08:11 2011
New Revision: 1164821
URL: http://svn.apache.org/viewvc?rev=1164821&view=rev
Log:
get RID of org.apache.maven.archiva packages : interceptor package in webapp
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/interceptor/
- copied from r1164818,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/interceptor/ConfigurationInterceptor.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/interceptor/ConfigurationInterceptor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/interceptor/ConfigurationInterceptor.java?rev=1164821&r1=1164818&r2=1164821&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/interceptor/ConfigurationInterceptor.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/interceptor/ConfigurationInterceptor.java
Sat Sep 3 08:08:11 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.web.interceptor;
+package org.apache.archiva.web.interceptor;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,19 +30,14 @@ import javax.inject.Inject;
import javax.servlet.ServletContext;
/**
- * An interceptor that makes the configuration bits available, both to the
application and the webapp
- *
- * plexus.component role="com.opensymphony.xwork2.interceptor.Interceptor"
- * role-hint="configurationInterceptor"
+ * An interceptor that makes the configuration bits available, both to the
application and the webapp.
*/
@Service( "configurationInterceptor" )
@Scope( "prototype" )
public class ConfigurationInterceptor
implements Interceptor
{
- /**
- * plexus.requirement role-hint="default"
- */
+
@Inject
private ArchivaConfiguration configuration;