Author: olamy
Date: Tue Sep 6 07:23:39 2011
New Revision: 1165524
URL: http://svn.apache.org/viewvc?rev=1165524&view=rev
Log:
get RID of plexus.component annotation
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
Tue Sep 6 07:23:39 2011
@@ -42,7 +42,6 @@ import java.util.Set;
* Browse the repository.
*
* @todo implement repository selectors (all or specific repository)
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="browseAction" instantiation-strategy="per-lookup"
*/
@Controller( "browseAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
Tue Sep 6 07:23:39 2011
@@ -69,8 +69,6 @@ import java.util.TimeZone;
/**
* Delete an artifact. Metadata will be updated if one exists, otherwise it
would be created.
- * <p/>
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="deleteArtifactAction" instantiation-strategy="per-lookup"
*/
@Controller( "deleteArtifactAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
Tue Sep 6 07:23:39 2011
@@ -49,8 +49,6 @@ import java.util.Map;
/**
* Search all indexed fields by the given criteria.
- * <p/>
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="searchAction" instantiation-strategy="per-lookup"
*/
@Controller( "searchAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
Tue Sep 6 07:23:39 2011
@@ -24,8 +24,6 @@ import org.springframework.stereotype.Co
/**
* Stores the organisation information for displaying on the page.
- * <p/>
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="organisationInfo" instantiation-strategy="per-lookup"
*/
@Controller( "organisationInfo" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
Tue Sep 6 07:23:39 2011
@@ -28,8 +28,6 @@ import org.springframework.stereotype.Co
* AddProxyConnectorAction
*
* @version $Id$
- * <p/>
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="addProxyConnectorAction" instantiation-strategy="per-lookup"
*/
@Controller( "addProxyConnectorAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java
Tue Sep 6 07:23:39 2011
@@ -27,8 +27,7 @@ import org.springframework.stereotype.Co
* DeleteProxyConnectorAction
*
* @version $Id$
- *
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="deleteProxyConnectorAction" instantiation-strategy="per-lookup"
+ *
*/
@Controller( "deleteProxyConnectorAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java
Tue Sep 6 07:23:39 2011
@@ -26,7 +26,6 @@ import org.springframework.stereotype.Co
/**
* DisableProxyConnectorAction
*
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="disableProxyConnectorAction" instantiation-strategy="per-lookup"
*/
@Controller( "disableProxyConnectorAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java
Tue Sep 6 07:23:39 2011
@@ -27,8 +27,7 @@ import org.springframework.stereotype.Co
* EditProxyConnectorAction
*
* @version $Id$
- *
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="editProxyConnectorAction" instantiation-strategy="per-lookup"
+ *
*/
@Controller( "editProxyConnectorAction" )
@Scope( "prototype")
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java
Tue Sep 6 07:23:39 2011
@@ -25,8 +25,6 @@ import org.springframework.stereotype.Co
/**
* EnableProxyConnectorAction
- * <p/>
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="enableProxyConnectorAction" instantiation-strategy="per-lookup"
*/
@Controller( "enableProxyConnectorAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
Tue Sep 6 07:23:39 2011
@@ -35,8 +35,7 @@ import java.util.Map;
* ProxyConnectorsAction
*
* @version $Id$
- *
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="proxyConnectorsAction" instantiation-strategy="per-lookup"
+ *
*/
@Controller( "proxyConnectorsAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java
Tue Sep 6 07:23:39 2011
@@ -30,8 +30,6 @@ import java.util.List;
* SortProxyConnectorsAction -
*
* @version $Id$
- * <p/>
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="sortProxyConnectorsAction" instantiation-strategy="per-lookup"
*/
@Controller( "sortProxyConnectorsAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
Tue Sep 6 07:23:39 2011
@@ -41,7 +41,6 @@ import javax.inject.Named;
* Add a LegacyArtifactPath to archiva configuration
*
* @since 1.1
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="addLegacyArtifactPathAction" instantiation-strategy="per-lookup"
*/
@Controller( "addLegacyArtifactPathAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
Tue Sep 6 07:23:39 2011
@@ -30,7 +30,6 @@ import org.springframework.stereotype.Co
/**
* DeleteRepositoryGroupAction
*
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="deleteRepositoryGroupAction" instantiation-strategy="per-lookup"
*/
@Controller( "deleteRepositoryGroupAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
Tue Sep 6 07:23:39 2011
@@ -39,7 +39,6 @@ import java.util.regex.Pattern;
/**
* RepositoryGroupsAction
*
- * @version plexus.component role="com.opensymphony.xwork2.Action"
role-hint="repositoryGroupsAction" instantiation-strategy="per-lookup"
*/
@Controller( "repositoryGroupsAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java
Tue Sep 6 07:23:39 2011
@@ -30,7 +30,6 @@ import java.util.List;
/**
* SortRepositoriesAction
*
- * @version plexus.component role="com.opensymphony.xwork2.Action"
role-hint="sortRepositoriesAction" instantiation-strategy="per-lookup"
*/
@Controller( "sortRepositoriesAction" )
@Scope( "prototype" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java?rev=1165524&r1=1165523&r2=1165524&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
Tue Sep 6 07:23:39 2011
@@ -57,7 +57,7 @@ import java.util.Map;
import java.util.TreeMap;
/**
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="generateReport" instantiation-strategy="per-lookup"
+ *
*/
@Controller( "generateReport" )
@Scope( "prototype" )
