|
Mikolaj Izdebski |
39787e |
From 7c7d1f459729d60cc4fa96ad723fbfcefaffc9ef Mon Sep 17 00:00:00 2001
|
|
Mikolaj Izdebski |
39787e |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
Mikolaj Izdebski |
39787e |
Date: Wed, 21 May 2014 10:08:34 +0200
|
|
Mikolaj Izdebski |
39787e |
Subject: [PATCH] Revert "Bug 433953 - Remove support for Plexus IoC framework"
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
This reverts commit c5edb824e8ae5336cf10fc8cbe745a01ca760d6d.
|
|
Mikolaj Izdebski |
39787e |
---
|
|
Mikolaj Izdebski |
39787e |
aether-connector-basic/pom.xml | 15 ++++
|
|
Mikolaj Izdebski |
39787e |
.../basic/BasicRepositoryConnectorFactory.java | 16 ++++-
|
|
Mikolaj Izdebski |
39787e |
.../aether/connector/basic/PlexusSupportTest.java | 83 ++++++++++++++++++++++
|
|
Mikolaj Izdebski |
39787e |
aether-impl/pom.xml | 16 +++++
|
|
Mikolaj Izdebski |
39787e |
.../internal/impl/DefaultArtifactResolver.java | 22 +++++-
|
|
Mikolaj Izdebski |
39787e |
.../impl/DefaultChecksumPolicyProvider.java | 6 +-
|
|
Mikolaj Izdebski |
39787e |
.../internal/impl/DefaultDependencyCollector.java | 34 ++++++---
|
|
Mikolaj Izdebski |
39787e |
.../aether/internal/impl/DefaultDeployer.java | 28 +++++++-
|
|
Mikolaj Izdebski |
39787e |
.../aether/internal/impl/DefaultFileProcessor.java | 10 +--
|
|
Mikolaj Izdebski |
39787e |
.../aether/internal/impl/DefaultInstaller.java | 24 ++++++-
|
|
Mikolaj Izdebski |
39787e |
.../impl/DefaultLocalRepositoryProvider.java | 19 ++++-
|
|
Mikolaj Izdebski |
39787e |
.../internal/impl/DefaultMetadataResolver.java | 20 +++++-
|
|
Mikolaj Izdebski |
39787e |
.../internal/impl/DefaultOfflineController.java | 12 +++-
|
|
Mikolaj Izdebski |
39787e |
.../impl/DefaultRemoteRepositoryManager.java | 14 +++-
|
|
Mikolaj Izdebski |
39787e |
.../impl/DefaultRepositoryConnectorProvider.java | 19 ++++-
|
|
Mikolaj Izdebski |
39787e |
.../impl/DefaultRepositoryEventDispatcher.java | 22 +++++-
|
|
Mikolaj Izdebski |
39787e |
.../impl/DefaultRepositoryLayoutProvider.java | 19 ++++-
|
|
Mikolaj Izdebski |
39787e |
.../internal/impl/DefaultRepositorySystem.java | 23 +++++-
|
|
Mikolaj Izdebski |
39787e |
.../internal/impl/DefaultSyncContextFactory.java | 4 +-
|
|
Mikolaj Izdebski |
39787e |
.../internal/impl/DefaultTransporterProvider.java | 19 ++++-
|
|
Mikolaj Izdebski |
39787e |
.../internal/impl/DefaultUpdateCheckManager.java | 13 +++-
|
|
Mikolaj Izdebski |
39787e |
.../internal/impl/DefaultUpdatePolicyAnalyzer.java | 12 +++-
|
|
Mikolaj Izdebski |
39787e |
.../EnhancedLocalRepositoryManagerFactory.java | 10 +++
|
|
Mikolaj Izdebski |
39787e |
.../impl/Maven2RepositoryLayoutFactory.java | 4 +-
|
|
Mikolaj Izdebski |
39787e |
.../aether/internal/impl/PlexusLoggerFactory.java | 78 ++++++++++++++++++++
|
|
Mikolaj Izdebski |
39787e |
.../impl/SimpleLocalRepositoryManagerFactory.java | 10 +++
|
|
Mikolaj Izdebski |
39787e |
.../org/eclipse/aether/impl/PlexusSupportTest.java | 66 +++++++++++++++++
|
|
Mikolaj Izdebski |
39787e |
aether-transport-classpath/pom.xml | 15 ++++
|
|
Mikolaj Izdebski |
39787e |
.../classpath/ClasspathTransporterFactory.java | 12 +++-
|
|
Mikolaj Izdebski |
39787e |
.../transport/classpath/PlexusSupportTest.java | 42 +++++++++++
|
|
Mikolaj Izdebski |
39787e |
aether-transport-file/pom.xml | 15 ++++
|
|
Mikolaj Izdebski |
39787e |
.../transport/file/FileTransporterFactory.java | 12 +++-
|
|
Mikolaj Izdebski |
39787e |
.../aether/transport/file/PlexusSupportTest.java | 41 +++++++++++
|
|
Mikolaj Izdebski |
39787e |
aether-transport-http/pom.xml | 15 ++++
|
|
Mikolaj Izdebski |
39787e |
.../transport/http/HttpTransporterFactory.java | 12 +++-
|
|
Mikolaj Izdebski |
39787e |
.../aether/transport/http/PlexusSupportTest.java | 41 +++++++++++
|
|
Mikolaj Izdebski |
39787e |
.../transport/wagon/WagonTransporterFactory.java | 12 ++++
|
|
Mikolaj Izdebski |
39787e |
37 files changed, 794 insertions(+), 41 deletions(-)
|
|
Mikolaj Izdebski |
39787e |
create mode 100644 aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
create mode 100644 aether-impl/src/main/java/org/eclipse/aether/internal/impl/PlexusLoggerFactory.java
|
|
Mikolaj Izdebski |
39787e |
create mode 100644 aether-impl/src/test/java/org/eclipse/aether/impl/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
create mode 100644 aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
create mode 100644 aether-transport-file/src/test/java/org/eclipse/aether/transport/file/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
create mode 100644 aether-transport-http/src/test/java/org/eclipse/aether/transport/http/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-connector-basic/pom.xml b/aether-connector-basic/pom.xml
|
|
Mikolaj Izdebski |
39787e |
index ee208a8..08429a3 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-connector-basic/pom.xml
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-connector-basic/pom.xml
|
|
Mikolaj Izdebski |
39787e |
@@ -51,6 +51,17 @@
|
|
Mikolaj Izdebski |
39787e |
<optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
</dependency>
|
|
Mikolaj Izdebski |
39787e |
<dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-annotations</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>provided</scope>
|
|
Mikolaj Izdebski |
39787e |
+ <optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>test</scope>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.sonatype.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>sisu-guice</artifactId>
|
|
Mikolaj Izdebski |
39787e |
<classifier>no_aop</classifier>
|
|
Mikolaj Izdebski |
39787e |
@@ -80,6 +91,10 @@
|
|
Mikolaj Izdebski |
39787e |
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
<plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-metadata</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ </plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <plugin>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>sisu-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
|
|
Mikolaj Izdebski |
39787e |
index b1f0576..265a800 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2013, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -13,6 +13,8 @@ package org.eclipse.aether.connector.basic;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.spi.connector.RepositoryConnector;
|
|
Mikolaj Izdebski |
39787e |
@@ -34,18 +36,24 @@ import org.eclipse.aether.transfer.NoRepositoryConnectorException;
|
|
Mikolaj Izdebski |
39787e |
* {@link org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory repository layouts} for the transfers.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named( "basic" )
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = RepositoryConnectorFactory.class, hint = "basic" )
|
|
Mikolaj Izdebski |
39787e |
public final class BasicRepositoryConnectorFactory
|
|
Mikolaj Izdebski |
39787e |
implements RepositoryConnectorFactory, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private TransporterProvider transporterProvider;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RepositoryLayoutProvider layoutProvider;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private ChecksumPolicyProvider checksumPolicyProvider;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private FileProcessor fileProcessor;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private float priority;
|
|
Mikolaj Izdebski |
39787e |
@@ -93,6 +101,12 @@ public final class BasicRepositoryConnectorFactory
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
* Sets the transporter provider to use for this component.
|
|
Mikolaj Izdebski |
39787e |
*
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PlexusSupportTest.java b/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
new file mode 100644
|
|
Mikolaj Izdebski |
39787e |
index 0000000..e57e508
|
|
Mikolaj Izdebski |
39787e |
--- /dev/null
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
@@ -0,0 +1,83 @@
|
|
Mikolaj Izdebski |
39787e |
+/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
+ * are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
+ * which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
+ * http://www.eclipse.org/legal/epl-v10.html
|
|
Mikolaj Izdebski |
39787e |
+ *
|
|
Mikolaj Izdebski |
39787e |
+ * Contributors:
|
|
Mikolaj Izdebski |
39787e |
+ * Sonatype, Inc. - initial API and implementation
|
|
Mikolaj Izdebski |
39787e |
+ *******************************************************************************/
|
|
Mikolaj Izdebski |
39787e |
+package org.eclipse.aether.connector.basic;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.PlexusTestCase;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.internal.test.util.TestFileProcessor;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.internal.test.util.TestLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.layout.RepositoryLayout;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.transport.Transporter;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.transport.TransporterProvider;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.io.FileProcessor;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.log.LoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.transfer.TransferResource;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+/**
|
|
Mikolaj Izdebski |
39787e |
+ */
|
|
Mikolaj Izdebski |
39787e |
+public class PlexusSupportTest
|
|
Mikolaj Izdebski |
39787e |
+ extends PlexusTestCase
|
|
Mikolaj Izdebski |
39787e |
+{
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ @Override
|
|
Mikolaj Izdebski |
39787e |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ containerConfiguration.setClassPathScanning( "cache" );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public void testExistenceOfPlexusComponentMetadata()
|
|
Mikolaj Izdebski |
39787e |
+ throws Exception
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ RepositoryLayoutProvider layoutProvider = new RepositoryLayoutProvider()
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ public RepositoryLayout newRepositoryLayout( RepositorySystemSession session, RemoteRepository repository )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ return null;
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+ };
|
|
Mikolaj Izdebski |
39787e |
+ TransporterProvider transporterProvider = new TransporterProvider()
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ public Transporter newTransporter( RepositorySystemSession session, RemoteRepository repository )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ return null;
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+ };
|
|
Mikolaj Izdebski |
39787e |
+ ChecksumPolicyProvider checksumPolicyProvider = new ChecksumPolicyProvider()
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ public ChecksumPolicy newChecksumPolicy( RepositorySystemSession session, RemoteRepository repository,
|
|
Mikolaj Izdebski |
39787e |
+ TransferResource resource, String policy )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ return null;
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public String getEffectiveChecksumPolicy( RepositorySystemSession session, String policy1, String policy2 )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ return null;
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+ };
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( new TestLoggerFactory(), LoggerFactory.class, null );
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( new TestFileProcessor(), FileProcessor.class, null );
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( layoutProvider, RepositoryLayoutProvider.class, null );
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( transporterProvider, TransporterProvider.class, null );
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( checksumPolicyProvider, ChecksumPolicyProvider.class, null );
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ RepositoryConnectorFactory factory = lookup( RepositoryConnectorFactory.class, "basic" );
|
|
Mikolaj Izdebski |
39787e |
+ assertNotNull( factory );
|
|
Mikolaj Izdebski |
39787e |
+ assertEquals( BasicRepositoryConnectorFactory.class, factory.getClass() );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+}
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/pom.xml b/aether-impl/pom.xml
|
|
Mikolaj Izdebski |
39787e |
index 9627aff..a39794f 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/pom.xml
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/pom.xml
|
|
Mikolaj Izdebski |
39787e |
@@ -51,6 +51,18 @@
|
|
Mikolaj Izdebski |
39787e |
<optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
</dependency>
|
|
Mikolaj Izdebski |
39787e |
<dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-annotations</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>provided</scope>
|
|
Mikolaj Izdebski |
39787e |
+ <optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>provided</scope>
|
|
Mikolaj Izdebski |
39787e |
+ <optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>org.eclipse.sisu.inject</artifactId>
|
|
Mikolaj Izdebski |
39787e |
<scope>provided</scope>
|
|
Mikolaj Izdebski |
39787e |
@@ -93,6 +105,10 @@
|
|
Mikolaj Izdebski |
39787e |
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
<plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-metadata</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ </plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <plugin>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>sisu-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
|
|
Mikolaj Izdebski |
39787e |
index 2426b52..9fb8aab 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -22,11 +22,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositoryEvent;
|
|
Mikolaj Izdebski |
39787e |
-import org.eclipse.aether.RepositoryEvent.EventType;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RequestTrace;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.SyncContext;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.RepositoryEvent.EventType;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.artifact.Artifact;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.artifact.ArtifactProperties;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.ArtifactResolver;
|
|
Mikolaj Izdebski |
39787e |
@@ -71,28 +73,38 @@ import org.eclipse.aether.util.ConfigUtils;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = ArtifactResolver.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultArtifactResolver
|
|
Mikolaj Izdebski |
39787e |
implements ArtifactResolver, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private static final String CONFIG_PROP_SNAPSHOT_NORMALIZATION = "aether.artifactResolver.snapshotNormalization";
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private FileProcessor fileProcessor;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RepositoryEventDispatcher repositoryEventDispatcher;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private VersionResolver versionResolver;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private UpdateCheckManager updateCheckManager;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RepositoryConnectorProvider repositoryConnectorProvider;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RemoteRepositoryManager remoteRepositoryManager;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private SyncContextFactory syncContextFactory;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private OfflineController offlineController;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultArtifactResolver()
|
|
Mikolaj Izdebski |
39787e |
@@ -137,6 +149,12 @@ public class DefaultArtifactResolver
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultArtifactResolver setFileProcessor( FileProcessor fileProcessor )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( fileProcessor == null )
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
|
|
Mikolaj Izdebski |
39787e |
index b1d2f6a..3ebc07a 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2013, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -13,6 +13,8 @@ package org.eclipse.aether.internal.impl;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RepositoryPolicy;
|
|
Mikolaj Izdebski |
39787e |
@@ -27,6 +29,7 @@ import org.eclipse.aether.transfer.TransferResource;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = ChecksumPolicyProvider.class )
|
|
Mikolaj Izdebski |
39787e |
public final class DefaultChecksumPolicyProvider
|
|
Mikolaj Izdebski |
39787e |
implements ChecksumPolicyProvider, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
@@ -37,6 +40,7 @@ public final class DefaultChecksumPolicyProvider
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private static final int ORDINAL_FAIL = 2;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private LoggerFactory loggerFactory = NullLoggerFactory.INSTANCE;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultChecksumPolicyProvider()
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
|
|
Mikolaj Izdebski |
39787e |
index 404897c..1cb0ceb 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
|
|
Mikolaj Izdebski |
39787e |
@@ -10,17 +10,8 @@
|
|
Mikolaj Izdebski |
39787e |
*******************************************************************************/
|
|
Mikolaj Izdebski |
39787e |
package org.eclipse.aether.internal.impl;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
-import java.util.ArrayList;
|
|
Mikolaj Izdebski |
39787e |
-import java.util.Collection;
|
|
Mikolaj Izdebski |
39787e |
-import java.util.Collections;
|
|
Mikolaj Izdebski |
39787e |
-import java.util.HashSet;
|
|
Mikolaj Izdebski |
39787e |
-import java.util.LinkedHashMap;
|
|
Mikolaj Izdebski |
39787e |
-import java.util.List;
|
|
Mikolaj Izdebski |
39787e |
-import java.util.Map;
|
|
Mikolaj Izdebski |
39787e |
-
|
|
Mikolaj Izdebski |
39787e |
-import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
-import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
-
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.DefaultRepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositoryException;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
@@ -61,9 +52,20 @@ import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.util.graph.transformer.TransformationContextKeys;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.version.Version;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
+import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
+import java.util.ArrayList;
|
|
Mikolaj Izdebski |
39787e |
+import java.util.Collection;
|
|
Mikolaj Izdebski |
39787e |
+import java.util.Collections;
|
|
Mikolaj Izdebski |
39787e |
+import java.util.HashSet;
|
|
Mikolaj Izdebski |
39787e |
+import java.util.LinkedHashMap;
|
|
Mikolaj Izdebski |
39787e |
+import java.util.List;
|
|
Mikolaj Izdebski |
39787e |
+import java.util.Map;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = DependencyCollector.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultDependencyCollector
|
|
Mikolaj Izdebski |
39787e |
implements DependencyCollector, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
@@ -72,12 +74,16 @@ public class DefaultDependencyCollector
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private static final String CONFIG_PROP_MAX_CYCLES = "aether.dependencyCollector.maxCycles";
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RemoteRepositoryManager remoteRepositoryManager;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private ArtifactDescriptorReader descriptorReader;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private VersionRangeResolver versionRangeResolver;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultDependencyCollector()
|
|
Mikolaj Izdebski |
39787e |
@@ -110,6 +116,12 @@ public class DefaultDependencyCollector
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultDependencyCollector setRemoteRepositoryManager( RemoteRepositoryManager remoteRepositoryManager )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( remoteRepositoryManager == null )
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
|
|
Mikolaj Izdebski |
39787e |
index b349576..10e3dba 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -22,12 +22,14 @@ import java.util.Set;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositoryEvent;
|
|
Mikolaj Izdebski |
39787e |
-import org.eclipse.aether.RepositoryEvent.EventType;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositoryException;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RequestTrace;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.SyncContext;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.RepositoryEvent.EventType;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.artifact.Artifact;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.deployment.DeployRequest;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.deployment.DeployResult;
|
|
Mikolaj Izdebski |
39787e |
@@ -68,26 +70,36 @@ import org.eclipse.aether.transfer.TransferEvent;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = Deployer.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultDeployer
|
|
Mikolaj Izdebski |
39787e |
implements Deployer, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private FileProcessor fileProcessor;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RepositoryEventDispatcher repositoryEventDispatcher;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RepositoryConnectorProvider repositoryConnectorProvider;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RemoteRepositoryManager remoteRepositoryManager;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private UpdateCheckManager updateCheckManager;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = MetadataGeneratorFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Collection<MetadataGeneratorFactory> metadataFactories = new ArrayList<MetadataGeneratorFactory>();
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private SyncContextFactory syncContextFactory;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private OfflineController offlineController;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultDeployer()
|
|
Mikolaj Izdebski |
39787e |
@@ -132,6 +144,12 @@ public class DefaultDeployer
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultDeployer setFileProcessor( FileProcessor fileProcessor )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( fileProcessor == null )
|
|
Mikolaj Izdebski |
39787e |
@@ -205,6 +223,12 @@ public class DefaultDeployer
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ DefaultDeployer setMetadataFactories( List<MetadataGeneratorFactory> metadataFactories )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ return setMetadataGeneratorFactories( metadataFactories );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultDeployer setSyncContextFactory( SyncContextFactory syncContextFactory )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( syncContextFactory == null )
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
|
|
Mikolaj Izdebski |
39787e |
index 04ab2b6..2933e26 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2012 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -21,12 +21,14 @@ import java.nio.ByteBuffer;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.spi.io.FileProcessor;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
* A utility class helping with file-based operations.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = FileProcessor.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultFileProcessor
|
|
Mikolaj Izdebski |
39787e |
implements FileProcessor
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
@@ -47,9 +49,9 @@ public class DefaultFileProcessor
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
- * Thread-safe variant of {@link File#mkdirs()}. Creates the directory named by the given abstract pathname,
|
|
Mikolaj Izdebski |
39787e |
- * including any necessary but nonexistent parent directories. Note that if this operation fails it may have
|
|
Mikolaj Izdebski |
39787e |
- * succeeded in creating some of the necessary parent directories.
|
|
Mikolaj Izdebski |
39787e |
+ * Thread-safe variant of {@link File#mkdirs()}. Adapted from Java 6. Creates the directory named by the given
|
|
Mikolaj Izdebski |
39787e |
+ * abstract pathname, including any necessary but nonexistent parent directories. Note that if this operation fails
|
|
Mikolaj Izdebski |
39787e |
+ * it may have succeeded in creating some of the necessary parent directories.
|
|
Mikolaj Izdebski |
39787e |
*
|
|
Mikolaj Izdebski |
39787e |
* @param directory The directory to create, may be {@code null}.
|
|
Mikolaj Izdebski |
39787e |
* @return {@code true} if and only if the directory was created, along with all necessary parent directories;
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
|
|
Mikolaj Izdebski |
39787e |
index a6e0a29..f0e5086 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -20,11 +20,13 @@ import java.util.Set;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositoryEvent;
|
|
Mikolaj Izdebski |
39787e |
-import org.eclipse.aether.RepositoryEvent.EventType;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RequestTrace;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.SyncContext;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.RepositoryEvent.EventType;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.artifact.Artifact;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.Installer;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.MetadataGenerator;
|
|
Mikolaj Izdebski |
39787e |
@@ -49,18 +51,24 @@ import org.eclipse.aether.spi.log.NullLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = Installer.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultInstaller
|
|
Mikolaj Izdebski |
39787e |
implements Installer, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private FileProcessor fileProcessor;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RepositoryEventDispatcher repositoryEventDispatcher;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = MetadataGeneratorFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Collection<MetadataGeneratorFactory> metadataFactories = new ArrayList<MetadataGeneratorFactory>();
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private SyncContextFactory syncContextFactory;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultInstaller()
|
|
Mikolaj Izdebski |
39787e |
@@ -95,6 +103,12 @@ public class DefaultInstaller
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultInstaller setFileProcessor( FileProcessor fileProcessor )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( fileProcessor == null )
|
|
Mikolaj Izdebski |
39787e |
@@ -138,6 +152,12 @@ public class DefaultInstaller
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ DefaultInstaller setMetadataFactories( List<MetadataGeneratorFactory> metadataFactories )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ return setMetadataGeneratorFactories( metadataFactories );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultInstaller setSyncContextFactory( SyncContextFactory syncContextFactory )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( syncContextFactory == null )
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java
|
|
Mikolaj Izdebski |
39787e |
index 89a705e..342ab38 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -18,6 +18,8 @@ import java.util.Set;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.LocalRepositoryProvider;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.LocalRepository;
|
|
Mikolaj Izdebski |
39787e |
@@ -33,12 +35,15 @@ import org.eclipse.aether.spi.log.NullLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = LocalRepositoryProvider.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultLocalRepositoryProvider
|
|
Mikolaj Izdebski |
39787e |
implements LocalRepositoryProvider, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LocalRepositoryManagerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Collection<LocalRepositoryManagerFactory> managerFactories = new ArrayList<LocalRepositoryManagerFactory>();
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultLocalRepositoryProvider()
|
|
Mikolaj Izdebski |
39787e |
@@ -65,6 +70,12 @@ public class DefaultLocalRepositoryProvider
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultLocalRepositoryProvider addLocalRepositoryManagerFactory( LocalRepositoryManagerFactory factory )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( factory == null )
|
|
Mikolaj Izdebski |
39787e |
@@ -88,6 +99,12 @@ public class DefaultLocalRepositoryProvider
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ DefaultLocalRepositoryProvider setManagerFactories( List<LocalRepositoryManagerFactory> factories )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ return setLocalRepositoryManagerFactories( factories );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public LocalRepositoryManager newLocalRepositoryManager( RepositorySystemSession session, LocalRepository repository )
|
|
Mikolaj Izdebski |
39787e |
throws NoLocalRepositoryManagerException
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
|
|
Mikolaj Izdebski |
39787e |
index c064a0f..e22c0c0 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -27,11 +27,13 @@ import java.util.concurrent.TimeUnit;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositoryEvent;
|
|
Mikolaj Izdebski |
39787e |
-import org.eclipse.aether.RepositoryEvent.EventType;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RequestTrace;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.SyncContext;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.RepositoryEvent.EventType;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.MetadataResolver;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.OfflineController;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.RemoteRepositoryManager;
|
|
Mikolaj Izdebski |
39787e |
@@ -69,24 +71,32 @@ import org.eclipse.aether.util.concurrency.WorkerThreadFactory;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = MetadataResolver.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultMetadataResolver
|
|
Mikolaj Izdebski |
39787e |
implements MetadataResolver, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private static final String CONFIG_PROP_THREADS = "aether.metadataResolver.threads";
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RepositoryEventDispatcher repositoryEventDispatcher;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private UpdateCheckManager updateCheckManager;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RepositoryConnectorProvider repositoryConnectorProvider;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RemoteRepositoryManager remoteRepositoryManager;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private SyncContextFactory syncContextFactory;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private OfflineController offlineController;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultMetadataResolver()
|
|
Mikolaj Izdebski |
39787e |
@@ -127,6 +137,12 @@ public class DefaultMetadataResolver
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultMetadataResolver setRepositoryEventDispatcher( RepositoryEventDispatcher repositoryEventDispatcher )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( repositoryEventDispatcher == null )
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java
|
|
Mikolaj Izdebski |
39787e |
index 561ba8c..7bce2be 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2012, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2012, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -15,6 +15,8 @@ import java.util.regex.Pattern;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.OfflineController;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
@@ -27,6 +29,7 @@ import org.eclipse.aether.transfer.RepositoryOfflineException;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.util.ConfigUtils;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = OfflineController.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultOfflineController
|
|
Mikolaj Izdebski |
39787e |
implements OfflineController, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
@@ -37,6 +40,7 @@ public class DefaultOfflineController
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private static final Pattern SEP = Pattern.compile( "\\s*,\\s*" );
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultOfflineController()
|
|
Mikolaj Izdebski |
39787e |
@@ -61,6 +65,12 @@ public class DefaultOfflineController
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public void checkOffline( RepositorySystemSession session, RemoteRepository repository )
|
|
Mikolaj Izdebski |
39787e |
throws RepositoryOfflineException
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
|
|
Mikolaj Izdebski |
39787e |
index ccb618a..fa2cf89 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -17,6 +17,8 @@ import java.util.ListIterator;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.RemoteRepositoryManager;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.UpdatePolicyAnalyzer;
|
|
Mikolaj Izdebski |
39787e |
@@ -38,14 +40,18 @@ import org.eclipse.aether.util.StringUtils;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = RemoteRepositoryManager.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultRemoteRepositoryManager
|
|
Mikolaj Izdebski |
39787e |
implements RemoteRepositoryManager, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private UpdatePolicyAnalyzer updatePolicyAnalyzer;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private ChecksumPolicyProvider checksumPolicyProvider;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultRemoteRepositoryManager()
|
|
Mikolaj Izdebski |
39787e |
@@ -75,6 +81,12 @@ public class DefaultRemoteRepositoryManager
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultRemoteRepositoryManager setUpdatePolicyAnalyzer( UpdatePolicyAnalyzer updatePolicyAnalyzer )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( updatePolicyAnalyzer == null )
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
|
|
Mikolaj Izdebski |
39787e |
index 40f1100..ab0edc1 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2012, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2012, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -18,6 +18,8 @@ import java.util.Set;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.RepositoryConnectorProvider;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.Authentication;
|
|
Mikolaj Izdebski |
39787e |
@@ -35,12 +37,15 @@ import org.eclipse.aether.transfer.NoRepositoryConnectorException;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = RepositoryConnectorProvider.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultRepositoryConnectorProvider
|
|
Mikolaj Izdebski |
39787e |
implements RepositoryConnectorProvider, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = RepositoryConnectorFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Collection<RepositoryConnectorFactory> connectorFactories = new ArrayList<RepositoryConnectorFactory>();
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultRepositoryConnectorProvider()
|
|
Mikolaj Izdebski |
39787e |
@@ -67,6 +72,12 @@ public class DefaultRepositoryConnectorProvider
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultRepositoryConnectorProvider addRepositoryConnectorFactory( RepositoryConnectorFactory factory )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( factory == null )
|
|
Mikolaj Izdebski |
39787e |
@@ -90,6 +101,12 @@ public class DefaultRepositoryConnectorProvider
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ DefaultRepositoryConnectorProvider setConnectorFactories( List<RepositoryConnectorFactory> factories )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ return setRepositoryConnectorFactories( factories );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public RepositoryConnector newRepositoryConnector( RepositorySystemSession session, RemoteRepository repository )
|
|
Mikolaj Izdebski |
39787e |
throws NoRepositoryConnectorException
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java
|
|
Mikolaj Izdebski |
39787e |
index 03eabcf..fec70f4 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2012 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -12,11 +12,14 @@ package org.eclipse.aether.internal.impl;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
import java.util.ArrayList;
|
|
Mikolaj Izdebski |
39787e |
import java.util.Collection;
|
|
Mikolaj Izdebski |
39787e |
+import java.util.List;
|
|
Mikolaj Izdebski |
39787e |
import java.util.Set;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositoryEvent;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositoryListener;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.RepositoryEventDispatcher;
|
|
Mikolaj Izdebski |
39787e |
@@ -29,12 +32,15 @@ import org.eclipse.aether.spi.log.NullLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = RepositoryEventDispatcher.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultRepositoryEventDispatcher
|
|
Mikolaj Izdebski |
39787e |
implements RepositoryEventDispatcher, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = RepositoryListener.class )
|
|
Mikolaj Izdebski |
39787e |
private Collection<RepositoryListener> listeners = new ArrayList<RepositoryListener>();
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultRepositoryEventDispatcher()
|
|
Mikolaj Izdebski |
39787e |
@@ -55,6 +61,12 @@ public class DefaultRepositoryEventDispatcher
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultRepositoryEventDispatcher addRepositoryListener( RepositoryListener listener )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( listener == null )
|
|
Mikolaj Izdebski |
39787e |
@@ -78,10 +90,16 @@ public class DefaultRepositoryEventDispatcher
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ DefaultRepositoryEventDispatcher setListeners( List<RepositoryListener> listeners )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ return setRepositoryListeners( listeners );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public void initService( ServiceLocator locator )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
setLoggerFactory( locator.getService( LoggerFactory.class ) );
|
|
Mikolaj Izdebski |
39787e |
- setRepositoryListeners( locator.getServices( RepositoryListener.class ) );
|
|
Mikolaj Izdebski |
39787e |
+ setListeners( locator.getServices( RepositoryListener.class ) );
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public void dispatch( RepositoryEvent event )
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
|
|
Mikolaj Izdebski |
39787e |
index 6fff271..efc9c0a 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2013, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -18,6 +18,8 @@ import java.util.Set;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.spi.connector.layout.RepositoryLayout;
|
|
Mikolaj Izdebski |
39787e |
@@ -33,12 +35,15 @@ import org.eclipse.aether.transfer.NoRepositoryLayoutException;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = RepositoryLayoutProvider.class )
|
|
Mikolaj Izdebski |
39787e |
public final class DefaultRepositoryLayoutProvider
|
|
Mikolaj Izdebski |
39787e |
implements RepositoryLayoutProvider, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = RepositoryLayoutFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Collection<RepositoryLayoutFactory> factories = new ArrayList<RepositoryLayoutFactory>();
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultRepositoryLayoutProvider()
|
|
Mikolaj Izdebski |
39787e |
@@ -65,6 +70,12 @@ public final class DefaultRepositoryLayoutProvider
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultRepositoryLayoutProvider addRepositoryLayoutFactory( RepositoryLayoutFactory factory )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( factory == null )
|
|
Mikolaj Izdebski |
39787e |
@@ -88,6 +99,12 @@ public final class DefaultRepositoryLayoutProvider
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ DefaultRepositoryLayoutProvider setFactories( List<RepositoryLayoutFactory> factories )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ return setRepositoryLayoutFactories( factories );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public RepositoryLayout newRepositoryLayout( RepositorySystemSession session, RemoteRepository repository )
|
|
Mikolaj Izdebski |
39787e |
throws NoRepositoryLayoutException
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
|
|
Mikolaj Izdebski |
39787e |
index 8882814..14258bc 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -17,6 +17,8 @@ import java.util.List;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystem;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RequestTrace;
|
|
Mikolaj Izdebski |
39787e |
@@ -78,32 +80,45 @@ import org.eclipse.aether.util.graph.visitor.TreeDependencyVisitor;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = RepositorySystem.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultRepositorySystem
|
|
Mikolaj Izdebski |
39787e |
implements RepositorySystem, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private VersionResolver versionResolver;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private VersionRangeResolver versionRangeResolver;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private ArtifactResolver artifactResolver;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private MetadataResolver metadataResolver;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private ArtifactDescriptorReader artifactDescriptorReader;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private DependencyCollector dependencyCollector;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private Installer installer;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private Deployer deployer;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private LocalRepositoryProvider localRepositoryProvider;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private SyncContextFactory syncContextFactory;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private RemoteRepositoryManager remoteRepositoryManager;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultRepositorySystem()
|
|
Mikolaj Izdebski |
39787e |
@@ -155,6 +170,12 @@ public class DefaultRepositorySystem
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultRepositorySystem setVersionResolver( VersionResolver versionResolver )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( versionResolver == null )
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultSyncContextFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultSyncContextFactory.java
|
|
Mikolaj Izdebski |
39787e |
index 2910131..a00753d 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultSyncContextFactory.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultSyncContextFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2012 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -14,6 +14,7 @@ import java.util.Collection;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.SyncContext;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.artifact.Artifact;
|
|
Mikolaj Izdebski |
39787e |
@@ -25,6 +26,7 @@ import org.eclipse.aether.metadata.Metadata;
|
|
Mikolaj Izdebski |
39787e |
* synchronization but merely completes the repository system.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = SyncContextFactory.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultSyncContextFactory
|
|
Mikolaj Izdebski |
39787e |
implements SyncContextFactory
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
|
|
Mikolaj Izdebski |
39787e |
index 60b64b6..2852103 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2013, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -18,6 +18,8 @@ import java.util.Set;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.spi.connector.transport.Transporter;
|
|
Mikolaj Izdebski |
39787e |
@@ -33,12 +35,15 @@ import org.eclipse.aether.transfer.NoTransporterException;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = TransporterProvider.class )
|
|
Mikolaj Izdebski |
39787e |
public final class DefaultTransporterProvider
|
|
Mikolaj Izdebski |
39787e |
implements TransporterProvider, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = TransporterFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Collection<TransporterFactory> factories = new ArrayList<TransporterFactory>();
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultTransporterProvider()
|
|
Mikolaj Izdebski |
39787e |
@@ -65,6 +70,12 @@ public final class DefaultTransporterProvider
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultTransporterProvider addTransporterFactory( TransporterFactory factory )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( factory == null )
|
|
Mikolaj Izdebski |
39787e |
@@ -88,6 +99,12 @@ public final class DefaultTransporterProvider
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ DefaultTransporterProvider setFactories( List<TransporterFactory> factories )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ return setTransporterFactories( factories );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public Transporter newTransporter( RepositorySystemSession session, RemoteRepository repository )
|
|
Mikolaj Izdebski |
39787e |
throws NoTransporterException
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
|
|
Mikolaj Izdebski |
39787e |
index 652f026..9ebd3cf 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -22,6 +22,8 @@ import java.util.concurrent.ConcurrentHashMap;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.SessionData;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.artifact.Artifact;
|
|
Mikolaj Izdebski |
39787e |
@@ -47,12 +49,15 @@ import org.eclipse.aether.util.ConfigUtils;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = UpdateCheckManager.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultUpdateCheckManager
|
|
Mikolaj Izdebski |
39787e |
implements UpdateCheckManager, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private UpdatePolicyAnalyzer updatePolicyAnalyzer;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private static final String UPDATED_KEY_SUFFIX = ".lastUpdated";
|
|
Mikolaj Izdebski |
39787e |
@@ -95,6 +100,12 @@ public class DefaultUpdateCheckManager
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public DefaultUpdateCheckManager setUpdatePolicyAnalyzer( UpdatePolicyAnalyzer updatePolicyAnalyzer )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
if ( updatePolicyAnalyzer == null )
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
|
|
Mikolaj Izdebski |
39787e |
index adc07f5..7735ea8 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2010, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2012 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -15,6 +15,8 @@ import java.util.Calendar;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.impl.UpdatePolicyAnalyzer;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RepositoryPolicy;
|
|
Mikolaj Izdebski |
39787e |
@@ -27,10 +29,12 @@ import org.eclipse.aether.spi.log.NullLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = UpdatePolicyAnalyzer.class )
|
|
Mikolaj Izdebski |
39787e |
public class DefaultUpdatePolicyAnalyzer
|
|
Mikolaj Izdebski |
39787e |
implements UpdatePolicyAnalyzer, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
public DefaultUpdatePolicyAnalyzer()
|
|
Mikolaj Izdebski |
39787e |
@@ -55,6 +59,12 @@ public class DefaultUpdatePolicyAnalyzer
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public String getEffectiveUpdatePolicy( RepositorySystemSession session, String policy1, String policy2 )
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
return ordinalOfUpdatePolicy( policy1 ) < ordinalOfUpdatePolicy( policy2 ) ? policy1 : policy2;
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
|
|
Mikolaj Izdebski |
39787e |
index 4ee698b..1c7ab46 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -13,6 +13,8 @@ package org.eclipse.aether.internal.impl;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.LocalRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.LocalRepositoryManager;
|
|
Mikolaj Izdebski |
39787e |
@@ -32,10 +34,12 @@ import org.eclipse.aether.spi.log.NullLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
* emulating physically separated artifact caches per remote repository.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named( "enhanced" )
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = LocalRepositoryManagerFactory.class, hint = "enhanced" )
|
|
Mikolaj Izdebski |
39787e |
public class EnhancedLocalRepositoryManagerFactory
|
|
Mikolaj Izdebski |
39787e |
implements LocalRepositoryManagerFactory, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private float priority = 10;
|
|
Mikolaj Izdebski |
39787e |
@@ -75,6 +79,12 @@ public class EnhancedLocalRepositoryManagerFactory
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public float getPriority()
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
return priority;
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java
|
|
Mikolaj Izdebski |
39787e |
index 0d95be2..c48a305 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2013, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -18,6 +18,7 @@ import java.util.List;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.artifact.Artifact;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.metadata.Metadata;
|
|
Mikolaj Izdebski |
39787e |
@@ -31,6 +32,7 @@ import org.eclipse.aether.util.ConfigUtils;
|
|
Mikolaj Izdebski |
39787e |
* Provides a Maven-2 repository layout for repositories with content type {@code "default"}.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named( "maven2" )
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = RepositoryLayoutFactory.class, hint = "maven2" )
|
|
Mikolaj Izdebski |
39787e |
public final class Maven2RepositoryLayoutFactory
|
|
Mikolaj Izdebski |
39787e |
implements RepositoryLayoutFactory
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PlexusLoggerFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PlexusLoggerFactory.java
|
|
Mikolaj Izdebski |
39787e |
new file mode 100644
|
|
Mikolaj Izdebski |
39787e |
index 0000000..362cca2
|
|
Mikolaj Izdebski |
39787e |
--- /dev/null
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PlexusLoggerFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -0,0 +1,78 @@
|
|
Mikolaj Izdebski |
39787e |
+/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2011 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
+ * are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
+ * which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
+ * http://www.eclipse.org/legal/epl-v10.html
|
|
Mikolaj Izdebski |
39787e |
+ *
|
|
Mikolaj Izdebski |
39787e |
+ * Contributors:
|
|
Mikolaj Izdebski |
39787e |
+ * Sonatype, Inc. - initial API and implementation
|
|
Mikolaj Izdebski |
39787e |
+ *******************************************************************************/
|
|
Mikolaj Izdebski |
39787e |
+package org.eclipse.aether.internal.impl;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.logging.LoggerManager;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.log.Logger;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.log.LoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+/**
|
|
Mikolaj Izdebski |
39787e |
+ * A logger factory that delegates to Plexus logging.
|
|
Mikolaj Izdebski |
39787e |
+ */
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
+public class PlexusLoggerFactory
|
|
Mikolaj Izdebski |
39787e |
+ implements LoggerFactory
|
|
Mikolaj Izdebski |
39787e |
+{
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
+ private LoggerManager loggerManager;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public Logger getLogger( String name )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ return new PlexusLogger( loggerManager.getLoggerForComponent( name ) );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ private static final class PlexusLogger
|
|
Mikolaj Izdebski |
39787e |
+ implements Logger
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ private final org.codehaus.plexus.logging.Logger logger;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public PlexusLogger( org.codehaus.plexus.logging.Logger logger )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ this.logger = logger;
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public boolean isDebugEnabled()
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ return logger.isDebugEnabled();
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public void debug( String msg )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ logger.debug( msg );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public void debug( String msg, Throwable error )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ logger.debug( msg, error );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public boolean isWarnEnabled()
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ return logger.isWarnEnabled();
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public void warn( String msg )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ logger.warn( msg );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public void warn( String msg, Throwable error )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ logger.warn( msg, error );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+}
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java
|
|
Mikolaj Izdebski |
39787e |
index bc2122f..43e1026 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -13,6 +13,8 @@ package org.eclipse.aether.internal.impl;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.LocalRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.LocalRepositoryManager;
|
|
Mikolaj Izdebski |
39787e |
@@ -28,10 +30,12 @@ import org.eclipse.aether.spi.log.NullLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
* Creates local repository managers for repository type {@code "simple"}.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named( "simple" )
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = LocalRepositoryManagerFactory.class, hint = "simple" )
|
|
Mikolaj Izdebski |
39787e |
public class SimpleLocalRepositoryManagerFactory
|
|
Mikolaj Izdebski |
39787e |
implements LocalRepositoryManagerFactory, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private float priority;
|
|
Mikolaj Izdebski |
39787e |
@@ -71,6 +75,12 @@ public class SimpleLocalRepositoryManagerFactory
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public float getPriority()
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
return priority;
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-impl/src/test/java/org/eclipse/aether/impl/PlexusSupportTest.java b/aether-impl/src/test/java/org/eclipse/aether/impl/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
new file mode 100644
|
|
Mikolaj Izdebski |
39787e |
index 0000000..26324ef
|
|
Mikolaj Izdebski |
39787e |
--- /dev/null
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-impl/src/test/java/org/eclipse/aether/impl/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
@@ -0,0 +1,66 @@
|
|
Mikolaj Izdebski |
39787e |
+/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2010, 2011 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
+ * are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
+ * which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
+ * http://www.eclipse.org/legal/epl-v10.html
|
|
Mikolaj Izdebski |
39787e |
+ *
|
|
Mikolaj Izdebski |
39787e |
+ * Contributors:
|
|
Mikolaj Izdebski |
39787e |
+ * Sonatype, Inc. - initial API and implementation
|
|
Mikolaj Izdebski |
39787e |
+ *******************************************************************************/
|
|
Mikolaj Izdebski |
39787e |
+package org.eclipse.aether.impl;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+import java.util.List;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.PlexusTestCase;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.RepositorySystem;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.impl.ArtifactDescriptorReader;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.impl.VersionRangeResolver;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.impl.VersionResolver;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.transport.TransporterProvider;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+/**
|
|
Mikolaj Izdebski |
39787e |
+ */
|
|
Mikolaj Izdebski |
39787e |
+public class PlexusSupportTest
|
|
Mikolaj Izdebski |
39787e |
+ extends PlexusTestCase
|
|
Mikolaj Izdebski |
39787e |
+{
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ @Override
|
|
Mikolaj Izdebski |
39787e |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ containerConfiguration.setClassPathScanning( "cache" );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public void testExistenceOfPlexusComponentMetadata()
|
|
Mikolaj Izdebski |
39787e |
+ throws Exception
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( new StubVersionRangeResolver(), VersionRangeResolver.class, null );
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( new StubVersionResolver(), VersionResolver.class, null );
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( new StubArtifactDescriptorReader(), ArtifactDescriptorReader.class, null );
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ RepositorySystem repoSystem = lookup( RepositorySystem.class );
|
|
Mikolaj Izdebski |
39787e |
+ assertNotNull( repoSystem );
|
|
Mikolaj Izdebski |
39787e |
+ assertSame( repoSystem, lookup( RepositorySystem.class ) );
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ List<LocalRepositoryManagerFactory> lrmfs = getContainer().lookupList( LocalRepositoryManagerFactory.class );
|
|
Mikolaj Izdebski |
39787e |
+ assertNotNull( lrmfs );
|
|
Mikolaj Izdebski |
39787e |
+ assertEquals( 2, lrmfs.size() );
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ List<RepositoryLayoutFactory> rlfs = getContainer().lookupList( RepositoryLayoutFactory.class );
|
|
Mikolaj Izdebski |
39787e |
+ assertNotNull( rlfs );
|
|
Mikolaj Izdebski |
39787e |
+ assertEquals( 1, rlfs.size() );
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ RepositoryLayoutProvider rlp = lookup( RepositoryLayoutProvider.class );
|
|
Mikolaj Izdebski |
39787e |
+ assertNotNull( rlp );
|
|
Mikolaj Izdebski |
39787e |
+ assertSame( rlp, lookup( RepositoryLayoutProvider.class ) );
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ TransporterProvider tp = lookup( TransporterProvider.class );
|
|
Mikolaj Izdebski |
39787e |
+ assertNotNull( tp );
|
|
Mikolaj Izdebski |
39787e |
+ assertSame( tp, lookup( TransporterProvider.class ) );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+}
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-classpath/pom.xml b/aether-transport-classpath/pom.xml
|
|
Mikolaj Izdebski |
39787e |
index b980591..8d7dc0e 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-transport-classpath/pom.xml
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-classpath/pom.xml
|
|
Mikolaj Izdebski |
39787e |
@@ -51,6 +51,17 @@
|
|
Mikolaj Izdebski |
39787e |
<optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
</dependency>
|
|
Mikolaj Izdebski |
39787e |
<dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-annotations</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>provided</scope>
|
|
Mikolaj Izdebski |
39787e |
+ <optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>test</scope>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.sonatype.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>sisu-guice</artifactId>
|
|
Mikolaj Izdebski |
39787e |
<classifier>no_aop</classifier>
|
|
Mikolaj Izdebski |
39787e |
@@ -80,6 +91,10 @@
|
|
Mikolaj Izdebski |
39787e |
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
<plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-metadata</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ </plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <plugin>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>sisu-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
index 4a7c470..06acb89 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2013, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -13,6 +13,8 @@ package org.eclipse.aether.transport.classpath;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.spi.connector.transport.Transporter;
|
|
Mikolaj Izdebski |
39787e |
@@ -33,6 +35,7 @@ import org.eclipse.aether.transfer.NoTransporterException;
|
|
Mikolaj Izdebski |
39787e |
* Note: Such repositories are read-only and uploads to them are generally not supported.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named( "classpath" )
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = TransporterFactory.class, hint = "classpath" )
|
|
Mikolaj Izdebski |
39787e |
public final class ClasspathTransporterFactory
|
|
Mikolaj Izdebski |
39787e |
implements TransporterFactory, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
@@ -44,6 +47,7 @@ public final class ClasspathTransporterFactory
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
public static final String CONFIG_PROP_CLASS_LOADER = "aether.connector.classpath.loader";
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private float priority;
|
|
Mikolaj Izdebski |
39787e |
@@ -81,6 +85,12 @@ public final class ClasspathTransporterFactory
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public float getPriority()
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
return priority;
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/PlexusSupportTest.java b/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
new file mode 100644
|
|
Mikolaj Izdebski |
39787e |
index 0000000..c984df6
|
|
Mikolaj Izdebski |
39787e |
--- /dev/null
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
@@ -0,0 +1,42 @@
|
|
Mikolaj Izdebski |
39787e |
+/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
+ * are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
+ * which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
+ * http://www.eclipse.org/legal/epl-v10.html
|
|
Mikolaj Izdebski |
39787e |
+ *
|
|
Mikolaj Izdebski |
39787e |
+ * Contributors:
|
|
Mikolaj Izdebski |
39787e |
+ * Sonatype, Inc. - initial API and implementation
|
|
Mikolaj Izdebski |
39787e |
+ *******************************************************************************/
|
|
Mikolaj Izdebski |
39787e |
+package org.eclipse.aether.transport.classpath;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.PlexusTestCase;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.internal.test.util.TestLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.transport.TransporterFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.log.LoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.transport.classpath.ClasspathTransporterFactory;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+/**
|
|
Mikolaj Izdebski |
39787e |
+ */
|
|
Mikolaj Izdebski |
39787e |
+public class PlexusSupportTest
|
|
Mikolaj Izdebski |
39787e |
+ extends PlexusTestCase
|
|
Mikolaj Izdebski |
39787e |
+{
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ @Override
|
|
Mikolaj Izdebski |
39787e |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ containerConfiguration.setClassPathScanning( "cache" );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public void testExistenceOfPlexusComponentMetadata()
|
|
Mikolaj Izdebski |
39787e |
+ throws Exception
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( new TestLoggerFactory(), LoggerFactory.class, null );
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ TransporterFactory factory = lookup( TransporterFactory.class, "classpath" );
|
|
Mikolaj Izdebski |
39787e |
+ assertNotNull( factory );
|
|
Mikolaj Izdebski |
39787e |
+ assertEquals( ClasspathTransporterFactory.class, factory.getClass() );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+}
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-file/pom.xml b/aether-transport-file/pom.xml
|
|
Mikolaj Izdebski |
39787e |
index 35bf5b1..0d4a252 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-transport-file/pom.xml
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-file/pom.xml
|
|
Mikolaj Izdebski |
39787e |
@@ -51,6 +51,17 @@
|
|
Mikolaj Izdebski |
39787e |
<optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
</dependency>
|
|
Mikolaj Izdebski |
39787e |
<dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-annotations</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>provided</scope>
|
|
Mikolaj Izdebski |
39787e |
+ <optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>test</scope>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.sonatype.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>sisu-guice</artifactId>
|
|
Mikolaj Izdebski |
39787e |
<classifier>no_aop</classifier>
|
|
Mikolaj Izdebski |
39787e |
@@ -80,6 +91,10 @@
|
|
Mikolaj Izdebski |
39787e |
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
<plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-metadata</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ </plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <plugin>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>sisu-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
index 08e337c..0969167 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2013, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -13,6 +13,8 @@ package org.eclipse.aether.transport.file;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.spi.connector.transport.Transporter;
|
|
Mikolaj Izdebski |
39787e |
@@ -28,10 +30,12 @@ import org.eclipse.aether.transfer.NoTransporterException;
|
|
Mikolaj Izdebski |
39787e |
* A transporter factory for repositories using the {@code file:} protocol.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named( "file" )
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = TransporterFactory.class, hint = "file" )
|
|
Mikolaj Izdebski |
39787e |
public final class FileTransporterFactory
|
|
Mikolaj Izdebski |
39787e |
implements TransporterFactory, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private float priority;
|
|
Mikolaj Izdebski |
39787e |
@@ -69,6 +73,12 @@ public final class FileTransporterFactory
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public float getPriority()
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
return priority;
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/PlexusSupportTest.java b/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
new file mode 100644
|
|
Mikolaj Izdebski |
39787e |
index 0000000..f579995
|
|
Mikolaj Izdebski |
39787e |
--- /dev/null
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
@@ -0,0 +1,41 @@
|
|
Mikolaj Izdebski |
39787e |
+/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
+ * are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
+ * which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
+ * http://www.eclipse.org/legal/epl-v10.html
|
|
Mikolaj Izdebski |
39787e |
+ *
|
|
Mikolaj Izdebski |
39787e |
+ * Contributors:
|
|
Mikolaj Izdebski |
39787e |
+ * Sonatype, Inc. - initial API and implementation
|
|
Mikolaj Izdebski |
39787e |
+ *******************************************************************************/
|
|
Mikolaj Izdebski |
39787e |
+package org.eclipse.aether.transport.file;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.PlexusTestCase;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.internal.test.util.TestLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.transport.TransporterFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.log.LoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+/**
|
|
Mikolaj Izdebski |
39787e |
+ */
|
|
Mikolaj Izdebski |
39787e |
+public class PlexusSupportTest
|
|
Mikolaj Izdebski |
39787e |
+ extends PlexusTestCase
|
|
Mikolaj Izdebski |
39787e |
+{
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ @Override
|
|
Mikolaj Izdebski |
39787e |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ containerConfiguration.setClassPathScanning( "cache" );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public void testExistenceOfPlexusComponentMetadata()
|
|
Mikolaj Izdebski |
39787e |
+ throws Exception
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( new TestLoggerFactory(), LoggerFactory.class, null );
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ TransporterFactory factory = lookup( TransporterFactory.class, "file" );
|
|
Mikolaj Izdebski |
39787e |
+ assertNotNull( factory );
|
|
Mikolaj Izdebski |
39787e |
+ assertEquals( FileTransporterFactory.class, factory.getClass() );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+}
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-http/pom.xml b/aether-transport-http/pom.xml
|
|
Mikolaj Izdebski |
39787e |
index feb9adb..c911c0e 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-transport-http/pom.xml
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-http/pom.xml
|
|
Mikolaj Izdebski |
39787e |
@@ -68,6 +68,17 @@
|
|
Mikolaj Izdebski |
39787e |
<optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
</dependency>
|
|
Mikolaj Izdebski |
39787e |
<dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-annotations</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>provided</scope>
|
|
Mikolaj Izdebski |
39787e |
+ <optional>true</optional>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ <scope>test</scope>
|
|
Mikolaj Izdebski |
39787e |
+ </dependency>
|
|
Mikolaj Izdebski |
39787e |
+ <dependency>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.sonatype.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>sisu-guice</artifactId>
|
|
Mikolaj Izdebski |
39787e |
<classifier>no_aop</classifier>
|
|
Mikolaj Izdebski |
39787e |
@@ -109,6 +120,10 @@
|
|
Mikolaj Izdebski |
39787e |
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
<plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <groupId>org.codehaus.plexus</groupId>
|
|
Mikolaj Izdebski |
39787e |
+ <artifactId>plexus-component-metadata</artifactId>
|
|
Mikolaj Izdebski |
39787e |
+ </plugin>
|
|
Mikolaj Izdebski |
39787e |
+ <plugin>
|
|
Mikolaj Izdebski |
39787e |
<groupId>org.eclipse.sisu</groupId>
|
|
Mikolaj Izdebski |
39787e |
<artifactId>sisu-maven-plugin</artifactId>
|
|
Mikolaj Izdebski |
39787e |
</plugin>
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
index 2636bdf..69ed839 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -1,5 +1,5 @@
|
|
Mikolaj Izdebski |
39787e |
/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
- * Copyright (c) 2013, 2014 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
* All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
* are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
* which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
@@ -13,6 +13,8 @@ package org.eclipse.aether.transport.http;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.spi.connector.transport.Transporter;
|
|
Mikolaj Izdebski |
39787e |
@@ -29,10 +31,12 @@ import org.eclipse.aether.transfer.NoTransporterException;
|
|
Mikolaj Izdebski |
39787e |
* support uploads to WebDAV servers and resumable downloads.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named( "http" )
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = TransporterFactory.class, hint = "http" )
|
|
Mikolaj Izdebski |
39787e |
public final class HttpTransporterFactory
|
|
Mikolaj Izdebski |
39787e |
implements TransporterFactory, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private float priority = 5;
|
|
Mikolaj Izdebski |
39787e |
@@ -70,6 +74,12 @@ public final class HttpTransporterFactory
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
public float getPriority()
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
return priority;
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/PlexusSupportTest.java b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
new file mode 100644
|
|
Mikolaj Izdebski |
39787e |
index 0000000..a0f6c86
|
|
Mikolaj Izdebski |
39787e |
--- /dev/null
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/PlexusSupportTest.java
|
|
Mikolaj Izdebski |
39787e |
@@ -0,0 +1,41 @@
|
|
Mikolaj Izdebski |
39787e |
+/*******************************************************************************
|
|
Mikolaj Izdebski |
39787e |
+ * Copyright (c) 2013 Sonatype, Inc.
|
|
Mikolaj Izdebski |
39787e |
+ * All rights reserved. This program and the accompanying materials
|
|
Mikolaj Izdebski |
39787e |
+ * are made available under the terms of the Eclipse Public License v1.0
|
|
Mikolaj Izdebski |
39787e |
+ * which accompanies this distribution, and is available at
|
|
Mikolaj Izdebski |
39787e |
+ * http://www.eclipse.org/legal/epl-v10.html
|
|
Mikolaj Izdebski |
39787e |
+ *
|
|
Mikolaj Izdebski |
39787e |
+ * Contributors:
|
|
Mikolaj Izdebski |
39787e |
+ * Sonatype, Inc. - initial API and implementation
|
|
Mikolaj Izdebski |
39787e |
+ *******************************************************************************/
|
|
Mikolaj Izdebski |
39787e |
+package org.eclipse.aether.transport.http;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.PlexusTestCase;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.internal.test.util.TestLoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.connector.transport.TransporterFactory;
|
|
Mikolaj Izdebski |
39787e |
+import org.eclipse.aether.spi.log.LoggerFactory;
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+/**
|
|
Mikolaj Izdebski |
39787e |
+ */
|
|
Mikolaj Izdebski |
39787e |
+public class PlexusSupportTest
|
|
Mikolaj Izdebski |
39787e |
+ extends PlexusTestCase
|
|
Mikolaj Izdebski |
39787e |
+{
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ @Override
|
|
Mikolaj Izdebski |
39787e |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ containerConfiguration.setClassPathScanning( "cache" );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ public void testExistenceOfPlexusComponentMetadata()
|
|
Mikolaj Izdebski |
39787e |
+ throws Exception
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ getContainer().addComponent( new TestLoggerFactory(), LoggerFactory.class, null );
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+ TransporterFactory factory = lookup( TransporterFactory.class, "http" );
|
|
Mikolaj Izdebski |
39787e |
+ assertNotNull( factory );
|
|
Mikolaj Izdebski |
39787e |
+ assertEquals( HttpTransporterFactory.class, factory.getClass() );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
+}
|
|
Mikolaj Izdebski |
39787e |
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
index 5d91358..be57919 100644
|
|
Mikolaj Izdebski |
39787e |
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
|
|
Mikolaj Izdebski |
39787e |
@@ -13,6 +13,8 @@ package org.eclipse.aether.transport.wagon;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Inject;
|
|
Mikolaj Izdebski |
39787e |
import javax.inject.Named;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Component;
|
|
Mikolaj Izdebski |
39787e |
+import org.codehaus.plexus.component.annotations.Requirement;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.RepositorySystemSession;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.repository.RemoteRepository;
|
|
Mikolaj Izdebski |
39787e |
import org.eclipse.aether.spi.connector.transport.Transporter;
|
|
Mikolaj Izdebski |
39787e |
@@ -30,14 +32,18 @@ import org.eclipse.aether.transfer.NoTransporterException;
|
|
Mikolaj Izdebski |
39787e |
* unless one or more wagon implementations are registered with the {@link WagonProvider}.
|
|
Mikolaj Izdebski |
39787e |
*/
|
|
Mikolaj Izdebski |
39787e |
@Named( "wagon" )
|
|
Mikolaj Izdebski |
39787e |
+@Component( role = TransporterFactory.class, hint = "wagon" )
|
|
Mikolaj Izdebski |
39787e |
public final class WagonTransporterFactory
|
|
Mikolaj Izdebski |
39787e |
implements TransporterFactory, Service
|
|
Mikolaj Izdebski |
39787e |
{
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement( role = LoggerFactory.class )
|
|
Mikolaj Izdebski |
39787e |
private Logger logger = NullLoggerFactory.LOGGER;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private WagonProvider wagonProvider;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ @Requirement
|
|
Mikolaj Izdebski |
39787e |
private WagonConfigurator wagonConfigurator;
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
private float priority = -1;
|
|
Mikolaj Izdebski |
39787e |
@@ -80,6 +86,12 @@ public final class WagonTransporterFactory
|
|
Mikolaj Izdebski |
39787e |
return this;
|
|
Mikolaj Izdebski |
39787e |
}
|
|
Mikolaj Izdebski |
39787e |
|
|
Mikolaj Izdebski |
39787e |
+ void setLogger( LoggerFactory loggerFactory )
|
|
Mikolaj Izdebski |
39787e |
+ {
|
|
Mikolaj Izdebski |
39787e |
+ // plexus support
|
|
Mikolaj Izdebski |
39787e |
+ setLoggerFactory( loggerFactory );
|
|
Mikolaj Izdebski |
39787e |
+ }
|
|
Mikolaj Izdebski |
39787e |
+
|
|
Mikolaj Izdebski |
39787e |
/**
|
|
Mikolaj Izdebski |
39787e |
* Sets the wagon provider to use to acquire and release wagon instances.
|
|
Mikolaj Izdebski |
39787e |
*
|
|
Mikolaj Izdebski |
39787e |
--
|
|
Mikolaj Izdebski |
39787e |
1.9.0
|
|
Mikolaj Izdebski |
39787e |
|