You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/04/02 08:17:14 UTC
svn commit: r390783 - in
/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea:
IdeaModuleMojo.java IdeaMojo.java
Author: brett
Date: Sat Apr 1 22:17:11 2006
New Revision: 390783
URL: http://svn.apache.org/viewcvs?rev=390783&view=rev
Log:
[MIDEA-44] put back the dependency as a library style that was present prior to the patch for MIDEA-35, but make it configurable.
Submitted by: Patrick Lightbody
Modified:
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
Modified: maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java?rev=390783&r1=390782&r2=390783&view=diff
==============================================================================
--- maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java (original)
+++ maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java Sat Apr 1 22:17:11 2006
@@ -17,9 +17,9 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Resource;
@@ -83,7 +83,6 @@
private boolean linkModules;
/**
- *
* @parameter expression="${deploymentDescriptorFile}"
*/
private String deploymentDescriptorFile;
@@ -153,6 +152,14 @@
private String exclude;
/**
+ * Causes the module libraries to use a short name for all dependencies. This is very convenient but has been
+ * reported to cause problems with IDEA.
+ *
+ * @parameter default-value="true"
+ */
+ private boolean dependenciesAsLibraries;
+
+ /**
* A temporary cache of artifacts that's already been downloaded or
* attempted to be downloaded. This is to refrain from trying to download a
* dependency that we have already tried to download.
@@ -168,7 +175,8 @@
boolean overwrite, MavenProject executedProject, List reactorProjects,
WagonManager wagonManager, boolean linkModules, boolean useFullNames,
boolean downloadSources, String sourceClassifier, boolean downloadJavadocs,
- String javadocClassifier, Library[] libraries, Set macros, String exclude )
+ String javadocClassifier, Library[] libraries, Set macros, String exclude,
+ boolean useShortDependencyNames )
{
super.initParam( project, artifactFactory, localRepo, artifactResolver, artifactMetadataSource, log,
overwrite );
@@ -196,6 +204,8 @@
this.macros = macros;
this.exclude = exclude;
+
+ this.dependenciesAsLibraries = useShortDependencyNames;
}
/**
@@ -401,6 +411,11 @@
removeOldElements( dep, "library" );
dep = createElement( dep, "library" );
+ if ( dependenciesAsLibraries )
+ {
+ dep.addAttribute( "name", moduleName );
+ }
+
Element el = createElement( dep, "CLASSES" );
if ( library != null && library.getSplitClasses().length > 0 )
{
@@ -433,7 +448,6 @@
sourceEl.addAttribute( "url", source );
}
}
-
if ( !usedSources && downloadSources )
{
Modified: maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java?rev=390783&r1=390782&r2=390783&view=diff
==============================================================================
--- maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java (original)
+++ maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java Sat Apr 1 22:17:11 2006
@@ -167,6 +167,15 @@
*/
private String ideaVersion;
+ /**
+ * Causes the module libraries to use a short name for all dependencies. This is very convenient but has been
+ * reported to cause problems with IDEA.
+ *
+ * @parameter default-value="true"
+ */
+ private boolean dependenciesAsLibraries;
+
+
public void execute()
throws MojoExecutionException
{
@@ -197,7 +206,8 @@
mojo.initParam( project, artifactFactory, localRepo, artifactResolver, artifactMetadataSource, getLog(),
overwrite, executedProject, reactorProjects, wagonManager, linkModules, useFullNames,
- downloadSources, sourceClassifier, downloadJavadocs, javadocClassifier, libraries, macros, exclude );
+ downloadSources, sourceClassifier, downloadJavadocs, javadocClassifier, libraries, macros,
+ exclude, dependenciesAsLibraries );
mojo.rewriteModule();
}