use the role based defaults to set the instantiation strategy for all actions

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@421312 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/maven-repository-webapp/pom.xml b/maven-repository-webapp/pom.xml
index d588a485d2ebf951856397a0c6a9ac12533c3702..39f89081f1e4956cb7e301ff798ba8149870cf57 100644 (file)
--- a/maven-repository-webapp/pom.xml
+++ b/maven-repository-webapp/pom.xml
@@ -169,6 +169,12 @@
         <configuration>
           <fileName>plexus.xml</fileName>
           <containerDescriptor>true</containerDescriptor>
+          <roleDefaults>
+            <roleDefault>
+              <role>com.opensymphony.xwork.Action</role>
+              <instantiation-strategy>per-lookup</instantiation-strategy>
+            </roleDefault>
+          </roleDefaults>
         </configuration>
         <executions>
           <execution>

diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/QuickSearchAction.java b/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/QuickSearchAction.java
index 4c0e8ba43d90c36bce4a6433f63a689e7f40e4ed..35f5de74fa251527eacc0ff26ddd0e07b9ae6044 100644 (file)
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/QuickSearchAction.java
+++ b/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/QuickSearchAction.java
@@ -37,7 +37,7 @@ import java.util.Map;
 /**
  * Searches for searchString in all indexed fields.
  *
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="quickSearchAction" instantiation-strategy="per-lookup"
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="quickSearchAction"
  */
 public class QuickSearchAction
     extends ActionSupport

diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java b/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java
index 82288d76174334aecb85ec09e8a9a67e7fffa7a0..6ccb922a3ff631084549c121f278ee5a70d2a685 100644 (file)
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java
+++ b/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java
@@ -32,7 +32,7 @@ import java.io.IOException;
 /**
  * Configures the application.
  *
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="configureAction" instantiation-strategy="per-lookup"
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="configureAction"
  */
 public class ConfigureAction
     extends ActionSupport