You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/08/04 13:10:53 UTC
svn commit: r428694 - in /maven/repository-manager/trunk:
maven-repository-configuration/src/main/mdo/
maven-repository-core/src/main/java/org/apache/maven/repository/configuration/
maven-repository-webapp/ maven-repository-webapp/src/main/java/org/apa...
Author: brett
Date: Fri Aug 4 04:10:50 2006
New Revision: 428694
URL: http://svn.apache.org/viewvc?rev=428694&view=rev
Log:
[MRM-138] move local repository to a permanent location
Modified:
maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo
maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java
maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java
maven/repository-manager/trunk/maven-repository-webapp/pom.xml
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java
Modified: maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo?rev=428694&r1=428693&r2=428694&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo (original)
+++ maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo Fri Aug 4 04:10:50 2006
@@ -25,6 +25,14 @@
</association>
</field>
<field>
+ <name>localRepository</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ <description>
+ The location of the local repository.
+ </description>
+ </field>
+ <field>
<name>indexPath</name>
<version>1.0.0</version>
<type>String</type>
@@ -67,6 +75,11 @@
<codeSegment>
<version>1.0.0</version>
<code><![CDATA[
+ public Configuration()
+ {
+ localRepository = new java.io.File( System.getProperty( "user.home" ), ".m2/repository" ).getAbsolutePath();
+ }
+
public boolean isValid()
{
boolean valid = true;
Modified: maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java?rev=428694&r1=428693&r2=428694&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java (original)
+++ maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java Fri Aug 4 04:10:50 2006
@@ -44,4 +44,12 @@
* @return the artifact repositories
*/
List createRepositories( Configuration configuration );
+
+ /**
+ * Create a local repository from the given configuration.
+ *
+ * @param configuration the configuration
+ * @return the local artifact repository
+ */
+ ArtifactRepository createLocalRepository( Configuration configuration );
}
Modified: maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java?rev=428694&r1=428693&r2=428694&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java (original)
+++ maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java Fri Aug 4 04:10:50 2006
@@ -65,4 +65,10 @@
return repositories;
}
+
+ public ArtifactRepository createLocalRepository( Configuration configuration )
+ {
+ ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) repositoryLayouts.get( "default" );
+ return repoFactory.createArtifactRepository( "local", configuration.getLocalRepository(), layout, null, null );
+ }
}
Modified: maven/repository-manager/trunk/maven-repository-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/pom.xml?rev=428694&r1=428693&r2=428694&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-webapp/pom.xml (original)
+++ maven/repository-manager/trunk/maven-repository-webapp/pom.xml Fri Aug 4 04:10:50 2006
@@ -65,6 +65,12 @@
<version>1.1-alpha-2</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ <version>1.0-beta-1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-10-SNAPSHOT</version>
Modified: maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java?rev=428694&r1=428693&r2=428694&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java (original)
+++ maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java Fri Aug 4 04:10:50 2006
@@ -28,11 +28,9 @@
import org.apache.maven.repository.configuration.ConfigurationStore;
import org.apache.maven.repository.configuration.ConfigurationStoreException;
import org.apache.maven.repository.configuration.ConfiguredRepositoryFactory;
-import org.apache.maven.repository.configuration.RepositoryConfiguration;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
import java.io.IOException;
import java.util.List;
@@ -101,21 +99,12 @@
Artifact artifact = artifactFactory.createProjectArtifact( groupId, artifactId, version );
// TODO: maybe we can decouple the assembly parts of the project builder from the repository handling to get rid of the temp repo
- MavenProject project = projectBuilder.buildFromRepository( artifact, repositories, getLocalRepository() );
+ ArtifactRepository localRepository = repositoryFactory.createLocalRepository( configuration );
+ MavenProject project = projectBuilder.buildFromRepository( artifact, repositories, localRepository );
model = project.getModel();
return SUCCESS;
- }
-
- private ArtifactRepository getLocalRepository()
- throws IOException
- {
- // TODO: do we want this to be configurable?
- RepositoryConfiguration configuration = new RepositoryConfiguration();
- configuration.setId( "local" );
- configuration.setDirectory( File.createTempFile( "repository", "local" ).getAbsolutePath() );
- return repositoryFactory.createRepository( configuration );
}
public Model getModel()