You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2008/02/04 23:11:26 UTC
svn commit: r618463 - in
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse:
EclipseCleanMojo.java writers/rad/RadManifestWriter.java
Author: aheritier
Date: Mon Feb 4 14:11:26 2008
New Revision: 618463
URL: http://svn.apache.org/viewvc?rev=618463&view=rev
Log:
MECLIPSE-316 : RadCleanMojo does not clean .war files
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java?rev=618463&r1=618462&r2=618463&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java Mon Feb 4 14:11:26 2008
@@ -94,13 +94,14 @@
* @parameter expression="${eclipse.skip}" default-value="false"
*/
private boolean skip;
-
- /**
- * additional generic configuration files for eclipse
- * @parameter
+
+ /**
+ * additional generic configuration files for eclipse
+ *
+ * @parameter
*/
- private EclipseConfigFile[] additionalConfig;
-
+ private EclipseConfigFile[] additionalConfig;
+
/**
* @see org.apache.maven.plugin.AbstractMojo#execute()
*/
@@ -131,14 +132,14 @@
{
delete( settingsDir );
}
-
- if (additionalConfig != null )
- {
- for ( int i = 0; i < additionalConfig.length; i++)
- {
- delete( new File( basedir, additionalConfig[i].getName() ) );
- }
- }
+
+ if ( additionalConfig != null )
+ {
+ for ( int i = 0; i < additionalConfig.length; i++ )
+ {
+ delete( new File( basedir, additionalConfig[i].getName() ) );
+ }
+ }
cleanExtras();
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java?rev=618463&r1=618462&r2=618463&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java Mon Feb 4 14:11:26 2008
@@ -78,7 +78,7 @@
File warSourceDirectory =
new File( IdeUtils.getPluginSetting( config.getProject(), JeeUtils.ARTIFACT_MAVEN_WAR_PLUGIN,
"warSourceDirectory", //$NON-NLS-1$
- config.getProject().getBasedir() + DEFAULT_WEBAPP_RESOURCE_DIR ) ); //$NON-NLS-1$
+ DEFAULT_WEBAPP_RESOURCE_DIR ) ); //$NON-NLS-1$
String webContentDir =
IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), warSourceDirectory, false );