]> source.dussan.org Git - archiva.git/commitdiff
[MRM-1082] restore per-lookup to action classes that was set by default with the...
authorBrett Porter <brett@apache.org>
Mon, 9 Mar 2009 13:17:46 +0000 (13:17 +0000)
committerBrett Porter <brett@apache.org>
Mon, 9 Mar 2009 13:17:46 +0000 (13:17 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@751672 13f79535-47bb-0310-9956-ffa450edef68

38 files changed:
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java [new file with mode: 0644]
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java [new file with mode: 0644]
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java [deleted file]
archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml [new file with mode: 0644]
archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/rss/RssFeedServletTest.xml

index 2ca3fbec3e6ea7f6ab8b249d5530cc5688ff723f..d2692cb083af9f59053ccab6f286e2a16673f238 100644 (file)
@@ -38,7 +38,7 @@ import org.apache.maven.archiva.security.*;
  * @todo cache browsing results.
  * @todo implement repository selectors (all or specific repository)
  * @todo implement security around browse (based on repository id at first)
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="browseAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="browseAction" instantiation-strategy="per-lookup"
  */
 public class BrowseAction
     extends PlexusActionSupport
index fa3101b89670d1c6f6081391df3b526e90f4101e..ff3b1dde1ea825b08e92d3f8950e95a7fb2a2ce4 100644 (file)
@@ -66,7 +66,7 @@ import com.opensymphony.xwork2.Validateable;
 /**
  * Delete an artifact. Metadata will be updated if one exists, otherwise it would be created.
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteArtifactAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteArtifactAction" instantiation-strategy="per-lookup"
  */
 public class DeleteArtifactAction
     extends PlexusActionSupport
index 84045e92de38f21ca0049dba0654dac8a2f3e370..6cbe7e4834a0d8333597438d116f4c116b701194 100644 (file)
@@ -57,7 +57,7 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
 /**
  * Search all indexed fields by the given criteria.
  *
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="searchAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="searchAction" instantiation-strategy="per-lookup"
  */
 public class SearchAction 
     extends PlexusActionSupport
index f2ed927e68ee533b2ea90e46ce86004362aad13b..aef774310425e3f33e16bfefb05d586f25affa46 100644 (file)
@@ -42,7 +42,7 @@ import com.opensymphony.xwork2.Validateable;
  * 
  * TODO change name to ShowVersionedAction to conform to terminology.
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="showArtifactAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="showArtifactAction" instantiation-strategy="per-lookup"
  */
 public class ShowArtifactAction
     extends PlexusActionSupport
index 5a0c3b5f93e9a5058b92a225497e197883b26819..27110c71e5224ff769a8fe2aab1c72797c14ee61 100644 (file)
@@ -73,7 +73,7 @@ import org.apache.commons.lang.StringUtils;
  * Upload an artifact using Jakarta file upload in webwork. If set by the user a pom will also be generated. Metadata
  * will also be updated if one exists, otherwise it would be created.
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="uploadAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="uploadAction" instantiation-strategy="per-lookup"
  */
 public class UploadAction
     extends PlexusActionSupport
index d11c9b6ef1bb0c228dbc3fe822b35adcae292ded..a3df57d2d84599acd6bfa8add019aeea2fd2cb18 100644 (file)
@@ -37,7 +37,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionException;
 /**
  * Configures the application.
  *
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="schedulerAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="schedulerAction" instantiation-strategy="per-lookup"
  */
 public class SchedulerAction
     extends PlexusActionSupport
index 3932953857f3e69cc6a4299c7858fd41984b32c8..a6b65f8d347b6dd74c09bc09b0c924a830200be8 100644 (file)
@@ -34,6 +34,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionException;
  * 
  * @plexus.component role="com.opensymphony.xwork2.Action"
  *                   role-hint="editOrganisationInfo"
+ *                   instantiation-strategy="per-lookup"
  */
 public class EditOrganisationInfoAction
     extends AbstractAppearanceAction
index 8f61134710b903b058b71cdedff4a22bc0144c15..4298c4d25235d04ba4229b9782b5cf197b0e655a 100644 (file)
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.web.action.admin.appearance;
 /**
  * Stores the organisation information for displaying on the page.
  *
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="organisationInfo"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="organisationInfo" instantiation-strategy="per-lookup"
  */
 public class OrganisationInfoAction
     extends AbstractAppearanceAction
index 146b2527b4e1267da5503a0124020ff702b2b022..24b903906fc73c239b6ffcaf15a34a96d92a64c1 100644 (file)
@@ -27,7 +27,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProxyConnectorAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProxyConnectorAction" instantiation-strategy="per-lookup"
  */
 public class AddProxyConnectorAction
     extends AbstractProxyConnectorFormAction
index 5bd104ce0686c3342a68c4043442e5cdc3d1ac6b..48947d07617335b0496a43705214143a76e2667b 100644 (file)
@@ -26,7 +26,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteProxyConnectorAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteProxyConnectorAction" instantiation-strategy="per-lookup"
  */
 public class DeleteProxyConnectorAction
     extends AbstractProxyConnectorAction
index 1d109ef631dc760f3e60e228a9febd6fb26eea70..f2fbfee2e250ae4b4a70b1acbb44cf6c360fd0ce 100644 (file)
@@ -24,7 +24,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 /**
  * DisableProxyConnectorAction 
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="disableProxyConnectorAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="disableProxyConnectorAction" instantiation-strategy="per-lookup"
  */
 public class DisableProxyConnectorAction extends AbstractProxyConnectorAction
 {
index bd74b5f61cbcdc8088cedb1256dcf26e54cf0208..6245a0fba5a4d48dc492a2e1262b09cdede0ad47 100644 (file)
@@ -27,7 +27,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editProxyConnectorAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editProxyConnectorAction" instantiation-strategy="per-lookup"
  */
 public class EditProxyConnectorAction
     extends AbstractProxyConnectorFormAction
index eb575b8fe58ef14db502a981be91d6c47289d7db..eb3002b6063e50b6ce9fef0e6488e61d9f4f990c 100644 (file)
@@ -24,7 +24,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 /**
  * EnableProxyConnectorAction 
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="enableProxyConnectorAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="enableProxyConnectorAction" instantiation-strategy="per-lookup"
  */
 public class EnableProxyConnectorAction extends AbstractProxyConnectorAction
 {
index 58a9ddfff733a855808d9a4459635727866da351..8745d949779227c7932d8eadc167baef2e8adc1b 100644 (file)
@@ -34,7 +34,7 @@ import java.util.Map;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="proxyConnectorsAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="proxyConnectorsAction" instantiation-strategy="per-lookup"
  */
 public class ProxyConnectorsAction
     extends AbstractProxyConnectorAction
index 6059ab213930711ba96ee34cea1719257ac1d528..315f958d98cf32ccc049d33949e15b83e0024812 100644 (file)
@@ -29,7 +29,7 @@ import java.util.List;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="sortProxyConnectorsAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="sortProxyConnectorsAction" instantiation-strategy="per-lookup"
  */
 public class SortProxyConnectorsAction
     extends AbstractProxyConnectorAction
index 2a7aae27993752e166411116e3d2e733a47e22cd..5d83d959a1ff7e4253df15798078d83494c78094 100644 (file)
@@ -42,7 +42,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionException;
  * DatabaseAction
  *
  * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="databaseAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="databaseAction" instantiation-strategy="per-lookup"
  */
 public class DatabaseAction
     extends PlexusActionSupport
index b734838811bf5e4985e5b9f27a07333b047fbc90..aa2005ea205ebe664bfbf141b2fd973f1cbb7b37 100644 (file)
@@ -34,7 +34,7 @@ import org.apache.maven.archiva.web.action.PlexusActionSupport;
  * Add a LegacyArtifactPath to archiva configuration
  *
  * @since 1.1
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addLegacyArtifactPathAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addLegacyArtifactPathAction" instantiation-strategy="per-lookup"
  */
 public class AddLegacyArtifactPathAction
     extends PlexusActionSupport
index 5963cbc184dabe431ea3929f66c619745c471e24..5829e61c0bc1b6a21b336d7069fa3de664e0e02e 100644 (file)
@@ -33,7 +33,7 @@ import org.codehaus.plexus.registry.RegistryException;
  *\r
  *\r
  * @since 1.1\r
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteLegacyArtifactPathAction"\r
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteLegacyArtifactPathAction" instantiation-strategy="per-lookup"\r
  */\r
 public class DeleteLegacyArtifactPathAction\r
     extends PlexusActionSupport\r
index 4b21755b01d9ca39326a4d731914e48903b02bea..d6964a20076ca6803a89fa5c7f5b2427e676cf6a 100644 (file)
@@ -42,7 +42,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionException;
  * Shows the LegacyArtifactPath Tab for the administrator.\r
  *\r
  * @since 1.1\r
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="legacyArtifactPathAction"\r
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="legacyArtifactPathAction" instantiation-strategy="per-lookup"\r
  */\r
 public class LegacyArtifactPathAction\r
     extends PlexusActionSupport\r
index 1adf7bc65a72f62587364895f1a2ec29bb99abff..ec408deab4e7e3739a6e23df9559074906dfe18d 100644 (file)
@@ -40,7 +40,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionException;
  * ConfigureNetworkProxyAction
  *
  * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="configureNetworkProxyAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="configureNetworkProxyAction" instantiation-strategy="per-lookup"
  */
 public class ConfigureNetworkProxyAction
     extends PlexusActionSupport
index 17e649915bb2722b5547fc464a24268905120e67..fb71165c10a163333a38a47ff9f6e0ff34db08f9 100644 (file)
@@ -36,7 +36,7 @@ import java.util.List;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="networkProxiesAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="networkProxiesAction" instantiation-strategy="per-lookup"
  */
 public class NetworkProxiesAction
     extends PlexusActionSupport
index a1e37046e2571e2aa285c0c7f7e8437a5799865d..4d3341521dfd8bac5d97b0046014d28c10c926a7 100644 (file)
@@ -34,7 +34,7 @@ import java.io.IOException;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addManagedRepositoryAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addManagedRepositoryAction" instantiation-strategy="per-lookup"
  */
 public class AddManagedRepositoryAction
     extends AbstractManagedRepositoriesAction
index 97b43f3325db2a3206f5516eaeb8eca34fb70837..d624220f627a2f54a34b8c69bab8859561759980 100644 (file)
@@ -33,7 +33,7 @@ import java.io.IOException;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addRemoteRepositoryAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addRemoteRepositoryAction" instantiation-strategy="per-lookup"
  */
 public class AddRemoteRepositoryAction
     extends AbstractRemoteRepositoriesAction
index 75004be1c5a96e4f89d2e2a4c65caf7e08bb986e..7efe7827b8770ac099306291bb2353e50c670c85 100644 (file)
@@ -47,7 +47,7 @@ import java.util.Map;
  * DeleteManagedRepositoryAction
  * 
  * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteManagedRepositoryAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteManagedRepositoryAction" instantiation-strategy="per-lookup"
  */
 public class DeleteManagedRepositoryAction
     extends AbstractManagedRepositoriesAction
index 2d13055dd6a25cc22f4a91cdef13f68dd2679bbb..13e6536cd9f1415d52635bde7630c6199cd0de6c 100644 (file)
@@ -33,7 +33,7 @@ import java.util.List;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteRemoteRepositoryAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteRemoteRepositoryAction" instantiation-strategy="per-lookup"
  */
 public class DeleteRemoteRepositoryAction
     extends AbstractRemoteRepositoriesAction
index 335c26a00933f67096ce40241ece6bca48f56b7f..5e99c9c810796f55dee0d32be114c264c69a5b12 100644 (file)
@@ -29,7 +29,7 @@ import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
  * DeleteRepositoryGroupAction
  * 
  * @version
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteRepositoryGroupAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteRepositoryGroupAction" instantiation-strategy="per-lookup"
  */
 public class DeleteRepositoryGroupAction 
     extends AbstractRepositoriesAdminAction
index ba63b47214239cbf5d63ac9a163479278688f46a..90bea2e73b7bb8b3d0f3a4f5e7b48d0d49518648 100644 (file)
@@ -36,7 +36,7 @@ import java.io.IOException;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editManagedRepositoryAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editManagedRepositoryAction" instantiation-strategy="per-lookup"
  */
 public class EditManagedRepositoryAction
     extends AbstractManagedRepositoriesAction
index b1ba1c186188a20fef94495ad9cb38c25304b42e..ce32241ef6e52040fa7474f534c4a345f67379b1 100644 (file)
@@ -33,7 +33,7 @@ import java.io.IOException;
  *
  * @version $Id$
  * 
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editRemoteRepositoryAction" 
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editRemoteRepositoryAction" instantiation-strategy="per-lookup" 
  */
 public class EditRemoteRepositoryAction
     extends AbstractRemoteRepositoriesAction
index a871ab1bb211a6a338bd569184f100cdd71f3870..ec349b9af407dff67849950ca705a6f57a9c12e7 100644 (file)
@@ -48,7 +48,7 @@ import java.util.Map;
  * Shows the Repositories Tab for the administrator.
  *
  * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="repositoriesAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="repositoriesAction" instantiation-strategy="per-lookup"
  */
 public class RepositoriesAction
     extends PlexusActionSupport
index fffc4c3943dea2aad28a8970bc5622ef6c154061..2e8ab406cedf1a89635e62e168e87dd86d3da173 100644 (file)
@@ -39,7 +39,7 @@ import org.apache.maven.archiva.web.util.ContextUtils;
  * RepositoryGroupsAction
  * 
  * @version
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="repositoryGroupsAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="repositoryGroupsAction" instantiation-strategy="per-lookup"
  */
 public class RepositoryGroupsAction
     extends AbstractRepositoriesAdminAction
index 8cff121d6473d781e9c0a71858b97c991c1d3f48..0794a8ca5c03f67b74dd7ae302e86f95f9f85959 100644 (file)
@@ -29,7 +29,7 @@ import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
  * SortRepositoriesAction
  * 
  * @version
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="sortRepositoriesAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="sortRepositoriesAction" instantiation-strategy="per-lookup"
  */
 public class SortRepositoriesAction 
     extends AbstractRepositoriesAdminAction
index a713cd855490a67b6e0e74795e477d691b775b33..becb6d3c6da644ee2077b5fea0c4e591586c0bd6 100644 (file)
@@ -49,7 +49,7 @@ import java.util.Map;
  * RepositoryScanningAction
  *
  * @version $Id$
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="repositoryScanningAction"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="repositoryScanningAction" instantiation-strategy="per-lookup"
  */
 public class RepositoryScanningAction
     extends PlexusActionSupport
index 4d4a1f6061d3179f3133261a60b9ec2153a43ca2..6bbf38784d6fdddd8b0c2c40ef8580d5a01efb23 100644 (file)
@@ -69,7 +69,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionBundle;
 import org.codehaus.redback.integration.interceptor.SecureActionException;
 
 /**
- * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="generateReport"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="generateReport" instantiation-strategy="per-lookup"
  */
 public class GenerateReportAction
     extends PlexusActionSupport
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
new file mode 100644 (file)
index 0000000..43f4365
--- /dev/null
@@ -0,0 +1,70 @@
+package org.apache.maven.archiva.security;
+
+/*
+ * 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 java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.archiva.security.AccessDeniedException;
+import org.apache.maven.archiva.security.ArchivaSecurityException;
+import org.apache.maven.archiva.security.PrincipalNotFoundException;
+import org.apache.maven.archiva.security.UserRepositories;
+import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
+import org.codehaus.plexus.redback.rbac.RbacManagerException;
+
+/**
+ * UserRepositories stub used for testing. 
+ *
+ * @version $Id$
+ */
+public class UserRepositoriesStub
+    implements UserRepositories
+{
+
+    public void createMissingRepositoryRoles( String repoId )
+        throws ArchivaSecurityException
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    public List<String> getObservableRepositoryIds( String principal )
+        throws PrincipalNotFoundException, AccessDeniedException, ArchivaSecurityException
+    {
+        List<String> repoIds = new ArrayList<String>();
+        repoIds.add( "test-repo" );
+
+        return repoIds;
+    }
+
+    public boolean isAuthorizedToUploadArtifacts( String principal, String repoId )
+        throws PrincipalNotFoundException, ArchivaSecurityException
+    {
+        // TODO Auto-generated method stub
+        return false;
+    }
+    
+    public boolean isAuthorizedToDeleteArtifacts( String principal, String repoId )
+        throws RbacManagerException, RbacObjectNotFoundException
+    {
+        return false;
+    }
+
+}
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
new file mode 100644 (file)
index 0000000..ba4344e
--- /dev/null
@@ -0,0 +1,33 @@
+package org.apache.maven.archiva.web.action;
+
+/*
+ * 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.codehaus.plexus.spring.PlexusInSpringTestCase;
+
+import com.opensymphony.xwork2.Action;
+
+public class ShowArtifactActionTest
+    extends PlexusInSpringTestCase
+{
+    public void testInstantiation()
+    {
+        assertFalse( lookup( Action.class, "showArtifactAction" ) == lookup( Action.class, "showArtifactAction" ) );
+    }
+}
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java
deleted file mode 100644 (file)
index 6682236..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.apache.maven.archiva.web.rss;
-
-/*
- * 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 java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.archiva.security.AccessDeniedException;
-import org.apache.maven.archiva.security.ArchivaSecurityException;
-import org.apache.maven.archiva.security.PrincipalNotFoundException;
-import org.apache.maven.archiva.security.UserRepositories;
-import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;
-import org.codehaus.plexus.redback.rbac.RbacManagerException;
-
-/**
- * UserRepositories stub used for testing. 
- *
- * @version $Id$
- */
-public class UserRepositoriesStub
-    implements UserRepositories
-{
-
-    public void createMissingRepositoryRoles( String repoId )
-        throws ArchivaSecurityException
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    public List<String> getObservableRepositoryIds( String principal )
-        throws PrincipalNotFoundException, AccessDeniedException, ArchivaSecurityException
-    {
-        List<String> repoIds = new ArrayList<String>();
-        repoIds.add( "test-repo" );
-
-        return repoIds;
-    }
-
-    public boolean isAuthorizedToUploadArtifacts( String principal, String repoId )
-        throws PrincipalNotFoundException, ArchivaSecurityException
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-    
-    public boolean isAuthorizedToDeleteArtifacts( String principal, String repoId )
-        throws RbacManagerException, RbacObjectNotFoundException
-    {
-        return false;
-    }
-
-}
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml
new file mode 100644 (file)
index 0000000..81c5b43
--- /dev/null
@@ -0,0 +1,44 @@
+<!--
+  ~ 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.
+  -->
+
+<plexus>
+  <components>
+    <component>
+      <role>org.codehaus.plexus.logging.LoggerManager</role>
+      <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
+      <lifecycle-handler>basic</lifecycle-handler>
+    </component>
+    <component>
+      <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+      <role-hint>jdo</role-hint>
+      <implementation>org.apache.maven.archiva.web.action.admin.repositories.ArchivaDAOStub</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
+          <field-name>configuration</field-name>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.archiva.security.UserRepositories</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.archiva.security.UserRepositoriesStub</implementation>
+    </component>
+  </components>
+</plexus>
index 138ffec6205d5db23da617a8e0d6a9e408f83f29..33988de514db6c6046224e6d3802ce11b37e746f 100644 (file)
@@ -44,7 +44,7 @@
        <component>
          <role>org.apache.maven.archiva.security.UserRepositories</role>
          <role-hint>default</role-hint>
-         <implementation>org.apache.maven.archiva.web.rss.UserRepositoriesStub</implementation>
+         <implementation>org.apache.maven.archiva.security.UserRepositoriesStub</implementation>
        </component>
   </components>
 </plexus>