You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2006/01/01 22:34:55 UTC
svn commit: r360552 - in
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers:
EclipseSettingsWriter.java EclipseWtpSettingsWriter.java
Author: fgiust
Date: Sun Jan 1 13:34:50 2006
New Revision: 360552
URL: http://svn.apache.org/viewcvs?rev=360552&view=rev
Log:
fix .settings directory path for WTP 1.0
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java?rev=360552&r1=360551&r2=360552&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java Sun Jan 1 13:34:50 2006
@@ -96,7 +96,7 @@
// write the settings, if needed
if ( !coreSettings.isEmpty() )
{
- File settingsDir = new File( getEclipseProjectDirectory(), "/" + DIR_DOT_SETTINGS ); //$NON-NLS-1$
+ File settingsDir = new File( getEclipseProjectDirectory(), DIR_DOT_SETTINGS ); //$NON-NLS-1$
settingsDir.mkdirs();
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java?rev=360552&r1=360551&r2=360552&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java Sun Jan 1 13:34:50 2006
@@ -93,7 +93,7 @@
throws MojoExecutionException
{
// delete the .settings directory (if exists)
- File settingsDir = new File( DIR_WTP_SETTINGS );
+ File settingsDir = new File( getEclipseProjectDirectory(), DIR_WTP_SETTINGS );
if ( settingsDir.isDirectory() && !settingsDir.delete() )
{
// force delete
@@ -111,11 +111,11 @@
}
// create a .settings directory
- FileUtils.mkdir( DIR_WTP_SETTINGS );
+ settingsDir.mkdirs();
FileWriter w;
try
{
- w = new FileWriter( new File( getEclipseProjectDirectory() + "/" + DIR_WTP_SETTINGS, FILE_DOT_COMPONENT ) ); //$NON-NLS-1$
+ w = new FileWriter( new File( settingsDir, FILE_DOT_COMPONENT ) );
}
catch ( IOException ex )
{
@@ -131,7 +131,7 @@
// Write out facet core xml
try
{
- w = new FileWriter( new File( getEclipseProjectDirectory() + "/" + DIR_WTP_SETTINGS, FILE_FACET_CORE_XML ) ); //$NON-NLS-1$
+ w = new FileWriter( new File( settingsDir, FILE_FACET_CORE_XML ) );
}
catch ( IOException ex )
{