You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by sn...@apache.org on 2005/09/09 21:19:45 UTC
svn commit: r279847 -
/maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
Author: snicoll
Date: Fri Sep 9 12:19:39 2005
New Revision: 279847
URL: http://svn.apache.org/viewcvs?rev=279847&view=rev
Log:
MNG-420: provides a default jdkName based on the java.version system property.
Modified:
maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
Modified: maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java?rev=279847&r1=279846&r2=279847&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java Fri Sep 9 12:19:39 2005
@@ -136,11 +136,14 @@
// Set the jdk name if set
if ( jdkName != null )
{
- setJdkName( module );
+ setJdkName( module, jdkName );
}
else
{
- getLog().warn( "jdkName is not set, you will have to set the JDK to use in IDEA." );
+ String javaVersion = System.getProperty( "java.version" );
+ String defaultJdkName = "java version " + javaVersion;
+ getLog().info( "jdkName is not set, using[" + defaultJdkName + "] as default." );
+ setJdkName( module, defaultJdkName );
}
Xpp3Dom component = findComponent( module, "ProjectModuleManager" );
@@ -365,7 +368,7 @@
element.setAttribute( "url", getModuleFileUrl( warSrc ) );
}
- private void setJdkName( Xpp3Dom content )
+ private void setJdkName( Xpp3Dom content, String jdkName )
{
Xpp3Dom component = findComponent( content, "ProjectRootManager" );
component.setAttribute( "project-jdk-name", jdkName );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org