Author: olamy
Date: Tue Sep 6 08:11:21 2011
New Revision: 1165558
URL: http://svn.apache.org/viewvc?rev=1165558&view=rev
Log:
get RID of plexus.requirement annotation
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
Tue Sep 6 08:11:21 2011
@@ -75,7 +75,7 @@ public class LegacyToDefaultConverter
{
/**
* {@link List}<{@link Digester}
- * plexus.requirement role="org.codehaus.plexus.digest.Digester"
+ *
*/
private List<? extends Digester> digesters;
@@ -86,17 +86,17 @@ public class LegacyToDefaultConverter
private DigesterUtils digesterUtils;
/**
- * plexus.requirement
+ *
*/
private ModelConverter translator;
/**
- * plexus.requirement
+ *
*/
private ArtifactFactory artifactFactory;
/**
- * plexus.requirement
+ *
*/
private ArtifactHandlerManager artifactHandlerManager;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
Tue Sep 6 08:11:21 2011
@@ -94,8 +94,7 @@ public class DefaultArchivaConfiguration
/**
* Plexus registry to read the configuration from.
- * <p/>
- * plexus.requirement role-hint="commons-configuration"
+ *
*/
@Inject
@Named( value = "commons-configuration" )
@@ -111,7 +110,6 @@ public class DefaultArchivaConfiguration
/**
* see #initialize
- * plexus.requirement
role="org.apache.maven.archiva.policies.PreDownloadPolicy"
*
* @todo these don't strictly belong in here
*/
@@ -119,7 +117,6 @@ public class DefaultArchivaConfiguration
/**
* see #initialize
- * plexus.requirement
role="org.apache.maven.archiva.policies.PostDownloadPolicy"
*
* @todo these don't strictly belong in here
*/
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
Tue Sep 6 08:11:21 2011
@@ -60,7 +60,7 @@ public class FileTypes
public static final String IGNORED = "ignored";
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "archivaConfiguration#default" )
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
Tue Sep 6 08:11:21 2011
@@ -62,13 +62,13 @@ public class AutoRemoveConsumer
private String description = "Automatically Remove File from Filesystem.";
/**
- * plexus.requirement
+ *
*/
@Inject
private ArchivaConfiguration configuration;
/**
- * plexus.requirement
+ *
*/
@Inject
private FileTypes filetypes;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
Tue Sep 6 08:11:21 2011
@@ -77,25 +77,25 @@ public class MetadataUpdaterConsumer
private String description = "Update / Create maven-metadata.xml files";
/**
- * plexus.requirement
+ *
*/
@Inject
private RepositoryContentFactory repositoryFactory;
/**
- * plexus.requirement
+ *
*/
@Inject
private MetadataTools metadataTools;
/**
- * plexus.requirement
+ *
*/
@Inject
private ArchivaConfiguration configuration;
/**
- * plexus.requirement
+ *
*/
@Inject
private FileTypes filetypes;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
Tue Sep 6 08:11:21 2011
@@ -72,12 +72,12 @@ public class ValidateChecksumConsumer
private String description = "Validate checksums against file.";
/**
- * plexus.requirement
+ *
*/
private ChecksumFile checksum;
/**
- * plexus.requirement role="org.codehaus.plexus.digest.Digester"
+ *
*/
private List<Digester> allDigesters;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
Tue Sep 6 08:11:21 2011
@@ -69,27 +69,27 @@ public class RepositoryPurgeConsumer
private String description = "Purge repository of old snapshots";
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration configuration;
/**
- * plexus.requirement
+ *
*/
@Inject
@Named(value = "repositoryContentFactory#default")
private RepositoryContentFactory repositoryContentFactory;
/**
- * plexus.requirement
+ *
*/
@Inject
private MetadataTools metadataTools;
/**
- * plexus.requirement
+ *
*/
@Inject
@Named(value = "fileTypes")
@@ -103,19 +103,15 @@ public class RepositoryPurgeConsumer
private boolean deleteReleasedSnapshots;
- //@Inject
- //private ApplicationContext applicationContext;
-
/**
- * plexus.requirement
role="org.apache.archiva.repository.events.RepositoryListener"
+ *
*/
@Inject
private List<RepositoryListener> listeners = Collections.emptyList();
/**
* TODO: this could be multiple implementations and needs to be configured.
- * <p/>
- * plexus.requirement
+ *
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
Tue Sep 6 08:11:21 2011
@@ -73,13 +73,11 @@ public class ArchivaMetadataCreationCons
private String description = "Create basic metadata for Archiva to be able
to reference the artifact";
/**
- * plexus.requirement
*/
@Inject
private ArchivaConfiguration configuration;
/**
- * plexus.requirement
*/
@Inject
private FileTypes filetypes;
@@ -91,7 +89,6 @@ public class ArchivaMetadataCreationCons
/**
* FIXME: can be of other types
*
- * @plexus.requirement
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
@@ -100,7 +97,6 @@ public class ArchivaMetadataCreationCons
* FIXME: this needs to be configurable based on storage type - and could
also be instantiated per repo. Change to a
* factory.
*
- * plexus.requirement role-hint="maven2"
*/
@Inject
@Named(value = "repositoryStorage#maven2")
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
Tue Sep 6 08:11:21 2011
@@ -51,25 +51,24 @@ public class DefaultLegacyRepositoryConv
implements LegacyRepositoryConverter
{
/**
- * plexus.requirement
+ *
*/
private ArtifactRepositoryFactory artifactRepositoryFactory;
/**
- * plexus.requirement role-hint="default"
+ *
*/
private ArtifactRepositoryLayout defaultLayout;
/**
- * plexus.requirement
role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="artifact-legacy-to-default-converter"
+ *
*/
@Inject
@Named( value =
"knownRepositoryContentConsumer#artifact-legacy-to-default-converter" )
private LegacyConverterArtifactConsumer legacyConverterConsumer;
/**
- * plexus.requirement
+ *
*/
@Inject
private RepositoryScanner repoScanner;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
Tue Sep 6 08:11:21 2011
@@ -59,13 +59,13 @@ public class LegacyConverterArtifactCons
private Logger log = LoggerFactory.getLogger(
LegacyConverterArtifactConsumer.class );
/**
- * plexus.requirement role-hint="legacy-to-default"
+ *
*/
@Inject
private ArtifactConverter artifactConverter;
/**
- * plexus.requirement
+ *
*/
private ArtifactFactory artifactFactory;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
Tue Sep 6 08:11:21 2011
@@ -56,7 +56,7 @@ public class CachedFailuresPolicy
public static final String YES = "yes";
/**
- * plexus.requirement
+ *
*/
@Inject
private UrlFailureCache urlFailureCache;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
Tue Sep 6 08:11:21 2011
@@ -95,49 +95,46 @@ public class DefaultRepositoryProxyConne
private Logger log = LoggerFactory.getLogger(
DefaultRepositoryProxyConnectors.class );
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration archivaConfiguration;
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "repositoryContentFactory#default" )
private RepositoryContentFactory repositoryFactory;
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "metadataTools#default" )
private MetadataTools metadataTools;
- //@Inject
- //private ApplicationContext applicationContext;
-
/**
- * plexus.requirement
role="org.apache.maven.archiva.policies.PreDownloadPolicy"
+ *
*/
@Inject
private Map<String, PreDownloadPolicy> preDownloadPolicies;
/**
- * plexus.requirement
role="org.apache.maven.archiva.policies.PostDownloadPolicy"
+ *
*/
@Inject
private Map<String, PostDownloadPolicy> postDownloadPolicies;
/**
- * plexus.requirement
role="org.apache.maven.archiva.policies.DownloadErrorPolicy"
+ *
*/
@Inject
private Map<String, DownloadErrorPolicy> downloadErrorPolicies;
/**
- * plexus.requirement role-hint="default"
+ *
*/
@Inject
private UrlFailureCache urlFailureCache;
@@ -147,13 +144,13 @@ public class DefaultRepositoryProxyConne
private Map<String, ProxyInfo> networkProxyMap = new HashMap<String,
ProxyInfo>();
/**
- * plexus.requirement
+ *
*/
@Inject
private WagonFactory wagonFactory;
/**
- * plexus.requirement
role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
+ *
*/
@Inject
@Named( value = "archivaTaskScheduler#repository" )
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
Tue Sep 6 08:11:21 2011
@@ -43,7 +43,7 @@ public class RepositoryContentFactory
implements RegistryListener
{
/**
- * plexus.requirement
+ *
*/
@Inject
private ArchivaConfiguration archivaConfiguration;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
Tue Sep 6 08:11:21 2011
@@ -60,19 +60,15 @@ public abstract class AbstractDefaultRep
private PathParser defaultPathParser = new DefaultPathParser();
/**
- * plexus.requirement
role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider"
+ *
*/
@Inject
protected List<? extends ArtifactMappingProvider> artifactMappingProviders;
- //@Inject
- //protected ApplicationContext applicationContext;
-
@PostConstruct
protected void initialize()
{
- //artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
- // applicationContext.getBeansOfType( ArtifactMappingProvider.class
).values() );
+ // no op
}
public ArtifactReference toArtifactReference( String path )
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
Tue Sep 6 08:11:21 2011
@@ -51,7 +51,7 @@ public abstract class AbstractLegacyRepo
}
/**
- * plexus.requirement role-hint="legacy"
+ *
*/
@Inject
@Named( value = "pathParser#legacy" )
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
Tue Sep 6 08:11:21 2011
@@ -53,7 +53,7 @@ public class ManagedLegacyRepositoryCont
implements ManagedRepositoryContent
{
/**
- * plexus.requirement
+ *
*/
@Inject
private FileTypes filetypes;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
Tue Sep 6 08:11:21 2011
@@ -88,14 +88,14 @@ public class MetadataTools
private static final char GROUP_SEPARATOR = '.';
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration configuration;
/**
- * plexus.requirement
+ *
*/
@Inject
@Named(value = "fileTypes")
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
Tue Sep 6 08:11:21 2011
@@ -45,13 +45,13 @@ public class DefaultRepositoryScanner
implements RepositoryScanner
{
/**
- * plexus.requirement
+ *
*/
@Inject
private FileTypes filetypes;
/**
- * plexus.requirement
+ *
*/
@Inject
private RepositoryContentConsumers consumerUtil;
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
Tue Sep 6 08:11:21 2011
@@ -66,7 +66,7 @@ public class ArchivaIndexingTaskExecutor
private Logger log = LoggerFactory.getLogger(
ArchivaIndexingTaskExecutor.class );
/**
- * plexus.requirement
+ *
*/
private IndexPacker indexPacker;
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
Tue Sep 6 08:11:21 2011
@@ -41,7 +41,7 @@ public class IndexingArchivaTaskSchedule
private Logger log = LoggerFactory.getLogger(
IndexingArchivaTaskScheduler.class );
/**
- * plexus.requirement role-hint="indexing"
+ *
*/
@Inject
@Named(value = "taskQueue#indexing")
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
Tue Sep 6 08:11:21 2011
@@ -59,7 +59,7 @@ public class ArchivaRepositoryScanningTa
private Logger log = LoggerFactory.getLogger(
ArchivaRepositoryScanningTaskExecutor.class );
/**
- * plexus.requirement
+ *
*/
@Inject
@Named(value="archivaConfiguration#default")
@@ -68,13 +68,13 @@ public class ArchivaRepositoryScanningTa
/**
* The repository scanner component.
*
- * plexus.requirement
+ *
*/
@Inject
private RepositoryScanner repoScanner;
/**
- * plexus.requirement
+ *
*/
@Inject
private RepositoryContentConsumers consumers;
@@ -82,7 +82,7 @@ public class ArchivaRepositoryScanningTa
private Task task;
/**
- * plexus.requirement
+ *
*/
@Inject
private RepositoryStatisticsManager repositoryStatisticsManager;
@@ -90,7 +90,6 @@ public class ArchivaRepositoryScanningTa
/**
* TODO: may be different implementations
*
- * plexus.requirement
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
Tue Sep 6 08:11:21 2011
@@ -64,7 +64,7 @@ public class RepositoryArchivaTaskSchedu
private Logger log = LoggerFactory.getLogger(
RepositoryArchivaTaskScheduler.class );
/**
- * plexus.requirement
+ *
*/
@Inject
private Scheduler scheduler;
@@ -73,20 +73,20 @@ public class RepositoryArchivaTaskSchedu
private CronExpressionValidator cronValidator;
/**
- * plexus.requirement role-hint="repository-scanning"
+ *
*/
@Inject
@Named( value = "taskQueue#repository-scanning" )
private TaskQueue repositoryScanningQueue;
/**
- * plexus.requirement
+ *
*/
@Inject
private ArchivaConfiguration archivaConfiguration;
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "repositoryStatisticsManager#default" )
@@ -94,8 +94,7 @@ public class RepositoryArchivaTaskSchedu
/**
* TODO: could have multiple implementations
- * <p/>
- * plexus.requirement
+ *
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
Tue Sep 6 08:11:21 2011
@@ -55,7 +55,7 @@ public class NewArtifactsRssFeedProcesso
private static final String desc = "These are the new artifacts found in
the repository ";
/**
- * plexus.requirement
+ *
*/
@Inject
private RssFeedGenerator generator;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
Tue Sep 6 08:11:21 2011
@@ -55,7 +55,7 @@ public class NewVersionsOfArtifactRssFee
private static final String desc = "These are the new versions of artifact
";
/**
- * plexus.requirement
+ *
*/
@Inject
private RssFeedGenerator generator;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
Tue Sep 6 08:11:21 2011
@@ -48,7 +48,7 @@ public class ArchivaServletAuthenticator
private Logger log = LoggerFactory.getLogger(
ArchivaServletAuthenticator.class );
/**
- * plexus.requirement
+ *
*/
@Inject
private SecuritySystem securitySystem;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
Tue Sep 6 08:11:21 2011
@@ -42,7 +42,7 @@ public class ArchivaStandardRolesCheck
private Logger log = LoggerFactory.getLogger(
ArchivaStandardRolesCheck.class );
/**
- * plexus.requirement role-hint="cached"
+ *
*/
@Inject @Named(value = "rBACManager#cached")
private RBACManager rbacManager;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
Tue Sep 6 08:11:21 2011
@@ -49,19 +49,19 @@ public class DefaultUserRepositories
implements UserRepositories
{
/**
- * plexus.requirement
+ *
*/
@Inject
private SecuritySystem securitySystem;
/**
- * plexus.requirement role-hint="default"
+ *
*/
@Inject
private RoleManager roleManager;
/**
- * plexus.requirement
+ *
*/
@Inject
private ArchivaConfiguration archivaConfiguration;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
Tue Sep 6 08:11:21 2011
@@ -108,54 +108,54 @@ public class ArchivaDavResourceFactory
private Logger log = LoggerFactory.getLogger(
ArchivaDavResourceFactory.class );
/**
- * plexus.requirement role="org.apache.archiva.audit.AuditListener"
+ *
*/
@Inject
private List<AuditListener> auditListeners = new
ArrayList<AuditListener>();
/**
- * plexus.requirement
+ *
*/
@Inject
private RepositoryContentFactory repositoryFactory;
/**
- * plexus.requirement
+ *
*/
private RepositoryRequest repositoryRequest;
/**
- * plexus.requirement role-hint="default"
+ *
*/
@Inject
@Named( value = "repositoryProxyConnectors#default" )
private RepositoryProxyConnectors connectors;
/**
- * plexus.requirement
+ *
*/
@Inject
private MetadataTools metadataTools;
/**
- * plexus.requirement
+ *
*/
@Inject
private MimeTypes mimeTypes;
/**
- * plexus.requirement
+ *
*/
private ArchivaConfiguration archivaConfiguration;
/**
- * plexus.requirement
+ *
*/
@Inject
private ServletAuthenticator servletAuth;
/**
- * plexus.requirement role-hint="basic"
+ *
*/
@Inject
@Named( value = "httpAuthenticator#basic" )
@@ -167,22 +167,22 @@ public class ArchivaDavResourceFactory
private final LockManager lockManager = new SimpleLockManager();
/**
- * plexus.requirement
+ *
*/
private ChecksumFile checksum;
/**
- * plexus.requirement role-hint="sha1"
+ *
*/
private Digester digestSha1;
/**
- * plexus.requirement role-hint="md5";
+ *
*/
private Digester digestMd5;
/**
- * plexus.requirement
role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
+ *
*/
@Inject
@Named( value = "archivaTaskScheduler#repository" )
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
Tue Sep 6 08:11:21 2011
@@ -72,27 +72,22 @@ public class DefaultMetadataResolver
* ... could be a different type since we need methods to modify the
storage metadata, which would also allow more
* appropriate methods to pass in the already determined repository
configuration, for example, instead of the ID
*
- * plexus.requirement role-hint="maven2"
+ *
*/
@Inject
@Named( value = "repositoryStorage#maven2" )
private RepositoryStorage repositoryStorage;
/**
- * plexus.requirement
role="org.apache.archiva.repository.events.RepositoryListener"
+ *
*/
@Inject
private List<RepositoryListener> listeners;
-
- //@Inject
- //private ApplicationContext applicationContext;
-
@PostConstruct
private void initialize()
{
- //listeners =
- // new ArrayList<RepositoryListener>(
applicationContext.getBeansOfType( RepositoryListener.class ).values() );
+ // no op
}
public ProjectVersionMetadata resolveProjectVersion( RepositorySession
session, String repoId, String namespace,
Modified:
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
(original)
+++
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
Tue Sep 6 08:11:21 2011
@@ -38,7 +38,7 @@ public class MetadataAuditListener
private static final Logger log = LoggerFactory.getLogger(
MetadataAuditListener.class );
/**
- * plexus.requirement
+ *
*/
@Inject
private AuditManager auditManager;
@@ -47,7 +47,7 @@ public class MetadataAuditListener
* FIXME: this could be multiple implementations and needs to be
configured. It also starts a separate session to
* the originator of the audit event that we may rather want to pass
through.
*
- * plexus.requirement
+ *
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
Tue Sep 6 08:11:21 2011
@@ -103,37 +103,36 @@ public class DefaultDependencyTreeBuilde
private Logger log = LoggerFactory.getLogger( getClass() );
/**
- * plexus.requirement
+ *
*/
private ArtifactFactory factory;
/**
- * plexus.requirement
+ *
*/
private ArtifactCollector collector;
/**
- * plexus.requirement
+ *
*/
private ModelBuilder builder;
/**
* TODO: can have other types, and this might eventually come through from
the main request
- * <p/>
- * plexus.requirement
+ *
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
/**
- * plexus.requirement role-hint="maven2"
+ *
*/
@Inject
@Named( value = "repositoryPathTranslator#maven2" )
private RepositoryPathTranslator pathTranslator;
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "archivaConfiguration#default" )
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Tue Sep 6 08:11:21 2011
@@ -88,19 +88,19 @@ public class Maven2RepositoryStorage
implements RepositoryStorage
{
/**
- * plexus.requirement
+ *
*/
private ModelBuilder builder;
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration archivaConfiguration;
/**
- * plexus.requirement role-hint="maven2"
+ *
*/
@Inject
@Named( value = "repositoryPathTranslator#maven2" )
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
Tue Sep 6 08:11:21 2011
@@ -43,19 +43,19 @@ public class FileRepositorySessionFactor
implements RepositorySessionFactory
{
/**
- * plexus.requirement
role="org.apache.archiva.metadata.model.MetadataFacetFactory"
+ *
*/
private Map<String, MetadataFacetFactory> metadataFacetFactories;
/**
- * plexus.requirement
+ *
*/
@Inject
@Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration configuration;
/**
- * plexus.requirement
+ *
*/
@Inject
private MetadataResolver metadataResolver;
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
Tue Sep 6 08:11:21 2011
@@ -47,18 +47,18 @@ public class JcrRepositorySessionFactory
private ApplicationContext applicationContext;
/**
- * plexus.requirement
role="org.apache.archiva.metadata.model.MetadataFacetFactory"
+ *
*/
private Map<String, MetadataFacetFactory> metadataFacetFactories;
/**
- * plexus.requirement
+ *
*/
@Inject
private Repository repository;
/**
- * plexus.requirement
+ *
*/
@Inject
private MetadataResolver metadataResolver;
Modified:
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
(original)
+++
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
Tue Sep 6 08:11:21 2011
@@ -79,21 +79,20 @@ public class DuplicateArtifactsConsumer
private String description = "Check for Duplicate Artifacts via SHA1
Checksums";
/**
- * plexus.requirement
+ *
*/
@Inject
private ArchivaConfiguration configuration;
/**
- * plexus.requirement
+ *
*/
@Inject
private FileTypes filetypes;
/**
* FIXME: can be of other types
- * <p/>
- * plexus.requirement
+ *
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
@@ -106,8 +105,7 @@ public class DuplicateArtifactsConsumer
/**
* FIXME: needs to be selected based on the repository in question
- * <p/>
- * plexus.requirement role-hint="maven2"
+ *
*/
@Inject
@Named( value = "repositoryPathTranslator#maven2" )
Modified:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java?rev=1165558&r1=1165557&r2=1165558&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
(original)
+++
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Tue Sep 6 08:11:21 2011
@@ -60,12 +60,12 @@ public class Maven2RepositoryMerger
implements RepositoryMerger
{
/**
- * plexus.requirement role-hint="default"
+ *
*/
private ArchivaConfiguration configuration;
/**
- * plexus.requirement role-hint="maven2"
+ *
*/
private RepositoryPathTranslator pathTranslator;
