add since markers, add Mark to contributors
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/4e2e7d96 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/4e2e7d96 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/4e2e7d96 Branch: refs/heads/master Commit: 4e2e7d96145571c26338f21ff9405378966a2b5f Parents: e93a598 Author: Stefan Bodewig <[email protected]> Authored: Mon Jul 10 21:40:23 2017 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Mon Jul 10 21:42:22 2017 +0200 ---------------------------------------------------------------------- CONTRIBUTORS | 1 + WHATSNEW | 3 +++ contributors.xml | 4 ++++ manual/Tasks/ejb.html | 4 ++-- .../tools/ant/taskdefs/optional/ejb/EjbJar.java | 1 + .../taskdefs/optional/ejb/OrionDeploymentTool.java | 15 +++++++-------- 6 files changed, 18 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/4e2e7d96/CONTRIBUTORS ---------------------------------------------------------------------- diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 17022c7..65a1cfa 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -233,6 +233,7 @@ Mariusz Nowostawski Mark A. Ziesemer Mark DeLaFranier Mark Hecker +Mark Niggemann Mark R. Diggory Mark Salter Markus Kahl http://git-wip-us.apache.org/repos/asf/ant/blob/4e2e7d96/WHATSNEW ---------------------------------------------------------------------- diff --git a/WHATSNEW b/WHATSNEW index aa2ad03..42f49a7 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -22,6 +22,9 @@ Other changes: override the current time/date used by <tstamp>. Bugzilla Report 61079 + * added Orion support to ejbjar + Github Pull Request #33 + Changes from Ant 1.9.8 TO Ant 1.9.9 =================================== http://git-wip-us.apache.org/repos/asf/ant/blob/4e2e7d96/contributors.xml ---------------------------------------------------------------------- diff --git a/contributors.xml b/contributors.xml index ee049cb..fd404f8 100644 --- a/contributors.xml +++ b/contributors.xml @@ -961,6 +961,10 @@ </name> <name> <first>Mark</first> + <last>Niggemann</last> + </name> + <name> + <first>Mark</first> <middle>A.</middle> <last>Ziesemer</last> </name> http://git-wip-us.apache.org/repos/asf/ant/blob/4e2e7d96/manual/Tasks/ejb.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html index c976509..68f7e91 100644 --- a/manual/Tasks/ejb.html +++ b/manual/Tasks/ejb.html @@ -62,7 +62,7 @@ In general these tasks are specific to the particular vendor's EJB Server.</p> <li><a href="http://www.jboss.org/"; target="_top"> JBoss 2.1</a> and above EJB servers</li> <li><a href="http://web.archive.org/web/20080516210506/http://www.ironflare.com/";> - Orion Application Server</a> 2.0</li> + Orion Application Server</a> 2.0 <em>since 1.9.10</em></li> <li><a href="http://www.bea.com"; target="_top">Weblogic</a> 4.5.1 through to 7.0 EJB servers</li> <li><a href="http://www.objectweb.org/jonas/"; target="_top">JOnAS</a> @@ -1789,7 +1789,7 @@ to the final ejb jar file. Orion has one deployment descriptor: </tr> <tr> <td valign="top">destdir</td> - <td valign="top">The base directory into which the generated + <td valign="top">The base directory into which the generated jar files are deposited. Jar files are deposited in directories corresponding to their location within the descriptordir namespace. </td> http://git-wip-us.apache.org/repos/asf/ant/blob/4e2e7d96/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java index 2981cab..6e7166b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java @@ -226,6 +226,7 @@ public class EjbJar extends MatchingTask { * deployment tool for Orion server. * * @return the deployment tool instance to be configured. + * @since Ant 1.9.10 */ public OrionDeploymentTool createOrion() { OrionDeploymentTool tool = new OrionDeploymentTool(); http://git-wip-us.apache.org/repos/asf/ant/blob/4e2e7d96/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java index 058e2e4..93bbbc0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java @@ -23,19 +23,18 @@ import java.util.Hashtable; import org.apache.tools.ant.Project; /** - * The deployment tool to add the orion specific deployment descriptor to the - * ejb jar file. Orion only requires one additional file orion-ejb-jar.xml + * The deployment tool to add the orion specific deployment descriptor to the + * ejb jar file. Orion only requires one additional file orion-ejb-jar.xml * and does not require any additional compilation. * - * @author <a href="mailto:[email protected]";>Mark Niggemann</a> - * @version 1.0 + * @since Ant 1.9.10 * @see EjbJar#createOrion */ public class OrionDeploymentTool extends GenericDeploymentTool { - + protected static final String ORION_DD = "orion-ejb-jar.xml"; - + /** Instance variable that stores the suffix for the jboss jarfile. */ private String jarSuffix = ".jar"; @@ -47,14 +46,14 @@ public class OrionDeploymentTool extends GenericDeploymentTool { protected void addVendorFiles(Hashtable ejbFiles, String baseName) { String ddPrefix = (usingBaseJarName() ? "" : baseName ); File orionDD = new File(getConfig().descriptorDir, ddPrefix + ORION_DD); - + if (orionDD.exists()) { ejbFiles.put(META_DIR + ORION_DD, orionDD); } else { log("Unable to locate Orion deployment descriptor. It was expected to be in " + orionDD.getPath(), Project.MSG_WARN); return; } - + } /**
