You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/04/22 10:48:41 UTC
svn commit: r164201 -
/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository
/maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project
/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus
Author: brett
Date: Fri Apr 22 01:48:41 2005
New Revision: 164201
URL: http://svn.apache.org/viewcvs?rev=164201&view=rev
Log:
move artifact repository factory into maven-artifact
Added:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
- copied unchanged from r164181, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
- copied, changed from r164189, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Modified:
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
Copied: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (from r164189, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?p2=maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java&r1=164189&r2=164201&rev=164201&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java Fri Apr 22 01:48:41 2005
@@ -17,7 +17,6 @@
*/
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.settings.MavenSettingsBuilder;
import org.codehaus.plexus.logging.AbstractLogEnabled;
/**
@@ -29,9 +28,6 @@
{
// TODO: use settings?
private String globalSnapshotPolicy = null;
-
- // TODO: make this a store once object?
- private MavenSettingsBuilder settingsBuilder;
public ArtifactRepository createArtifactRepository( String id, String url,
ArtifactRepositoryLayout repositoryLayout,
Modified: maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml?rev=164201&r1=164200&r2=164201&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml Fri Apr 22 01:48:41 2005
@@ -180,5 +180,10 @@
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
<implementation>org.apache.maven.artifact.factory.DefaultArtifactFactory</implementation>
</component>
+
+ <component>
+ <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+ <implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
+ </component>
</components>
</component-set>
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=164201&r1=164200&r2=164201&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Fri Apr 22 01:48:41 2005
@@ -89,10 +89,6 @@
protected PathTranslator pathTranslator;
- protected ArtifactRepositoryFactory artifactRepositoryFactory;
-
- protected MavenSettingsBuilder mavenSettingsBuilder;
-
protected ComponentConfigurator configurator;
private ArtifactFactory artifactFactory;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=164201&r1=164200&r2=164201&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Fri Apr 22 01:48:41 2005
@@ -74,6 +74,7 @@
extends AbstractLogEnabled
implements MavenProjectBuilder, Initializable, Contextualizable
{
+ // TODO: remove
private PlexusContainer container;
private ArtifactResolver artifactResolver;
@@ -382,8 +383,9 @@
{
String id = repo.getId();
String url = repo.getUrl();
- ArtifactRepositoryLayout layout = getRepositoryLayout( repo );
String snapshotPolicy = repo.getSnapshotPolicy();
+ // TODO: make this a map inside the factory instead, so no lookup needed
+ ArtifactRepositoryLayout layout = getRepositoryLayout( repo );
return artifactRepositoryFactory.createArtifactRepository( id, url, layout, snapshotPolicy );
}
else
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=164201&r1=164200&r2=164201&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Fri Apr 22 01:48:41 2005
@@ -227,11 +227,7 @@
<role>org.apache.maven.project.path.PathTranslator</role>
<implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
</component>
- <!-- ********************* FIXME *******************************************
- | NOTE: This is also declared in plexus.xml for maven. We currently need it
- | in both places, for systems that don't use maven's plexus.xml. This will
- | become unnecessary when multiple plexus.xml files are allowed in plexus.
- -->
+
<component>
<role>org.apache.maven.settings.MavenSettingsBuilder</role>
<implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml?rev=164201&r1=164200&r2=164201&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml Fri Apr 22 01:48:41 2005
@@ -25,12 +25,6 @@
<role>org.apache.maven.project.path.PathTranslator</role>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.settings.MavenSettingsBuilder</role>
- </requirement>
- <requirement>
<role>org.codehaus.plexus.component.configurator.ComponentConfigurator</role>
</requirement>
<requirement>
@@ -38,25 +32,11 @@
</requirement>
</requirements>
</component>
+
+ <!-- Duplicated from Maven core as it is used in the plugin manager -->
<component>
<role>org.apache.maven.project.path.PathTranslator</role>
<implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
- </component>
- <component>
- <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
- <implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.settings.MavenSettingsBuilder</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.settings.MavenSettingsBuilder</role>
- <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
- <configuration>
- <settingsPath>${user.home}/.m2/settings.xml</settingsPath>
- </configuration>
</component>
<!-- Duplicated from Maven artifact as it is used in the plugin manager -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org