Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add-maven-repo was overwriting all the existing eclipse settins. 

Fixed to preserve existing properties and only add/update the M2_REPO var

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@329579 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Fabrizio Giustina 2005-10-30 15:06:04 +00:00
parent 62a349b7b2
commit 3f1e75f324
2 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java
View File

@ -16,10 +16,14 @@ package org.apache.maven.plugin.eclipse;
* limitations under the License. * limitations under the License.
*/ */
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
@ -29,7 +33,8 @@ import org.apache.maven.plugin.MojoExecutionException;
* *
* @goal add-maven-repo * @goal add-maven-repo
*/ */
public class AddMavenRepoMojo extends AbstractMojo public class AddMavenRepoMojo
extends AbstractMojo
{ {
/** /**
* Location of the <code>Eclipse</code> workspace that holds your configuration and source. * Location of the <code>Eclipse</code> workspace that holds your configuration and source.
@ -42,7 +47,7 @@ public class AddMavenRepoMojo extends AbstractMojo
* @required * @required
*/ */
private String workspace; private String workspace;
/** /**
* @parameter expression="${localRepository}" * @parameter expression="${localRepository}"
* @required * @required
@ -50,28 +55,48 @@ public class AddMavenRepoMojo extends AbstractMojo
*/ */
private ArtifactRepository localRepository; private ArtifactRepository localRepository;
public void execute() throws MojoExecutionException public void execute()
throws MojoExecutionException
{ {
File workDir = new File( workspace, ".metadata/.plugins/org.eclipse.core.runtime/.settings" ); File workDir = new File( workspace, ".metadata/.plugins/org.eclipse.core.runtime/.settings" ); //$NON-NLS-1$
workDir.mkdirs(); workDir.mkdirs();
File f = new File( workDir.getAbsolutePath(), "org.eclipse.jdt.core.prefs" ); Properties props = new Properties();
File f = new File( workDir.getAbsolutePath(), "org.eclipse.jdt.core.prefs" ); //$NON-NLS-1$
// preserve old settings
if ( f.exists() )
{
try
{
props.load( new FileInputStream( f ) );
}
catch ( FileNotFoundException e )
{
throw new MojoExecutionException( Messages
.getString( "EclipsePlugin.cantreadfile", f.getAbsolutePath() ), e ); //$NON-NLS-1$
}
catch ( IOException e )
{
throw new MojoExecutionException( Messages
.getString( "EclipsePlugin.cantreadfile", f.getAbsolutePath() ), e ); //$NON-NLS-1$
}
}
props.put( "\norg.eclipse.jdt.core.classpathVariable.M2_REPO", localRepository.getBasedir() ); //$NON-NLS-1$
try try
{ {
FileWriter fWriter = new FileWriter( f ); OutputStream os = new FileOutputStream( f );
props.store( os, null );
fWriter.write( "\norg.eclipse.jdt.core.classpathVariable.M2_REPO=" + localRepository.getBasedir() ); os.close();
fWriter.flush();
fWriter.close();
} }
catch( IOException ioe ) catch ( IOException ioe )
{ {
throw new MojoExecutionException( "Unable to write to file: " + f.getAbsolutePath() ); throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantwritetofile", //$NON-NLS-1$
f.getAbsolutePath() ) );
} }
} }
} }

2
maven-plugins/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
View File

@ -4,6 +4,8 @@ EclipsePlugin.notadir=Not a directory: "{0}"
EclipsePlugin.cantcreatedir=Can''t create directory "{0}" EclipsePlugin.cantcreatedir=Can''t create directory "{0}"
EclipsePlugin.erroropeningfile=Exception while opening file. EclipsePlugin.erroropeningfile=Exception while opening file.
EclipsePlugin.cantcanonicalize=Can''t canonicalize system path: {0} EclipsePlugin.cantcanonicalize=Can''t canonicalize system path: {0}
EclipsePlugin.cantwritetofile=Unable to write to file: {0}
EclipsePlugin.cantreadfile=Unable to read file: {0}
EclipsePlugin.cantresolvesources=Cannot resolve source artifact. Artifact id: {0} (Message: {1}) EclipsePlugin.cantresolvesources=Cannot resolve source artifact. Artifact id: {0} (Message: {1})
EclipsePlugin.errorresolvingsources=Error resolving source artifact. Artifact id: {0} (Message: {1}) EclipsePlugin.errorresolvingsources=Error resolving source artifact. Artifact id: {0} (Message: {1})
EclipsePlugin.wrote=Wrote Eclipse project for "{0}" to {1}. EclipsePlugin.wrote=Wrote Eclipse project for "{0}" to {1}.