Index: D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
===================================================================
--- D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java (revision 517483)
+++ D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java (working copy)
@@ -100,6 +100,16 @@
private List classpathContainers;
/**
+ * AJDT weave dependencies.
+ */
+ private IdeDependency[] ajdtWeaveDeps;
+
+ /**
+ * Aspectj libraries.
+ */
+ private IdeDependency[] aspectjDeps;
+
+ /**
* Getter for deps.
* @return Returns the deps.
*/
@@ -118,6 +128,42 @@
}
/**
+ * Returns the ajdtWeaveDeps.
+ * @return the ajdtWeaveDeps.
+ */
+ public IdeDependency[] getAjdtWeaveDeps()
+ {
+ return ajdtWeaveDeps;
+ }
+
+ /**
+ * Sets the ajdtWeaveDeps.
+ * @param ajdtWeaveDeps the ajdtWeaveDeps.
+ */
+ public void setAjdtWeaveDeps( IdeDependency[] ajdtWeaveDeps )
+ {
+ this.ajdtWeaveDeps = ajdtWeaveDeps;
+ }
+
+ /**
+ * Returns the aspectjDeps.
+ * @return the aspectjDeps.
+ */
+ public IdeDependency[] getAspectjDeps()
+ {
+ return aspectjDeps;
+ }
+
+ /**
+ * Sets the aspectjDeps.
+ * @param aspectjDeps the aspectjDeps.
+ */
+ public void setAspectjDeps( IdeDependency[] aspectjDeps )
+ {
+ this.aspectjDeps = aspectjDeps;
+ }
+
+ /**
* Getter for eclipseProjectDir.
* @return Returns the eclipseProjectDir.
*/
Index: D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java
===================================================================
--- D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java (revision 0)
+++ D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java (revision 0)
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.maven.plugin.eclipse.writers;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.eclipse.Messages;
+import org.apache.maven.plugin.ide.IdeDependency;
+import org.apache.maven.plugin.ide.IdeUtils;
+
+/**
+ * @version $Id$
+ */
+public class EclipseAjdtWriter
+ extends AbstractEclipseWriter
+{
+
+ private static final String LIBRARY = "LIBRARY";
+
+ private static final String BINARY = "BINARY";
+
+ private static final String CONTENT_KIND = ".contentKind";
+
+ private static final String ENTRY_KIND = ".entryKind";
+
+ private static final String FILE_AJDT_PREFS = "org.eclipse.ajdt.ui.prefs"; //$NON-NLS-1$
+
+ private static final String PROP_ECLIPSE_PREFERENCES_VERSION = "eclipse.preferences.version"; //$NON-NLS-1$
+
+ private static final String DIR_DOT_SETTINGS = ".settings"; //$NON-NLS-1$
+
+ private static final String AJDT_PROP_PREFIX = "org.eclipse.ajdt.ui."; //$NON-NLS-1$
+
+ private static final String ASPECT_DEP_PROP = "aspectPath";
+
+ private static final String WEAVE_DEP_PROP = "inPath";
+
+ /**
+ * @see org.apache.maven.plugin.eclipse.writers.EclipseWriter#write()
+ */
+ public void write()
+ throws MojoExecutionException
+ {
+
+ // check if it's necessary to create project specific settings
+ Properties ajdtSettings = new Properties();
+
+ IdeDependency[] aspectjDeps = config.getAspectjDeps();
+ for ( int i = 0; i < aspectjDeps.length; i++ )
+ {
+ addDependency( ajdtSettings, aspectjDeps[i], ASPECT_DEP_PROP, i + 1 );
+ }
+
+ IdeDependency[] weaveDeps = config.getAjdtWeaveDeps();
+ for ( int i = 0; i < weaveDeps.length; i++ )
+ {
+ addDependency( ajdtSettings, weaveDeps[i], WEAVE_DEP_PROP, i + 1 );
+ }
+
+ // write the settings, if needed
+ if ( !ajdtSettings.isEmpty() )
+ {
+ File settingsDir = new File( config.getEclipseProjectDirectory(), DIR_DOT_SETTINGS ); //$NON-NLS-1$
+
+ settingsDir.mkdirs();
+
+ ajdtSettings.put( PROP_ECLIPSE_PREFERENCES_VERSION, "1" ); //$NON-NLS-1$
+
+ try
+ {
+ File oldAjdtSettingsFile;
+
+ File ajdtSettingsFile = new File( settingsDir, FILE_AJDT_PREFS );
+
+ if ( ajdtSettingsFile.exists() )
+ {
+ oldAjdtSettingsFile = ajdtSettingsFile;
+
+ Properties oldsettings = new Properties();
+ oldsettings.load( new FileInputStream( oldAjdtSettingsFile ) );
+
+ Properties newsettings = (Properties) oldsettings.clone();
+ newsettings.putAll( ajdtSettings );
+
+ if ( !oldsettings.equals( newsettings ) )
+ {
+ newsettings.store( new FileOutputStream( ajdtSettingsFile ), null );
+ }
+ }
+ else
+ {
+ ajdtSettings.store( new FileOutputStream( ajdtSettingsFile ), null );
+
+ log.info( Messages.getString( "EclipseSettingsWriter.wrotesettings", //$NON-NLS-1$
+ ajdtSettingsFile.getCanonicalPath() ) );
+ }
+ }
+ catch ( FileNotFoundException e )
+ {
+ throw new MojoExecutionException( Messages.getString( "EclipseSettingsWriter.cannotcreatesettings" ), e ); //$NON-NLS-1$
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( Messages.getString( "EclipseSettingsWriter.errorwritingsettings" ), e ); //$NON-NLS-1$
+ }
+ }
+ }
+
+ private void addDependency( Properties ajdtSettings, IdeDependency dep, String propName, int index )
+ throws MojoExecutionException
+ {
+
+ String path;
+
+ if ( dep.isReferencedProject() && !config.isPde() )
+ {
+ path = "/" + dep.getArtifactId(); //$NON-NLS-1$
+ }
+ else
+ {
+ File artifactPath = dep.getFile();
+ if ( artifactPath == null )
+ {
+ log.error( Messages.getString( "EclipsePlugin.artifactpathisnull", dep.getId() ) ); //$NON-NLS-1$
+ return;
+ }
+
+ path = IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), artifactPath, false );
+ }
+
+ ajdtSettings.setProperty( AJDT_PROP_PREFIX + propName + CONTENT_KIND + index, BINARY );
+ ajdtSettings.setProperty( AJDT_PROP_PREFIX + propName + ENTRY_KIND + index, LIBRARY );
+ ajdtSettings.setProperty( AJDT_PROP_PREFIX + propName + index, path );
+ }
+}
Property changes on: D:\dev\maven\plugins\maven-eclipse-plugin\src\main\java\org\apache\maven\plugin\eclipse\writers\EclipseAjdtWriter.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Index: D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
===================================================================
--- D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (revision 517895)
+++ D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (working copy)
@@ -30,9 +30,16 @@
import java.util.Set;
import java.util.TreeSet;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.model.ConfigurationContainer;
+import org.apache.maven.model.Plugin;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.eclipse.writers.EclipseAjdtWriter;
import org.apache.maven.plugin.eclipse.writers.EclipseClasspathWriter;
import org.apache.maven.plugin.eclipse.writers.EclipseOSGiManifestWriter;
import org.apache.maven.plugin.eclipse.writers.EclipseProjectWriter;
@@ -48,6 +55,11 @@
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
/**
* Generates the following eclipse configuration files:
@@ -70,6 +82,26 @@
extends AbstractIdeSupportMojo
{
+ private static final String WEAVE_DEPENDENCY = "weaveDependency";
+
+ private static final String WEAVE_DEPENDENCIES = "weaveDependencies";
+
+ private static final String ASPECT_LIBRARY = "aspectLibrary";
+
+ private static final String ASPECT_LIBRARIES = "aspectLibraries";
+
+ private static final String DEFAULT_TEST_ASPECT_DIRECTORY = "src/test/aspect";
+
+ private static final String DEFAULT_ASPECT_DIRECTORY = "src/main/aspect";
+
+ private static final String ASPECT_DIRECTORY = "aspectDirectory";
+
+ private static final String TEST_ASPECT_DIRECTORY = "testAspectDirectory";
+
+ private static final String ASPECTJ_MAVEN_PLUGIN = "aspectj-maven-plugin";
+
+ private static final String ORG_CODEHAUS_MOJO = "org.codehaus.mojo";
+
private static final String NATURE_WST_FACET_CORE_NATURE = "org.eclipse.wst.common.project.facet.core.nature"; //$NON-NLS-1$
private static final String BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER = "org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver"; //$NON-NLS-1$
@@ -78,6 +110,8 @@
private static final String BUILDER_JDT_CORE_JAVA = "org.eclipse.jdt.core.javabuilder"; //$NON-NLS-1$
+ private static final String BUILDER_AJDT_CORE_JAVA = "org.eclipse.ajdt.core.ajbuilder"; //$NON-NLS-1$
+
private static final String BUILDER_WST_COMPONENT_STRUCTURAL = "org.eclipse.wst.common.modulecore.ComponentStructuralBuilder"; //$NON-NLS-1$
private static final String BUILDER_WST_FACET = "org.eclipse.wst.common.project.facet.core.builder"; //$NON-NLS-1$
@@ -90,6 +124,8 @@
private static final String NATURE_JDT_CORE_JAVA = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$
+ private static final String NATURE_AJDT_CORE_JAVA = "org.eclipse.ajdt.ui.ajnature"; //$NON-NLS-1$
+
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$
@@ -236,6 +272,14 @@
private boolean pde;
/**
+ * Is it an AJDT project? If yes, the plugin adds the necessary natures and build commands to
+ * the .project file.
+ *
+ * @parameter expression="${eclipse.ajdt}" default-value="false"
+ */
+ private boolean ajdt;
+
+ /**
* The relative path of the manifest file
*
* @parameter expression="${eclipse.manifest}" default-value="${basedir}/META-INF/MANIFEST.MF"
@@ -280,7 +324,7 @@
{
return isJavaProject;
}
-
+
protected boolean isPdeProject()
{
return pde;
@@ -457,7 +501,7 @@
boolean ready = true;
checkDeprecations();
-
+ ajdt = enableAjdt( executedProject );
ready = validate();
String packaging = executedProject.getPackaging();
@@ -681,6 +725,11 @@
if ( isJavaProject )
{
new EclipseClasspathWriter().init( getLog(), config ).write();
+
+ if ( ajdt )
+ {
+ new EclipseAjdtWriter().init( getLog(), config ).write();
+ }
}
if ( pde )
@@ -734,7 +783,6 @@
EclipseSourceDir[] sourceDirs = buildDirectoryList( executedProject, eclipseProjectDir, buildOutputDirectory );
EclipseWriterConfig config = new EclipseWriterConfig();
-
// TODO: add mojo param 'addVersionToProjectName' and if set append
// -version to the project name.
config.setEclipseProjectName( project.getArtifactId() );
@@ -758,6 +806,12 @@
}
}
+ if( ajdt )
+ {
+ config.setAjdtWeaveDeps( buildAjdtWeaveDeps( deps ) );
+ config.setAspectjDeps( buildAspectjDeps( deps ) );
+ }
+
config.setBuildCommands( new LinkedList( convertedBuildCommands ) );
config.setBuildOutputDirectory( buildOutputDirectory );
@@ -812,6 +866,11 @@
if ( isJavaProject )
{
+ if ( ajdt )
+ {
+ projectnatures.add( NATURE_AJDT_CORE_JAVA );
+ }
+
projectnatures.add( NATURE_JDT_CORE_JAVA );
}
@@ -854,7 +913,14 @@
if ( isJavaProject )
{
- buildcommands.add( new BuildCommand( BUILDER_JDT_CORE_JAVA ) );
+ if ( ajdt )
+ {
+ buildcommands.add( BUILDER_AJDT_CORE_JAVA );
+ }
+ else
+ {
+ buildcommands.add( new BuildCommand( BUILDER_JDT_CORE_JAVA ) );
+ }
}
if ( wtpVersionFloat >= 1.5f )
@@ -911,7 +977,11 @@
extractResourceDirs( directories, project.getBuild().getTestResources(), project, basedir, projectBaseDir,
true, testOutput );
-
+
+ if( ajdt )
+ {
+ extractAspectDirs( directories, project, basedir, projectBaseDir, testOutput );
+ }
return (EclipseSourceDir[]) directories.toArray( new EclipseSourceDir[directories.size()] );
}
@@ -940,7 +1010,6 @@
{
for ( Iterator it = resources.iterator(); it.hasNext(); )
{
-
Resource resource = (Resource) it.next();
getLog().debug( "Processing resource dir: " + resource.getDirectory() );
@@ -961,7 +1030,7 @@
// TODO: figure out how to merge if the same dir is specified twice
// with different in/exclude patterns.
- File resourceDirectory = new File( /*basedir,*/resource.getDirectory() );
+ File resourceDirectory = new File( /*basedir,*/ resource.getDirectory() );
if ( !resourceDirectory.exists() || !resourceDirectory.isDirectory() )
{
@@ -1003,4 +1072,143 @@
}
}
+ private void extractAspectDirs( Set directories, MavenProject project, File basedir, File projectBaseDir, String testOutput ) throws MojoExecutionException
+ {
+ Xpp3Dom configuration = getAspectjConfiguration( project );
+ if( configuration != null )
+ {
+ String aspectDirectory = DEFAULT_ASPECT_DIRECTORY;
+ Xpp3Dom aspectDirectoryElement = configuration.getChild( ASPECT_DIRECTORY );
+ if( aspectDirectoryElement != null )
+ {
+ aspectDirectory = aspectDirectoryElement.getValue();
+ }
+
+ File aspectDirectoryFile = new File( basedir, aspectDirectory );
+ if( aspectDirectoryFile.exists() && aspectDirectoryFile.isDirectory() )
+ {
+ String sourceRoot = IdeUtils.toRelativeAndFixSeparator( projectBaseDir, aspectDirectoryFile, !projectBaseDir
+ .equals( basedir ) );
+
+ directories.add( new EclipseSourceDir( sourceRoot, null, false, false, null, null, false ) );
+ }
+
+ String testAspectDirectory = DEFAULT_TEST_ASPECT_DIRECTORY;
+ Xpp3Dom testAspectDirectoryElement = configuration.getChild( TEST_ASPECT_DIRECTORY );
+ if( testAspectDirectoryElement != null )
+ {
+ testAspectDirectory = testAspectDirectoryElement.getValue();
+ }
+
+ File testAspectDirectoryFile = new File( basedir, testAspectDirectory );
+ if( testAspectDirectoryFile.exists() && testAspectDirectoryFile.isDirectory() )
+ {
+ String sourceRoot = IdeUtils.toRelativeAndFixSeparator( projectBaseDir, testAspectDirectoryFile, !projectBaseDir
+ .equals( basedir ) );
+
+ directories.add( new EclipseSourceDir( sourceRoot, testOutput, false, true, null, null, false ) );
+ }
+ }
+ }
+
+ private boolean enableAjdt(MavenProject project)
+ {
+ boolean enable = false;
+ List buildPlugins = project.getBuildPlugins();
+ for ( Iterator it = buildPlugins.iterator(); it.hasNext(); )
+ {
+ Plugin plugin = (Plugin)it.next();
+ if( plugin.getGroupId().equals( ORG_CODEHAUS_MOJO ) && plugin.getArtifactId().equals( ASPECTJ_MAVEN_PLUGIN ) )
+ {
+ enable = true;
+ break;
+ }
+ }
+
+ return enable;
+ }
+
+ private Xpp3Dom getAspectjConfiguration(MavenProject project)
+ {
+ Xpp3Dom configuration = null;
+ List buildPlugins = project.getBuildPlugins();
+ for ( Iterator it = buildPlugins.iterator(); it.hasNext(); )
+ {
+ Plugin plugin = (Plugin)it.next();
+ if( plugin.getGroupId().equals( ORG_CODEHAUS_MOJO ) && plugin.getArtifactId().equals( ASPECTJ_MAVEN_PLUGIN ) )
+ {
+ configuration = (Xpp3Dom)plugin.getConfiguration();
+ break;
+ }
+ }
+
+ return configuration;
+ }
+
+ private IdeDependency[] buildAspectjDeps( IdeDependency[] deps ) throws MojoExecutionException
+ {
+ List aspectjDeps = new LinkedList();
+ Xpp3Dom configuration = getAspectjConfiguration( executedProject );
+ if( configuration != null )
+ {
+ Xpp3Dom aspectLibrariesParent = configuration.getChild( ASPECT_LIBRARIES );
+ if( aspectLibrariesParent != null )
+ {
+ Xpp3Dom[] aspectLibraries = aspectLibrariesParent.getChildren( ASPECT_LIBRARY );
+ outerLoop:
+ for( int i = 0 ; i < aspectLibraries.length ; i++ )
+ {
+ String artifactId = aspectLibraries[ i ].getChild( POM_ELT_ARTIFACT_ID ).getValue();
+ String groupId = aspectLibraries[ i ].getChild( POM_ELT_GROUP_ID ).getValue();
+ for( int j = 0 ; j < deps.length ; j++ )
+ {
+ if( deps[ j ].getArtifactId().equals( artifactId ) &&
+ deps[ j ].getGroupId().equals( groupId ) )
+ {
+ aspectjDeps.add( deps[ j ] );
+ continue outerLoop;
+ }
+ }
+
+ throw new MojoExecutionException( "AspectLibrary is not a dependency of project" );
+ }
+ }
+ }
+
+ return (IdeDependency[])aspectjDeps.toArray( new IdeDependency[ aspectjDeps.size() ] );
+ }
+
+ private IdeDependency[] buildAjdtWeaveDeps( IdeDependency[] deps ) throws MojoExecutionException
+ {
+ List aspectjDeps = new LinkedList();
+ Xpp3Dom configuration = getAspectjConfiguration( executedProject );
+ if( configuration != null )
+ {
+ Xpp3Dom weaveDependenciesParent = configuration.getChild( WEAVE_DEPENDENCIES );
+ if( weaveDependenciesParent != null )
+ {
+ Xpp3Dom[] weaveDependencies = weaveDependenciesParent.getChildren( WEAVE_DEPENDENCY );
+ outerLoop:
+ for( int i = 0 ; i < weaveDependencies.length ; i++ )
+ {
+ String artifactId = weaveDependencies[ i ].getChild( POM_ELT_ARTIFACT_ID ).getValue();
+ String groupId = weaveDependencies[ i ].getChild( POM_ELT_GROUP_ID ).getValue();
+ for( int j = 0 ; j < deps.length ; j++ )
+ {
+ if( deps[ j ].getArtifactId().equals( artifactId ) &&
+ deps[ j ].getGroupId().equals( groupId ) )
+ {
+ aspectjDeps.add( deps[ j ] );
+ continue outerLoop;
+ }
+ }
+
+ throw new MojoExecutionException( "WeaveDependency is not a dependency of project" );
+ }
+ }
+ }
+
+ return (IdeDependency[])aspectjDeps.toArray( new IdeDependency[ aspectjDeps.size() ] );
+ }
+
}
Index: D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
===================================================================
--- D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java (revision 517483)
+++ D:/dev/maven/plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java (working copy)
@@ -7,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -75,6 +75,11 @@
private static final String FILE_ECLIPSE_JDT_CORE_PREFS = ".settings/org.eclipse.jdt.core.prefs"; //$NON-NLS-1$
/**
+ * AJDT preferences.
+ */
+ private static final String FILE_AJDT_PREFS = ".settings/org.eclipse.ajdt.ui.prefs"; //$NON-NLS-1$
+
+ /**
* Packaging for the current project.
* @parameter expression="${project.packaging}"
* @required
@@ -118,13 +123,14 @@
delete( new File( basedir, FILE_DOT_COMPONENT_15 ) );
delete( new File( basedir, FILE_FACET_CORE_XML ) );
delete( new File( basedir, FILE_ECLIPSE_JDT_CORE_PREFS ) );
+ delete( new File( basedir, FILE_AJDT_PREFS ) );
File settingsDir = new File( basedir, DIR_DOT_SETTINGS );
if ( settingsDir.exists() && settingsDir.isDirectory() && settingsDir.list().length == 0 )
{
delete( settingsDir );
}
-
+
cleanExtras();
}