o RC1 Refactoring

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113732 13f79535-47bb-0310-9956-ffa450edef68

java/plugin.jelly

@@ -4,28 +4,8 @@
   xmlns:j="jelly:core"
   xmlns:ant="jelly:ant"
   xmlns:define="jelly:define"
-  xmlns:resources="resources">
-
-  <j:choose>
-    <j:when test="${!pom.build.resources.includes.isEmpty()}">
-      <ant:property name="maven.has.jar.resource.patterns" value="true"/>
-    </j:when>
-    <j:when test="${!pom.build.resources.excludes.isEmpty()}">
-      <ant:property name="maven.has.jar.resource.patterns" value="true"/>
-    </j:when>
-    <j:otherwise>
-      <ant:property name="maven.has.jar.resource.patterns" value="false"/>
-    </j:otherwise>
-  </j:choose>
-
-  <ant:patternset id="maven.jar.resources.set">
-    <j:forEach var="res" items="${pom.build.resources.includes}">
-      <ant:include name="${res}"/>
-    </j:forEach>
-    <j:forEach var="res" items="${pom.build.resources.excludes}">
-      <ant:exclude name="${res}"/>
-    </j:forEach>
-  </ant:patternset>
+  xmlns:resources="resources"
+  xmlns:maven="jelly:maven">
 
   <!-- ================================================================== -->
   <!-- P R E P A R E  F I L E  S Y S T E M                                -->
@@ -45,24 +25,25 @@
         prereqs="java:prepare-filesystem">
     <echo>Compiling to ${maven.build.dest}</echo>
     <j:choose>
-      <j:when test="${sourcesPresent == 'true'}">
-      	<ant:javac
+      <j:when test="${sourcesPresent}">
+        <ant:javac
           destdir="${maven.build.dest}"
           excludes="**/package.html"
-          debug="${maven.compile.debug}"
-          deprecation="${maven.compile.deprecation}"
-          target="${maven.compile.target}"
-          optimize="${maven.compile.optimize}">
-          <ant:src>
-            <ant:path refid="maven.compile.src.set"/>
-          </ant:src>
-      
+          debug="${plugins.java.compileDebug}"
+          deprecation="${plugins.java.compileDeprecation}"
+          target="${plugins.java.compileTarget}"
+          optimize="${plugins.java.compileOptimize}">
+          
+          <j:forEach var="path" items="${pom.compileSourceRootsList}">
+            <ant:src path="${path}"/>
+          </j:forEach>
+          
           <!--
            | 
            | Source Modifications.
            |
           -->
-      
+          
           <j:forEach var="sm" items="${pom.build.sourceModifications}">
             <ant:available property="classPresent" classname="${sm.className}"/>
             <j:if test="${classPresent != 'true'}">
@@ -102,6 +83,7 @@
           <j:if test="${context.getVariable('maven.compile.verbose') != null}">
             <ant:setProperty name="verbose" value="${maven.compile.verbose}" />
           </j:if>
+
         </ant:javac>
       </j:when>
       <j:otherwise>
@@ -122,14 +104,11 @@
 
   <goal name="java:jar-resources"
         description="Copy any resources that must be present in the deployed JAR file">
-    <j:set var="build" value="${pom.build}"/>
-    <j:if test="${!empty(build)}">
-      <j:if test="${!pom.build.resources.isEmpty()}">
-        <resources:copy 
-          resources="${pom.build.resources}"
-          todir="${maven.build.dest}"
-        />
-      </j:if>
+        
+    <j:if test="${!pom.build.resources.isEmpty()}">
+      <resources:copy 
+        resources="${pom.build.resources}"
+        todir="${maven.build.dest}"/>
     </j:if>
   </goal>