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
This commit is contained in:
jvanzyl committed
1 parent
3da380e2e9
commit
6801d9ed62
15 files changed
+221
-211
No files matched your search
+20
-41
@@ -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>
|
||||
|
||||
|
||||
@@ -4,4 +4,7 @@
|
||||
|
||||
maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
|
||||
maven.jar.mainclass =
|
||||
maven.compile.target = 1.1
|
||||
compileTarget = 1.1
|
||||
compileDebug = on
|
||||
compileOptimize = off
|
||||
compileDeprecation = off
|
||||
@@ -14,62 +14,4 @@
|
||||
<connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/java/</connection>
|
||||
<url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/java/</url>
|
||||
</repository>
|
||||
<developers>
|
||||
<developer>
|
||||
<name>dIon Gillard</name>
|
||||
<id>dion</id>
|
||||
<email>dion@multitask.com.au</email>
|
||||
<organization>Multitask Consulting</organization>
|
||||
<roles>
|
||||
<role>Documentation</role>
|
||||
<role>Jelly Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
<developer>
|
||||
<name>Bob McWhirter</name>
|
||||
<id>werken</id>
|
||||
<email>bob@werken.com</email>
|
||||
<organization>The Werken Company</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
<developer>
|
||||
<name>Vincent Massol</name>
|
||||
<id>vmassol</id>
|
||||
<email>vmassol@octo.com</email>
|
||||
<organization>Octo Technology</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
<developer>
|
||||
<name>St?phane Mor</name>
|
||||
<id>smor</id>
|
||||
<email>stephanemor@yahoo.fr</email>
|
||||
<organization>Hasgard Syst?mes et R?seaux</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
<developer>
|
||||
<name>Kurt Schrader</name>
|
||||
<id>kschrader</id>
|
||||
<email>kschrader@karmalab.org</email>
|
||||
<organization>University of Michigan</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
<developer>
|
||||
<name>Jason van Zyl</name>
|
||||
<id>jvanzyl</id>
|
||||
<email>jason@zenplex.com</email>
|
||||
<organization>Zenplex</organization>
|
||||
<roles>
|
||||
<role>Architect</role>
|
||||
<role>Release Manager</role>
|
||||
</roles>
|
||||
</developer>
|
||||
</developers>
|
||||
</project>
|
||||
Reference in new issue
Block a user