You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/11/10 00:30:42 UTC
svn commit: r473139 - in
/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/
main/java/org/apache/maven/plugin/eclipse/writers/rad/
main/java/org/apache/maven/plugin/ide/ test/java/org/apache/maven/...
Author: jdcasey
Date: Thu Nov 9 15:30:40 2006
New Revision: 473139
URL: http://svn.apache.org/viewvc?view=rev&rev=473139
Log:
All tests run with maven-invoker. Planning to merge to the trunk as soon as I talk to Kenney about the use of the invoker.
Modified:
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-01/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-06/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-07/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-08/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-09/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-11/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-14/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-18/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-19/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-21/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-24/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml
maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Thu Nov 9 15:30:40 2006
@@ -273,6 +273,11 @@
* Not a plugin parameter. Is this a java project?
*/
private boolean isJavaProject;
+
+ protected boolean isJavaProject()
+ {
+ return isJavaProject;
+ }
/**
* Getter for <code>buildcommands</code>.
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java Thu Nov 9 15:30:40 2006
@@ -67,8 +67,6 @@
private static final String ORG_ECLIPSE_JDT_CORE_JAVANATURE = "org.eclipse.jdt.core.javanature";
- private boolean isJavaProject;
-
/**
* The context root of the webapplication. This parameter is only used when
* the current project is a war project, else it will be ignored.
@@ -111,13 +109,6 @@
{
super.writeExtraConfiguration( config );
- if ( isJavaProject )
- {
- // special case must be done first because it can add stuff to the classpath that will be
- // written by the superclass
- new RadManifestWriter().init( getLog(), config ).write();
- }
-
new RadJ2EEWriter().init( getLog(), config ).write();
new RadWebSettingsWriter( this.warContextRoot ).init( getLog(), config ).write();
@@ -134,20 +125,21 @@
/**
* make room for a Manifest file. use a generated resource for JARS and for
* WARS use the manifest in the webapp/meta-inf directory.
+ * @throws MojoExecutionException
*/
private void addManifestResource( EclipseWriterConfig config )
+ throws MojoExecutionException
{
- RadManifestWriter manifestWriter = new RadManifestWriter();
- manifestWriter.init( getLog(), config );
-
- if ( manifestWriter.getMetaInfBaseDirectory( getExecutedProject() ) != null )
+ if ( isJavaProject() )
{
- return;
+ // special case must be done first because it can add stuff to the classpath that will be
+ // written by the superclass
+ new RadManifestWriter().init( getLog(), config ).write();
}
-
+
String packaging = getExecutedProject().getPackaging();
- if ( this.isJavaProject && !Constants.PROJECT_PACKAGING_EAR.equals( packaging )
+ if ( isJavaProject() && !Constants.PROJECT_PACKAGING_EAR.equals( packaging )
&& !Constants.PROJECT_PACKAGING_WAR.equals( packaging )
&& !Constants.PROJECT_PACKAGING_EJB.equals( packaging ) )
{
@@ -212,7 +204,7 @@
buildcommands.add( COM_IBM_WTP_J2EE_LIB_COPY_BUILDER );
buildcommands.add( COM_IBM_SSE_MODEL_STRUCTUREDBUILDER );
}
- else if ( this.isJavaProject )
+ else if ( isJavaProject() )
{
buildcommands.add( ORG_ECLIPSE_JDT_CORE_JAVABUILDER );
buildcommands.add( COM_IBM_SSE_MODEL_STRUCTUREDBUILDER );
@@ -247,7 +239,7 @@
projectnatures.add( COM_IBM_WTP_EJB_EJBNATURE );
projectnatures.add( ORG_ECLIPSE_JDT_CORE_JAVANATURE );
}
- else if ( this.isJavaProject )
+ else if ( isJavaProject() )
{
projectnatures.add( ORG_ECLIPSE_JDT_CORE_JAVANATURE );
}
@@ -304,7 +296,9 @@
{
super.setupExtras();
- EclipseWriterConfig config = createEclipseWriterConfig( new IdeDependency[0] );
+ IdeDependency[] deps = doDependencyResolution();
+
+ EclipseWriterConfig config = createEclipseWriterConfig( deps );
addManifestResource( config );
}
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java Thu Nov 9 15:30:40 2006
@@ -50,7 +50,7 @@
*
* @return the apsolute path to the META-INF directory
*/
- public String getMetaInfBaseDirectory( MavenProject project )
+ private String getMetaInfBaseDirectory( MavenProject project )
{
String metaInfBaseDirectory = null;
Iterator iterator = project.getResources().iterator();
@@ -70,6 +70,8 @@
{
metaInfBaseDirectory = config.getProject().getBasedir().getAbsolutePath() + File.separatorChar + WEBAPP_RESOURCE_DIR;
+ System.out.println( "Using: " + metaInfBaseDirectory + " for location of META-INF in war project." );
+
if ( !new File( metaInfBaseDirectory + File.separatorChar + META_INF_DIRECTORY ).exists() )
{
metaInfBaseDirectory = null;
@@ -103,16 +105,21 @@
if ( metaInfBaseDirectory == null )
{
// TODO: if this really is an error, shouldn't we stop the build??
- log.error( Messages.getString( "EclipseCleanMojo.nofilefound", new Object[] { META_INF_DIRECTORY } ) );
- return;
+ throw new MojoExecutionException( Messages.getString( "EclipseCleanMojo.nofilefound", new Object[] { META_INF_DIRECTORY } ) );
}
Manifest manifest = createNewManifest();
File manifestFile = new File( metaInfBaseDirectory + File.separatorChar + META_INF_DIRECTORY + File.separatorChar + MANIFEST_MF_FILENAME );
+ System.out.println( "MANIFEST LOCATION: " + manifestFile );
+
if ( shouldNewManifestFileBeWritten( manifest, manifestFile ) )
{
+ System.out.println( "Writing manifest..." );
+
+ manifestFile.getParentFile().mkdirs();
+
try
{
FileOutputStream stream = new FileOutputStream( manifestFile );
@@ -214,6 +221,11 @@
*/
private boolean areManifestsEqual( Manifest manifest, Manifest existingManifest )
{
+ if ( existingManifest == null )
+ {
+ return false;
+ }
+
Set keys = new HashSet();
Attributes existingMap = existingManifest.getMainAttributes();
Attributes newMap = manifest.getMainAttributes();
@@ -306,6 +318,11 @@
private Manifest readExistingManifest( File manifestFile )
throws IOException
{
+ if ( !manifestFile.exists() )
+ {
+ return null;
+ }
+
Manifest existingManifest = new Manifest();
FileInputStream inputStream = new FileInputStream( manifestFile );
existingManifest.read( inputStream );
@@ -323,8 +340,10 @@
* @param manifestFile
* the file where the manifest
* @return if the new manifest file must be written
+ * @throws MojoExecutionException
*/
private boolean shouldNewManifestFileBeWritten( Manifest manifest, File manifestFile )
+ throws MojoExecutionException
{
try
{
@@ -337,7 +356,7 @@
}
catch ( Exception e )
{
- log.debug( Messages.getString( "EclipseCleanMojo.nofilefound", manifestFile.getAbsolutePath() ) );
+ throw new MojoExecutionException( Messages.getString( "EclipseCleanMojo.nofilefound", manifestFile.getAbsolutePath() ), e );
}
return true;
}
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java Thu Nov 9 15:30:40 2006
@@ -368,6 +368,11 @@
private List missingSourceDependencies = new ArrayList();
/**
+ * Cached array of resolved dependencies.
+ */
+ private IdeDependency[] ideDeps;
+
+ /**
* @see org.codehaus.plexus.logging.LogEnabled#enableLogging(org.codehaus.plexus.logging.Logger)
*/
public void enableLogging( Logger logger )
@@ -408,162 +413,165 @@
protected IdeDependency[] doDependencyResolution()
throws MojoExecutionException
{
- MavenProject project = getProject();
- ArtifactRepository localRepo = getLocalRepository();
-
- List dependencies = getProject().getDependencies();
-
- // Collect the list of resolved IdeDependencies.
- List dependencyList = new ArrayList();
-
- if ( dependencies != null )
+ if ( ideDeps == null )
{
- Map managedVersions = createManagedVersionMap( getArtifactFactory(), project.getId(), project
- .getDependencyManagement() );
+ MavenProject project = getProject();
+ ArtifactRepository localRepo = getLocalRepository();
- ArtifactResolutionResult artifactResolutionResult = null;
+ List deps = getProject().getDependencies();
- try
+ // Collect the list of resolved IdeDependencies.
+ List dependencies = new ArrayList();
+
+ if ( deps != null )
{
+ Map managedVersions = createManagedVersionMap( getArtifactFactory(), project.getId(), project
+ .getDependencyManagement() );
- List listeners = new ArrayList();
+ ArtifactResolutionResult artifactResolutionResult = null;
- if ( logger.isDebugEnabled() )
+ try
{
- listeners.add( new DebugResolutionListener( logger ) );
- }
-
- listeners.add( new WarningResolutionListener( logger ) );
- artifactResolutionResult = artifactCollector.collect( getProjectArtifacts(), project.getArtifact(),
- managedVersions, localRepo, project
- .getRemoteArtifactRepositories(),
- getArtifactMetadataSource(), null, listeners );
- }
- catch ( ArtifactResolutionException e )
- {
- getLog().debug( e.getMessage(), e );
- getLog().error(
- Messages
- .getString( "artifactresolution", new Object[] { //$NON-NLS-1$
- e.getGroupId(), e.getArtifactId(), e.getVersion(), e.getMessage() } ) );
-
- // if we are here artifactResolutionResult is null, create a project without dependencies but don't fail
- // (this could be a reactor projects, we don't want to fail everything)
- return new IdeDependency[0];
- }
+ List listeners = new ArrayList();
- // keep track of added reactor projects in order to avoid duplicates
- Set emittedReactorProjectId = new HashSet();
-
- for ( Iterator i = artifactResolutionResult.getArtifactResolutionNodes().iterator(); i.hasNext(); )
- {
+ if ( logger.isDebugEnabled() )
+ {
+ listeners.add( new DebugResolutionListener( logger ) );
+ }
- ResolutionNode node = (ResolutionNode) i.next();
- int dependencyDepth = node.getDepth();
- Artifact art = node.getArtifact();
- boolean isReactorProject = getUseProjectReferences() && isAvailableAsAReactorProject( art );
+ listeners.add( new WarningResolutionListener( logger ) );
- // don't resolve jars for reactor projects
- if ( !isReactorProject )
+ artifactResolutionResult = artifactCollector.collect( getProjectArtifacts(), project.getArtifact(),
+ managedVersions, localRepo, project
+ .getRemoteArtifactRepositories(),
+ getArtifactMetadataSource(), null, listeners );
+ }
+ catch ( ArtifactResolutionException e )
{
- try
- {
- artifactResolver.resolve( art, node.getRemoteRepositories(), localRepository );
- }
- catch ( ArtifactNotFoundException e )
- {
- getLog().debug( e.getMessage(), e );
- getLog().warn(
- Messages.getString( "artifactdownload", new Object[] { //$NON-NLS-1$
- e.getGroupId(),
- e.getArtifactId(),
- e.getVersion(),
- e.getMessage() } ) );
- }
- catch ( ArtifactResolutionException e )
- {
- getLog().debug( e.getMessage(), e );
- getLog().warn(
- Messages.getString( "artifactresolution", new Object[] { //$NON-NLS-1$
- e.getGroupId(),
- e.getArtifactId(),
- e.getVersion(),
- e.getMessage() } ) );
- }
+ getLog().debug( e.getMessage(), e );
+ getLog().error(
+ Messages
+ .getString( "artifactresolution", new Object[] { //$NON-NLS-1$
+ e.getGroupId(), e.getArtifactId(), e.getVersion(), e.getMessage() } ) );
+
+ // if we are here artifactResolutionResult is null, create a project without dependencies but don't fail
+ // (this could be a reactor projects, we don't want to fail everything)
+ return new IdeDependency[0];
}
- if ( !isReactorProject || emittedReactorProjectId.add( art.getGroupId() + '-' + art.getArtifactId() ) )
+ // keep track of added reactor projects in order to avoid duplicates
+ Set emittedReactorProjectId = new HashSet();
+
+ for ( Iterator i = artifactResolutionResult.getArtifactResolutionNodes().iterator(); i.hasNext(); )
{
- // the following doesn't work: art.getArtifactHandler().getPackaging() always returns "jar" also
- // if the packaging specified in pom.xml is different.
+ ResolutionNode node = (ResolutionNode) i.next();
+ int dependencyDepth = node.getDepth();
+ Artifact art = node.getArtifact();
+ boolean isReactorProject = getUseProjectReferences() && isAvailableAsAReactorProject( art );
- // osgi-bundle packaging is provided by the felix osgi plugin
- // eclipse-plugin packaging is provided by this eclipse plugin
- // String packaging = art.getArtifactHandler().getPackaging();
- // boolean isOsgiBundle = "osgi-bundle".equals( packaging ) || "eclipse-plugin".equals( packaging );
-
- // we need to check the manifest, if "Bundle-SymbolicName" is there the artifact can be considered
- // an osgi bundle
- boolean isOsgiBundle = false;
- String osgiSymbolicName = null;
- if ( art.getFile() != null )
+ // don't resolve jars for reactor projects
+ if ( !isReactorProject )
{
- JarFile jarFile = null;
try
{
- jarFile = new JarFile( art.getFile(), false, ZipFile.OPEN_READ );
-
- Manifest manifest = jarFile.getManifest();
- if ( manifest != null )
- {
- osgiSymbolicName = manifest.getMainAttributes()
- .getValue( new Attributes.Name( "Bundle-SymbolicName" ) );
- }
+ artifactResolver.resolve( art, node.getRemoteRepositories(), localRepository );
+ }
+ catch ( ArtifactNotFoundException e )
+ {
+ getLog().debug( e.getMessage(), e );
+ getLog().warn(
+ Messages.getString( "artifactdownload", new Object[] { //$NON-NLS-1$
+ e.getGroupId(),
+ e.getArtifactId(),
+ e.getVersion(),
+ e.getMessage() } ) );
}
- catch ( IOException e )
+ catch ( ArtifactResolutionException e )
{
- getLog().info( "Unable to read jar manifest from " + art.getFile() );
+ getLog().debug( e.getMessage(), e );
+ getLog().warn(
+ Messages.getString( "artifactresolution", new Object[] { //$NON-NLS-1$
+ e.getGroupId(),
+ e.getArtifactId(),
+ e.getVersion(),
+ e.getMessage() } ) );
}
- finally
+ }
+
+ if ( !isReactorProject || emittedReactorProjectId.add( art.getGroupId() + '-' + art.getArtifactId() ) )
+ {
+
+ // the following doesn't work: art.getArtifactHandler().getPackaging() always returns "jar" also
+ // if the packaging specified in pom.xml is different.
+
+ // osgi-bundle packaging is provided by the felix osgi plugin
+ // eclipse-plugin packaging is provided by this eclipse plugin
+ // String packaging = art.getArtifactHandler().getPackaging();
+ // boolean isOsgiBundle = "osgi-bundle".equals( packaging ) || "eclipse-plugin".equals( packaging );
+
+ // we need to check the manifest, if "Bundle-SymbolicName" is there the artifact can be considered
+ // an osgi bundle
+ boolean isOsgiBundle = false;
+ String osgiSymbolicName = null;
+ if ( art.getFile() != null )
{
- if ( jarFile != null )
+ JarFile jarFile = null;
+ try
{
- try
+ jarFile = new JarFile( art.getFile(), false, ZipFile.OPEN_READ );
+
+ Manifest manifest = jarFile.getManifest();
+ if ( manifest != null )
{
- jarFile.close();
+ osgiSymbolicName = manifest.getMainAttributes()
+ .getValue( new Attributes.Name( "Bundle-SymbolicName" ) );
}
- catch ( IOException e )
+ }
+ catch ( IOException e )
+ {
+ getLog().info( "Unable to read jar manifest from " + art.getFile() );
+ }
+ finally
+ {
+ if ( jarFile != null )
{
- // ignore
+ try
+ {
+ jarFile.close();
+ }
+ catch ( IOException e )
+ {
+ // ignore
+ }
}
}
}
- }
- isOsgiBundle = osgiSymbolicName != null;
+ isOsgiBundle = osgiSymbolicName != null;
- IdeDependency dep = new IdeDependency( art.getGroupId(), art.getArtifactId(), art.getVersion(),
- isReactorProject, Artifact.SCOPE_TEST
- .equals( art.getScope() ), Artifact.SCOPE_SYSTEM
- .equals( art.getScope() ), Artifact.SCOPE_PROVIDED
- .equals( art.getScope() ), art.getArtifactHandler()
- .isAddedToClasspath(), art.getFile(), art.getType(),
- isOsgiBundle, osgiSymbolicName, dependencyDepth );
+ IdeDependency dep = new IdeDependency( art.getGroupId(), art.getArtifactId(), art.getVersion(),
+ isReactorProject, Artifact.SCOPE_TEST
+ .equals( art.getScope() ), Artifact.SCOPE_SYSTEM
+ .equals( art.getScope() ), Artifact.SCOPE_PROVIDED
+ .equals( art.getScope() ), art.getArtifactHandler()
+ .isAddedToClasspath(), art.getFile(), art.getType(),
+ isOsgiBundle, osgiSymbolicName, dependencyDepth );
+
+ dependencies.add( dep );
+ }
- dependencyList.add( dep );
}
- }
+ //@todo a final report with the list of missingArtifacts?
- //@todo a final report with the list of missingArtifacts?
+ }
+ ideDeps = (IdeDependency[]) dependencies.toArray( new IdeDependency[dependencies.size()] );
}
- IdeDependency[] deps = (IdeDependency[]) dependencyList.toArray( new IdeDependency[dependencyList.size()] );
-
- return deps;
+ return ideDeps;
}
/**
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java Thu Nov 9 15:30:40 2006
@@ -35,6 +35,7 @@
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.apache.maven.shared.invoker.DefaultInvocationRequest;
import org.apache.maven.shared.invoker.DefaultInvoker;
+import org.apache.maven.shared.invoker.InvocationOutputHandler;
import org.apache.maven.shared.invoker.InvocationRequest;
import org.apache.maven.shared.invoker.Invoker;
import org.apache.maven.shared.invoker.MavenInvocationException;
@@ -99,6 +100,8 @@
* test builds.
*/
protected static final String VERSION = "test";
+
+ private static final String BUILD_OUTPUT_DIRECTORY = "target/surefire-reports/build-output";
private static String mvnHome;
@@ -110,6 +113,11 @@
protected void setUp()
throws Exception
{
+ if ( !installed )
+ {
+ System.out.println( "*** Running test builds; output will be directed to: " + BUILD_OUTPUT_DIRECTORY + "\n" );
+ }
+
synchronized( AbstractEclipsePluginTestCase.class )
{
if ( mvnHome == null )
@@ -168,7 +176,7 @@
{
if ( !installed )
{
- System.out.println( "\n\n\n\n*** Installing test-version of the Eclipse plugin to: " + LOCAL_REPO_DIR + "***\n\n\n\n" );
+ System.out.println( "*** Installing test-version of the Eclipse plugin to: " + LOCAL_REPO_DIR + "\n" );
ArtifactInstaller installer = (ArtifactInstaller) lookup( ArtifactInstaller.ROLE );
ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
@@ -198,8 +206,6 @@
destination.getParentFile().mkdirs();
}
- System.out.println( "Installing " + artifactFile.getPath() + " to " + destination );
-
installer.install( artifactFile, artifact, localRepository );
installLocalParentSnapshotPoms( pomFile, installer, factory, localRepository );
@@ -474,10 +480,22 @@
request.setGoals( goals );
request.setProperties( properties );
+
+ LoggerHandler handler = new LoggerHandler( BUILD_OUTPUT_DIRECTORY );
+
+ request.setOutputHandler( handler );
+ request.setErrorHandler( handler );
- mavenInvoker.execute( request );
+ try
+ {
+ mavenInvoker.execute( request );
+ }
+ finally
+ {
+ handler.close();
+ }
}
-
+
protected MavenProject readProject( File pom )
throws ProjectBuildingException
{
@@ -624,5 +642,76 @@
IOUtil.close( reader );
return lines;
+ }
+
+ private static final class LoggerHandler implements InvocationOutputHandler
+ {
+ private static final String LS = System.getProperty( "line.separator" );
+ private final File output;
+ private FileWriter writer;
+
+ LoggerHandler( String outputBasedir )
+ {
+ NullPointerException npe = new NullPointerException();
+ StackTraceElement[] trace = npe.getStackTrace();
+
+ File file = null;
+
+ for ( int i = 0; i < trace.length; i++ )
+ {
+ StackTraceElement element = trace[i];
+
+ String methodName = element.getMethodName();
+
+ if ( methodName.startsWith( "test" ) && !methodName.equals( "testProject" ) )
+ {
+ String classname = element.getClassName();
+
+ file = new File( outputBasedir, classname + "_" + element.getMethodName() + ".build.log" );
+
+ break;
+ }
+ }
+
+ if ( file == null )
+ {
+ file = new File( outputBasedir, "unknown.build.log" );
+ }
+
+ file.getParentFile().mkdirs();
+
+ output = file;
+ }
+
+ public void consumeLine( String line )
+ {
+ if ( writer == null )
+ {
+ try
+ {
+ writer = new FileWriter( output );
+ }
+ catch ( IOException e )
+ {
+ throw new IllegalStateException( "Failed to open build log: " + output + "\n\nError: " + e.getMessage() );
+ }
+ }
+
+ try
+ {
+ writer.write( line + LS );
+ writer.flush();
+ }
+ catch ( IOException e )
+ {
+ throw new IllegalStateException( "Failed to write to build log: " + output + " output:\n\n\'" + line + "\'\n\nError: " + e.getMessage() );
+ }
+ }
+
+ void close()
+ {
+ IOUtil.close( writer );
+ }
+
}
}
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java Thu Nov 9 15:30:40 2006
@@ -16,10 +16,6 @@
package org.apache.maven.plugin.eclipse;
-import org.apache.maven.embedder.MavenEmbedderConsoleLogger;
-import org.apache.maven.embedder.PlexusLoggerAdapter;
-import org.apache.maven.monitor.event.DefaultEventMonitor;
-import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.plugin.ide.IdeUtils;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
@@ -38,6 +34,9 @@
public class RadPluginTest
extends AbstractEclipsePluginTestCase
{
+
+ private static final String PROJECTS_BASEDIR = "target/test-classes/projects";
+
public void testProject1()
throws Exception
{
@@ -48,9 +47,9 @@
throws Exception
{
testProject( "project-rad-2", new Properties(), "rad-clean", "rad" );
- File generatedManifest = getTestFile( "src/test/resources/projects/project-rad-2/src/main/webapp/META-INF/MANIFEST.MF" );
- File expectedManifest = getTestFile( "src/test/resources/projects/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF" );
- assertFileEquals( LOCAL_REPO_DIR.getCanonicalPath(), generatedManifest, expectedManifest );
+ File generatedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-2/src/main/webapp/META-INF/MANIFEST.MF" );
+ File expectedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF" );
+ assertFileEquals( LOCAL_REPO_DIR.getCanonicalPath(), expectedManifest, generatedManifest );
}
@@ -58,9 +57,9 @@
throws Exception
{
testProject( "project-rad-3", new Properties(), "rad-clean", "rad" );
- File generatedManifest = getTestFile( "src/test/resources/projects/project-rad-3/ejbModule/META-INF/MANIFEST.MF" );
- File expectedManifest = getTestFile( "src/test/resources/projects/project-rad-3/ejbModule/META-INF/expected_MANIFEST.MF" );
- assertFileEquals( LOCAL_REPO_DIR.getCanonicalPath(), generatedManifest, expectedManifest );
+ File generatedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-3/ejbModule/META-INF/MANIFEST.MF" );
+ File expectedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-3/ejbModule/META-INF/expected_MANIFEST.MF" );
+ assertFileEquals( LOCAL_REPO_DIR.getCanonicalPath(), expectedManifest, generatedManifest );
}
public void testProject4()
@@ -72,22 +71,14 @@
public void testProject5()
throws Exception
{
- File basedir = getTestFile( "src/test/resources/projects/project-rad-5" );
+ File basedir = getTestFile( "target/test-classes/projects/project-rad-5" );
FileUtils.deleteDirectory( new File( basedir, "project-rad-1/META-INF" ) );
new File( basedir, "project-rad-1/META-INF" ).mkdirs();
File pom0 = new File( basedir, "pom.xml" );
- File pom1 = new File( basedir, "project-rad-1/pom.xml" );
- File pom2 = new File( basedir, "project-rad-2/pom.xml" );
- File pom3 = new File( basedir, "project-rad-3/pom.xml" );
MavenProject project = readProject( pom0 );
- MavenProject project1 = readProject( pom1 );
- MavenProject project2 = readProject( pom2 );
- MavenProject project3 = readProject( pom3 );
-
- EventMonitor eventMonitor = new DefaultEventMonitor( new PlexusLoggerAdapter( new MavenEmbedderConsoleLogger() ) );
String outputDirPath = IdeUtils.getPluginSetting( project, "maven-eclipse-plugin", "outputDir", null );
File outputDir;
@@ -109,16 +100,11 @@
goals.add( pluginSpec + "rad-clean" );
goals.add( pluginSpec + "rad" );
+ goals.add( "install" );
Properties props = new Properties();
executeMaven( pom0, props, goals );
- executeMaven( pom2, props, goals );
- executeMaven( pom3, props, goals );
-
- executeMaven( pom1, props, goals );
- executeMaven( pom2, props, goals );
- executeMaven( pom3, props, goals );
// this.maven.execute( Arrays.asList( new MavenProject[] { project, project2, project3 } ), Arrays
// .asList( new String[] {
@@ -134,15 +120,13 @@
// new Properties(), basedir );
// jar muss reincoliert sein
- assertTrue( getTestFile( "src/test/resources/projects/project-rad-5/project-rad-1/maven-core-98.0.jar" )
- .exists() );
+ assertTrue( new File( basedir, "project-rad-1/maven-core-98.0.jar" ).exists() );
Xpp3Dom applicationXml = Xpp3DomBuilder
- .build( new FileReader(
- getTestFile( "src/test/resources/projects/project-rad-5/project-rad-1/META-INF/application.xml" ) ) );
+ .build( new FileReader( new File( basedir, "project-rad-1/META-INF/application.xml" ) ) );
+
Xpp3Dom modulesmapsXml = Xpp3DomBuilder
- .build( new FileReader(
- getTestFile( "src/test/resources/projects/project-rad-5/project-rad-1/META-INF/.modulemaps" ) ) );
+ .build( new FileReader( new File( basedir, "project-rad-1/META-INF/.modulemaps" ) ) );
assertNotNull( modulesmapsXml );
@@ -154,32 +138,22 @@
ejbModule = applicationXml.getChildren( "module" )[0];
}
- assertEquals( "project-rad-2.war", webappModule.getChild( "web" ).getChild( "web-uri" ).getValue() );
- assertEquals( "project-rad-2", webappModule.getChild( "web" ).getChild( "context-root" ).getValue() );
- assertEquals( "project-rad-3.jar", ejbModule.getChild( "ejb" ).getValue() );
+ assertEquals( "project-rad-5_2.war", webappModule.getChild( "web" ).getChild( "web-uri" ).getValue() );
+ assertEquals( "project-rad-5_2", webappModule.getChild( "web" ).getChild( "context-root" ).getValue() );
+ assertEquals( "project-rad-5_3.jar", ejbModule.getChild( "ejb" ).getValue() );
}
public void testProject5_2()
throws Exception
{
- File basedir = getTestFile( "src/test/resources/projects/project-rad-5" );
+ File basedir = getTestFile( "target/test-classes/projects/project-rad-5" );
FileUtils.deleteDirectory( new File( basedir, "project-rad-1/META-INF" ) );
- FileUtils.copyDirectory( new File( basedir, "project-rad-1/META-INF-2" ),
- new File( basedir, "project-rad-1/META-INF" ) );
File pom0 = new File( basedir, "pom.xml" );
- File pom1 = new File( basedir, "project-rad-1/pom.xml" );
- File pom2 = new File( basedir, "project-rad-2/pom.xml" );
- File pom3 = new File( basedir, "project-rad-3/pom.xml" );
MavenProject project = readProject( pom0 );
- MavenProject project1 = readProject( pom1 );
- MavenProject project2 = readProject( pom2 );
- MavenProject project3 = readProject( pom3 );
-
- EventMonitor eventMonitor = new DefaultEventMonitor( new PlexusLoggerAdapter( new MavenEmbedderConsoleLogger() ) );
String outputDirPath = IdeUtils.getPluginSetting( project, "maven-eclipse-plugin", "outputDir", null );
File outputDir;
@@ -205,13 +179,8 @@
Properties props = new Properties();
executeMaven( pom0, props, goals );
- executeMaven( pom2, props, goals );
- executeMaven( pom3, props, goals );
-
- executeMaven( pom1, props, goals );
- executeMaven( pom2, props, goals );
- executeMaven( pom3, props, goals );
+
// this.maven.execute( Arrays.asList( new MavenProject[] { project, project2, project3 } ), Arrays
// .asList( new String[] {
// "install",
@@ -226,42 +195,41 @@
// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad" } ), eventMonitor, new ConsoleDownloadMonitor(),
// new Properties(), basedir );
- assertTrue( getTestFile( "src/test/resources/projects/project-rad-5/project-rad-1/maven-core-98.0.jar" )
- .exists() );
-
- File application1 = new File(
- "src/test/resources/projects/project-rad-5/project-rad-1/META-INF/application.xml" );
- File application2 = new File(
- "src/test/resources/projects/project-rad-5/project-rad-1/META-INF-2/application.xml" );
- File modulemaps1 = new File( "src/test/resources/projects/project-rad-5/project-rad-1/META-INF/.modulemaps" );
- File modulemaps2 = new File( "src/test/resources/projects/project-rad-5/project-rad-1/META-INF-2/.modulemaps" );
-
- assertNotNull( modulemaps1 );
- assertNotNull( modulemaps2 );
-
- Xpp3Dom applicationXml1 = Xpp3DomBuilder.build( new FileReader( application1 ) );
-
- Xpp3Dom webappModule1 = applicationXml1.getChildren( "module" )[0];
- Xpp3Dom ejbModule1 = applicationXml1.getChildren( "module" )[1];
- if ( webappModule1.getChild( "web" ) == null )
- {
- webappModule1 = applicationXml1.getChildren( "module" )[1];
- ejbModule1 = applicationXml1.getChildren( "module" )[0];
- }
+ assertTrue( new File( basedir, "project-rad-1/maven-core-98.0.jar" ).exists() );
- Xpp3Dom applicationXml2 = Xpp3DomBuilder.build( new FileReader( application2 ) );
+ File modulemaps = new File( basedir, "project-rad-1/META-INF/.modulemaps" );
- Xpp3Dom webappModule2 = applicationXml2.getChildren( "module" )[0];
- Xpp3Dom ejbModule2 = applicationXml2.getChildren( "module" )[1];
- if ( webappModule2.getChild( "web" ) == null )
+ assertNotNull( modulemaps );
+
+ File application = new File( basedir, "project-rad-1/META-INF/application.xml" );
+
+ Xpp3Dom applicationXml = Xpp3DomBuilder.build( new FileReader( application ) );
+
+ Xpp3Dom[] children = applicationXml.getChildren( "module" );
+
+ assertEquals( 2, children.length );
+
+ boolean ejbVerified = false;
+ boolean warVerified = false;
+
+ for ( int i = 0; i < children.length; i++ )
{
- webappModule2 = applicationXml2.getChildren( "module" )[0];
- ejbModule2 = applicationXml2.getChildren( "module" )[1];
+ Xpp3Dom child = children[i];
+
+ if ( child.getAttribute( "id" ).startsWith( "WebModule_") )
+ {
+ assertEquals( "project-rad-5_2.war", child.getChild( "web" ).getChild( "web-uri" ).getValue() );
+ warVerified = true;
+ }
+ else if ( child.getAttribute( "id" ).startsWith( "EjbModule_" ) )
+ {
+ assertEquals( "project-rad-5_3.jar", child.getChild( "ejb" ).getValue() );
+ ejbVerified = true;
+ }
}
-
- assertEquals( webappModule1.getAttribute( "id" ), webappModule2.getAttribute( "id" ) );
- assertEquals( ejbModule1.getAttribute( "id" ), ejbModule2.getAttribute( "id" ) );
-
+
+ assertTrue( warVerified );
+ assertTrue( ejbVerified );
}
}
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-01/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-01/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-01/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-01/pom.xml Thu Nov 9 15:30:40 2006
@@ -18,6 +18,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
</configuration>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml Thu Nov 9 15:30:40 2006
@@ -25,6 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<projectnatures>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml Thu Nov 9 15:30:40 2006
@@ -50,6 +50,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<projectnatures>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml Thu Nov 9 15:30:40 2006
@@ -32,6 +32,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<outputDir>../../../../target/project-4-test/</outputDir>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml Thu Nov 9 15:30:40 2006
@@ -27,6 +27,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<projectnatures>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-06/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-06/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-06/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-06/pom.xml Thu Nov 9 15:30:40 2006
@@ -19,6 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<projectnatures>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-07/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-07/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-07/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-07/pom.xml Thu Nov 9 15:30:40 2006
@@ -26,6 +26,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<projectnatures>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-08/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-08/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-08/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-08/pom.xml Thu Nov 9 15:30:40 2006
@@ -21,6 +21,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<projectnatures>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-09/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-09/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-09/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-09/pom.xml Thu Nov 9 15:30:40 2006
@@ -25,6 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<outputDirectory>target/eclipse-classes</outputDirectory>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml Thu Nov 9 15:30:40 2006
@@ -25,6 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<projectnatures>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-11/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-11/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-11/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-11/pom.xml Thu Nov 9 15:30:40 2006
@@ -11,6 +11,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
<projectnatures>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml Thu Nov 9 15:30:40 2006
@@ -11,6 +11,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>1.0</wtpversion>
</configuration>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-14/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-14/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-14/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-14/pom.xml Thu Nov 9 15:30:40 2006
@@ -11,6 +11,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<additionalProjectnatures>
<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-18/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-18/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-18/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-18/pom.xml Thu Nov 9 15:30:40 2006
@@ -19,6 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<outputDir>../../../../target/project-18-test/</outputDir>
</configuration>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-19/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-19/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-19/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-19/pom.xml Thu Nov 9 15:30:40 2006
@@ -16,6 +16,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration></configuration>
</plugin>
</plugins>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml Thu Nov 9 15:30:40 2006
@@ -11,6 +11,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>1.5</wtpversion>
</configuration>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-21/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-21/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-21/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-21/pom.xml Thu Nov 9 15:30:40 2006
@@ -10,6 +10,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<pde>true</pde>
</configuration>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-24/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-24/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-24/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-24/pom.xml Thu Nov 9 15:30:40 2006
@@ -10,6 +10,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<pde>true</pde>
</configuration>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/pom.xml Thu Nov 9 15:30:40 2006
@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>eclipse</groupId>
- <artifactId>maven-eclipse-plugin-test-project-rad-1</artifactId>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-1</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>ear</packaging>
<build>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml Thu Nov 9 15:30:40 2006
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
- <groupId>eclipse</groupId>
- <artifactId>maven-eclipse-plugin-test-project-rad-2</artifactId>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Maven</name>
<dependencies>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/pom.xml Thu Nov 9 15:30:40 2006
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>ejb</packaging>
- <groupId>eclipse</groupId>
- <artifactId>maven-eclipse-plugin-test-project-rad-3</artifactId>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-3</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Maven</name>
<dependencies>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/pom.xml Thu Nov 9 15:30:40 2006
@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>eclipse</groupId>
- <artifactId>maven-eclipse-plugin-test-project-rad-4</artifactId>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-4</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Maven</name>
<dependencies>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml Thu Nov 9 15:30:40 2006
@@ -3,10 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>eclipse</groupId>
+ <groupId>eclipse.test</groupId>
<artifactId>project-rad-5</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>mwza2006</name>
<packaging>pom</packaging>
<modules>
<module>project-rad-1</module>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml Thu Nov 9 15:30:40 2006
@@ -4,12 +4,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>eclipse</groupId>
+ <groupId>eclipse.test</groupId>
<artifactId>project-rad-5</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>eclipse</groupId>
- <artifactId>project-rad-1</artifactId>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5_1</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>ear</packaging>
<build>
@@ -21,14 +21,14 @@
<version>1.2.8</version>
</dependency>
<dependency>
- <groupId>eclipse</groupId>
- <artifactId>project-rad-2</artifactId>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5_2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>eclipse</groupId>
- <artifactId>project-rad-3</artifactId>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5_3</artifactId>
<version>0.0.1-SNAPSHOT</version>
<type>ejb</type>
</dependency>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml Thu Nov 9 15:30:40 2006
@@ -4,15 +4,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>eclipse</groupId>
+ <groupId>eclipse.test</groupId>
<artifactId>project-rad-5</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<packaging>war</packaging>
- <groupId>eclipse</groupId>
- <artifactId>project-rad-2</artifactId>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5_2</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>Maven</name>
<dependencies>
<dependency>
<groupId>maven</groupId>
Modified: maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml?view=diff&rev=473139&r1=473138&r2=473139
==============================================================================
--- maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-137/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml Thu Nov 9 15:30:40 2006
@@ -4,15 +4,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>eclipse</groupId>
+ <groupId>eclipse.test</groupId>
<artifactId>project-rad-5</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<packaging>ejb</packaging>
- <groupId>eclipse</groupId>
- <artifactId>project-rad-3</artifactId>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5_3</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>Maven</name>
<dependencies>
<dependency>
<groupId>maven</groupId>