You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/04/09 14:04:29 UTC
svn commit: r1672304 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/
main/java/org/apache/maven/plugin/eclipse/writers/
main/resources/org/apache/maven/plugin/eclipse/
test/java/org/apache/maven/plugin/ecl...
Author: khmarbaise
Date: Thu Apr 9 12:04:28 2015
New Revision: 1672304
URL: http://svn.apache.org/r1672304
Log:
[MECLIPSE-697] Delete deprecated code
Patch of Joseph Walton applied.
Removed:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MakeArtifactsMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriterTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-21/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-23/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-24/
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1672304&r1=1672303&r2=1672304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Thu Apr 9 12:04:28 2015
@@ -44,7 +44,6 @@ import org.apache.maven.plugin.eclipse.r
import org.apache.maven.plugin.eclipse.writers.EclipseAjdtWriter;
import org.apache.maven.plugin.eclipse.writers.EclipseClasspathWriter;
import org.apache.maven.plugin.eclipse.writers.EclipseManifestWriter;
-import org.apache.maven.plugin.eclipse.writers.EclipseOSGiManifestWriter;
import org.apache.maven.plugin.eclipse.writers.EclipseProjectWriter;
import org.apache.maven.plugin.eclipse.writers.EclipseWriterConfig;
import org.apache.maven.plugin.eclipse.writers.workspace.EclipseSettingsWriter;
@@ -129,10 +128,6 @@ public class EclipsePlugin
private static final String BUILDER_WST_FACET = "org.eclipse.wst.common.project.facet.core.builder"; //$NON-NLS-1$
- private static final String BUILDER_PDE_MANIFEST = "org.eclipse.pde.ManifestBuilder"; //$NON-NLS-1$
-
- private static final String BUILDER_PDE_SCHEMA = "org.eclipse.pde.SchemaBuilder"; //$NON-NLS-1$
-
private static final String BUILDER_AJDT_CORE_JAVA = "org.eclipse.ajdt.core.ajbuilder"; //$NON-NLS-1$
private static final String NATURE_WST_MODULE_CORE_NATURE = "org.eclipse.wst.common.modulecore.ModuleCoreNature"; //$NON-NLS-1$
@@ -141,16 +136,12 @@ public class EclipsePlugin
private static final String NATURE_JEM_WORKBENCH_JAVA_EMF = "org.eclipse.jem.workbench.JavaEMFNature"; //$NON-NLS-1$
- private static final String NATURE_PDE_PLUGIN = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
-
private static final String NATURE_AJDT_CORE_JAVA = "org.eclipse.ajdt.ui.ajnature"; //$NON-NLS-1$
protected static final String COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER = "org.eclipse.jdt.launching.JRE_CONTAINER"; //$NON-NLS-1$
protected static final String ASPECTJ_RT_CONTAINER = "org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"; //$NON-NLS-1$
- protected static final String REQUIRED_PLUGINS_CONTAINER = "org.eclipse.pde.core.requiredPlugins"; //$NON-NLS-1$
-
// warning, order is important for binary search
public static final String[] WTP_SUPPORTED_VERSIONS = new String[] { "1.0", "1.5", "2.0", "R7", "none" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -335,16 +326,6 @@ public class EclipsePlugin
private String wtpContextName;
/**
- * Is it an PDE project? If yes, the plugin adds the necessary natures and build commands to the .project file.
- * Additionally it copies all libraries to a project local directory and references them instead of referencing the
- * files in the local Maven repository. It also ensured that the "Bundle-Classpath" in META-INF/MANIFEST.MF is
- * synchronized.
- *
- * @parameter expression="${eclipse.pde}" default-value="false"
- */
- private boolean pde;
-
- /**
* Is it an AJDT project? If yes, the plugin adds the necessary natures and build commands to the .project file.
*/
private boolean ajdt;
@@ -647,11 +628,6 @@ public class EclipsePlugin
return isJavaProject;
}
- protected final boolean isPdeProject()
- {
- return pde;
- }
-
/**
* Getter for <code>buildcommands</code>.
*
@@ -921,8 +897,7 @@ public class EclipsePlugin
// ear projects don't contain java sources
// pde projects are always java projects
isJavaProject =
- pde
- || ( Constants.LANGUAGE_JAVA.equals( artifactHandler.getLanguage() ) && !Constants.PROJECT_PACKAGING_EAR.equals( packaging ) );
+ ( Constants.LANGUAGE_JAVA.equals( artifactHandler.getLanguage() ) && !Constants.PROJECT_PACKAGING_EAR.equals( packaging ) );
if ( sourceIncludes == null )
{
@@ -1100,7 +1075,8 @@ public class EclipsePlugin
if ( "eclipse-plugin".equals( packaging ) )
{
- pde = true;
+ getLog().info( Messages.getString( "EclipsePlugin.pdepackaging" ) ); //$NON-NLS-1$
+ return false;
}
if ( eclipseProjectDir == null )
@@ -1215,12 +1191,6 @@ public class EclipsePlugin
new EclipseWtpApplicationXMLWriter().init( getLog(), config ).write();
}
- if ( pde )
- {
- this.getLog().info( "The Maven Eclipse plugin runs in 'pde'-mode." );
- new EclipseOSGiManifestWriter().init( getLog(), config ).write();
- }
-
// NOTE: This one MUST be after EclipseClasspathwriter, and possibly others,
// since currently EclipseClasspathWriter does some magic to detect nested
// output folders and modifies the configuration by adding new (Ant) builders.
@@ -1382,7 +1352,6 @@ public class EclipsePlugin
config.setEclipseProjectDirectory( eclipseProjectDir );
config.setLocalRepository( localRepository );
config.setOSGIManifestFile( manifest );
- config.setPde( pde );
config.setProject( project );
config.setProjectBaseDir( projectBaseDir );
config.setProjectnatures( projectnatures );
@@ -1516,11 +1485,6 @@ public class EclipsePlugin
}
}
- if ( pde )
- {
- projectnatures.add( NATURE_PDE_PLUGIN );
- }
-
}
/**
@@ -1542,10 +1506,6 @@ public class EclipsePlugin
+ getWorkspaceConfiguration().getDefaultClasspathContainer() );
classpathContainers.add( getWorkspaceConfiguration().getDefaultClasspathContainer() );
}
- if ( pde )
- {
- classpathContainers.add( REQUIRED_PLUGINS_CONTAINER );
- }
if ( ajdt )
{
@@ -1597,12 +1557,6 @@ public class EclipsePlugin
// WTP 0.7 builder
buildcommands.add( new BuildCommand( BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER ) );
}
-
- if ( pde )
- {
- buildcommands.add( new BuildCommand( BUILDER_PDE_MANIFEST ) );
- buildcommands.add( new BuildCommand( BUILDER_PDE_SCHEMA ) );
- }
}
public final EclipseSourceDir[] buildDirectoryList( MavenProject project, File basedir, File buildOutputDirectory )
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java?rev=1672304&r1=1672303&r2=1672304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java Thu Apr 9 12:04:28 2015
@@ -148,15 +148,10 @@ public class EclipseAjdtWriter
String path;
- if ( dep.isReferencedProject() && !config.isPde() )
+ if ( dep.isReferencedProject() )
{
path = "/" + dep.getEclipseProjectName(); //$NON-NLS-1$
}
- else if ( dep.isReferencedProject() && config.isPde() )
- {
- // don't do anything, referenced projects are automatically handled by eclipse in PDE builds
- return;
- }
else
{
File artifactPath = dep.getFile();
@@ -181,34 +176,18 @@ public class EclipseAjdtWriter
{
File localRepositoryFile = new File( config.getLocalRepository().getBasedir() );
- // if the dependency is not provided and the plugin runs in "pde mode", the dependency is
- // added to the Bundle-Classpath:
- if ( config.isPde() && ( dep.isProvided() || dep.isOsgiBundle() ) )
- {
- return;
- }
- else if ( config.isPde() && !dep.isProvided() && !dep.isTestDependency() )
+ String fullPath = artifactPath.getPath();
+ String relativePath =
+ IdeUtils.toRelativeAndFixSeparator( localRepositoryFile, new File( fullPath ), false );
+
+ if ( !new File( relativePath ).isAbsolute() )
{
- // path for link created in .project, not to the actual file
- path = dep.getFile().getName();
+ path = EclipseClasspathWriter.M2_REPO + "/" //$NON-NLS-1$
+ + relativePath;
}
- // running in PDE mode and the dependency is provided means, that it is provided by
- // the target platform. This case is covered by adding the plugin container
else
{
- String fullPath = artifactPath.getPath();
- String relativePath =
- IdeUtils.toRelativeAndFixSeparator( localRepositoryFile, new File( fullPath ), false );
-
- if ( !new File( relativePath ).isAbsolute() )
- {
- path = EclipseClasspathWriter.M2_REPO + "/" //$NON-NLS-1$
- + relativePath;
- }
- else
- {
- path = relativePath;
- }
+ path = relativePath;
}
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=1672304&r1=1672303&r2=1672304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java Thu Apr 9 12:04:28 2015
@@ -430,16 +430,11 @@ public class EclipseClasspathWriter
String sourcepath = null;
String javadocpath = null;
- if ( dep.isReferencedProject() && !config.isPde() )
+ if ( dep.isReferencedProject() )
{
path = "/" + dep.getEclipseProjectName(); //$NON-NLS-1$
kind = ATTR_SRC;
}
- else if ( dep.isReferencedProject() && config.isPde() )
- {
- // don't do anything, referenced projects are automatically handled by eclipse in PDE builds
- return;
- }
else
{
File artifactPath = dep.getFile();
@@ -466,38 +461,20 @@ public class EclipseClasspathWriter
{
File localRepositoryFile = new File( config.getLocalRepository().getBasedir() );
- // if the dependency is not provided and the plugin runs in "pde mode", the dependency is
- // added to the Bundle-Classpath:
- if ( config.isPde() && ( dep.isProvided() || dep.isOsgiBundle() ) )
- {
- return;
- }
- else if ( config.isPde() && !dep.isProvided() && !dep.isTestDependency() )
- {
- // path for link created in .project, not to the actual file
- path = dep.getFile().getName();
+ String fullPath = artifactPath.getPath();
+ String relativePath =
+ IdeUtils.toRelativeAndFixSeparator( localRepositoryFile, new File( fullPath ), false );
- kind = ATTR_LIB;
+ if ( !new File( relativePath ).isAbsolute() )
+ {
+ path = M2_REPO + "/" //$NON-NLS-1$
+ + relativePath;
+ kind = ATTR_VAR; //$NON-NLS-1$
}
- // running in PDE mode and the dependency is provided means, that it is provided by
- // the target platform. This case is covered by adding the plugin container
else
{
- String fullPath = artifactPath.getPath();
- String relativePath =
- IdeUtils.toRelativeAndFixSeparator( localRepositoryFile, new File( fullPath ), false );
-
- if ( !new File( relativePath ).isAbsolute() )
- {
- path = M2_REPO + "/" //$NON-NLS-1$
- + relativePath;
- kind = ATTR_VAR; //$NON-NLS-1$
- }
- else
- {
- path = relativePath;
- kind = ATTR_LIB;
- }
+ path = relativePath;
+ kind = ATTR_LIB;
}
if ( dep.getSourceAttachment() != null )
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=1672304&r1=1672303&r2=1672304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java Thu Apr 9 12:04:28 2015
@@ -202,20 +202,16 @@ public class EclipseProjectWriter
writer.startElement( "projects" ); //$NON-NLS-1$
IdeDependency[] dependencies = config.getDeps();
-
- // referenced projects should not be added for plugins
- if ( !config.isPde() )
- {
- List duplicates = new ArrayList();
- for (IdeDependency dep : dependencies) {
- // Avoid duplicates entries when same project is refered using multiple types
- // (ejb, test-jar ...)
- if (dep.isReferencedProject() && !duplicates.contains(dep.getEclipseProjectName())) {
- writer.startElement("project"); //$NON-NLS-1$
- writer.writeText(dep.getEclipseProjectName());
- writer.endElement();
- duplicates.add(dep.getEclipseProjectName());
- }
+
+ List duplicates = new ArrayList();
+ for (IdeDependency dep : dependencies) {
+ // Avoid duplicates entries when same project is refered using multiple types
+ // (ejb, test-jar ...)
+ if (dep.isReferencedProject() && !duplicates.contains(dep.getEclipseProjectName())) {
+ writer.startElement("project"); //$NON-NLS-1$
+ writer.writeText(dep.getEclipseProjectName());
+ writer.endElement();
+ duplicates.add(dep.getEclipseProjectName());
}
}
@@ -241,7 +237,7 @@ public class EclipseProjectWriter
boolean addLinks = !config.getProjectBaseDir().equals( config.getEclipseProjectDirectory() );
- if ( addLinks || ( config.isPde() && dependencies.length > 0 ) || linkedResources.size() > 0 )
+ if ( addLinks || linkedResources.size() > 0 )
{
writer.startElement( "linkedResources" ); //$NON-NLS-1$
// preserve the symbolic links
@@ -270,18 +266,6 @@ public class EclipseProjectWriter
}
- if ( config.isPde() )
- {
- for (IdeDependency dep : dependencies) {
- if (dep.isAddedToClasspath() && !dep.isProvided() && !dep.isReferencedProject()
- && !dep.isTestDependency() && !dep.isOsgiBundle()) {
- String name = dep.getFile().getName();
- addLink(writer, name, IdeUtils.fixSeparator(IdeUtils.getCanonicalPath(dep.getFile())),
- LINK_TYPE_FILE);
- }
- }
- }
-
writer.endElement(); // linkedResources
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java?rev=1672304&r1=1672303&r2=1672304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java Thu Apr 9 12:04:28 2015
@@ -86,11 +86,6 @@ public class EclipseWriterConfig
private File osgiManifestFile;
/**
- * PDE mode.
- */
- private boolean pde;
-
- /**
* Project natures.
*/
private List projectnatures;
@@ -111,13 +106,6 @@ public class EclipseWriterConfig
private List classpathContainers;
/**
- * Appends the version number to the project name if <tt>true</tt>.
- *
- * @deprecated use {@link #projectNameTemplate}
- */
- private boolean addVersionToProjectName;
-
- /**
* @see EclipsePlugin#getProjectNameTemplate()
*/
private String projectNameTemplate;
@@ -345,28 +333,8 @@ public class EclipseWriterConfig
}
/**
- * Getter for <code>pde</code>.
- *
- * @return Returns the pde.
- */
- public boolean isPde()
- {
- return pde;
- }
-
- /**
- * Setter for <code>pde</code>.
- *
- * @param pde The pde to set.
- */
- public void setPde( boolean pde )
- {
- this.pde = pde;
- }
-
- /**
* Getter for <code>buildCommands</code>.
- *
+ *
* @return Returns the buildCommands.
*/
public List getBuildCommands()
@@ -444,26 +412,6 @@ public class EclipseWriterConfig
this.projectBaseDir = projectBaseDir;
}
- /**
- * Getter for <code>addVersionToProjectName</code>.
- *
- * @deprecated use {@link #getProjectNameTemplate()}
- */
- public boolean isAddVersionToProjectName()
- {
- return addVersionToProjectName;
- }
-
- /**
- * Setter for <code>addVersionToProjectName</code>.
- *
- * @deprecated use {@link #setProjectNameTemplate(String)}
- */
- public void setAddVersionToProjectName( boolean addVersionToProjectName )
- {
- this.addVersionToProjectName = addVersionToProjectName;
- }
-
public void setProjectNameTemplate( String projectNameTemplate )
{
this.projectNameTemplate = projectNameTemplate;
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties?rev=1672304&r1=1672303&r2=1672304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties Thu Apr 9 12:04:28 2015
@@ -17,6 +17,7 @@
EclipsePlugin.missingpom=There must be a POM in the current working directory for the Eclipse plugin to work.
EclipsePlugin.pompackaging=Not running eclipse plugin goal for pom project
+EclipsePlugin.pdepackaging="eclipse-plugin" no longer supported
EclipsePlugin.notadir=Not a directory: "{0}"
EclipsePlugin.cantcreatedir=Can't create directory "{0}"
EclipsePlugin.erroropeningfile=Exception while opening file.
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java?rev=1672304&r1=1672303&r2=1672304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java Thu Apr 9 12:04:28 2015
@@ -251,50 +251,6 @@ public class EclipsePluginIT
}
/**
- * PDE support.
- *
- * @throws Exception any exception thrown during test
- */
- public void testProject21()
- throws Exception
- {
- testProject( "project-21" );
- }
-
- /**
- * PDE support using eclipse-plugin packaging.
- *
- * @throws Exception any exception thrown during test
- */
- public void testProject22()
- throws Exception
- {
- testProject( "project-22" );
- }
-
- /**
- * Additional config files using "additionalConfig" property.
- *
- * @throws Exception any exception thrown during test
- */
- public void testProject23()
- throws Exception
- {
- testProject( "project-23" );
- }
-
- /**
- * Test rewriting of OSGI manifest files.
- *
- * @throws Exception any exception thrown during test
- */
- public void testProject24()
- throws Exception
- {
- testProject( "project-24" );
- }
-
- /**
* Test source exclude/include.
*
* @throws Exception any exception thrown during test
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java?rev=1672304&r1=1672303&r2=1672304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java Thu Apr 9 12:04:28 2015
@@ -44,21 +44,6 @@ public class EclipseWorkspaceIT
super.setUp();
}
- public void testWorkspace01()
- throws Exception
- {
- String projectName = "workspace-01";
-
- FileUtils.deleteDirectory( this.getTestWorkspaceWorkDirectory( "add-maven-repo" ) );
- testWorkspace( projectName, "add-maven-repo" );
-
- this.validateM2REPOVar( projectName );
-
- File eclipseJDTUIPrefsFile = new File( this.getOutputDirectory( projectName ), ECLIPSE_JDT_UI_PREFS_PATH );
-
- assertFalse( eclipseJDTUIPrefsFile.exists() );
- }
-
public void testWorkspace02()
throws Exception
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java?rev=1672304&r1=1672303&r2=1672304&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java Thu Apr 9 12:04:28 2015
@@ -18,25 +18,28 @@
*/
package org.apache.maven.plugin.ide;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assume.assumeTrue;
+
import java.io.File;
import java.io.IOException;
import java.util.Collections;
-import junit.framework.TestCase;
-
import org.apache.maven.model.Dependency;
import org.codehaus.plexus.util.Os;
+import org.junit.Test;
/**
* Test for {@link IdeUtils}
- *
+ *
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @version $Id$
*/
public class IdeUtilsTest
- extends TestCase
{
+ @Test
public void testGetProjectNameStringIdeDependency()
{
IdeDependency dependency = new IdeDependency();
@@ -60,16 +63,15 @@ public class IdeUtilsTest
/**
* When the file to add is on a different drive and an absolute path expect that the returned value is the same as
* the file to add (but with /s)
- *
+ *
* @throws Exception
*/
+ @Test
public void testToRelativeAndFixSeparator_WhereOnDifferentDrivesAndAbsolutePaths()
throws Exception
{
- if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- return;
- }
+ assumeTrue(Os.isFamily( Os.FAMILY_WINDOWS ) );
+
File basedir = new File( "C:\\TEMP\\EclipsePlugin.unitTest.1165557188766\\" );
File fileToAdd = new File( "D:\\ide\\workspace\\maven\\maven-eclipse-plugin\\target\\main-output" );
try
@@ -95,13 +97,11 @@ public class IdeUtilsTest
*
* @throws Exception
*/
+ @Test
public void testToRelativeAndFixSeparator_WhereOnDifferentDrivesAndFileToAddRelative()
throws Exception
{
- if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- return;
- }
+ assumeTrue(Os.isFamily( Os.FAMILY_WINDOWS ) );
File basedir = new File( "C:\\TEMP\\EclipsePlugin.unitTest.1165557188766\\" );
File fileToAdd = new File( "target/main-output" );
@@ -123,13 +123,11 @@ public class IdeUtilsTest
*
* @throws Exception
*/
+ @Test
public void testToRelativeAndFixSeparator_MECLIPSE_261()
throws Exception
{
- if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- return;
- }
+ assumeTrue(Os.isFamily( Os.FAMILY_WINDOWS ) );
File basedir = new File( new File( "" ).getAbsolutePath().substring( 0, 3 ) );
File fileToAdd = new File( "target/main-output" );
@@ -139,7 +137,8 @@ public class IdeUtilsTest
assertEquals( expected, actual );
}
-
+
+ @Test
public void testGetArtifactVersion()
{
Dependency dep = new Dependency();