svn commit: r531862 - in /maven/maven-1/plugins/trunk/eclipse: src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly xdocs/changes.xml

[ah...@apache.org]

Author: aheritier
Date: Tue Apr 24 03:21:51 2007
New Revision: 531862

URL: http://svn.apache.org/viewvc?view=rev&rev=531862
Log:
If maven.compile.target or maven.compile.source are empty, then use by default the version 1.4 for wtp and preferences

Modified:
    maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly
    maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly
    maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly?view=diff&rev=531862&r1=531861&r2=531862
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly Tue Apr 24 03:21:51 2007
@@ -18,13 +18,15 @@
 -->
 <j:whitespace xmlns:j="jelly:core" xmlns="dummy" trim="false">
 <j:set var="target" value="${maven.compile.target}" />
+<j:if test="${target==null}">
+  <j:set var="target" value="1.4" />
+</j:if>
 <j:set var="source" value="${maven.compile.source}" />
+<j:if test="${source==null}">
+  <j:set var="source" value="1.4" />
+</j:if>
 eclipse.preferences.version=1
-<j:if test="${target!=null}">
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=${target}
 org.eclipse.jdt.core.compiler.compliance=${target}
-</j:if>
-<j:if test="${source!=null}">
 org.eclipse.jdt.core.compiler.source=${source}
-</j:if>
 </j:whitespace>

Modified: maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly?view=diff&rev=531862&r1=531861&r2=531862
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly Tue Apr 24 03:21:51 2007
@@ -21,8 +21,11 @@
   <faceted-project>
     <fixed facet="jst.java" />
     <j:set var="javaversion" value="${maven.compile.target}" />
-    <j:if test="javaversion==null">
+    <j:if test="${javaversion==null}">
       <j:set var="javaversion" value="${maven.compile.source}" />
+    </j:if>
+    <j:if test="${javaversion==null}">
+      <j:set var="javaversion" value="1.4" />
     </j:if>
     <j:choose>
       <j:when test="${javaversion.startsWith('1.5')}">

Modified: maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml?view=diff&rev=531862&r1=531861&r2=531862
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml Tue Apr 24 03:21:51 2007
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="1.12-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="fix">If maven.compile.target or maven.compile.source are empty, then use by default the version 1.4 for wtp and preferences</action>
       <action dev="aheritier" type="update">Maven offline mode (-o or maven.mode.online=false) overrides maven.eclipse.src.download and maven.eclipse.javadoc.download</action>
       <action dev="aheritier" type="add">Project preferences are now generated with the classpath (to define the java version for sources and target).</action>
       <action dev="aheritier" type="update">WTP settings are now generated if maven.eclipse.wtp.enable=false. No more need to define natures, build commands.</action>