From 59cfb344a6fe7d8f566f3bdc586fdaa1e9d50aed Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Tue, 23 Aug 2005 14:36:09 +0000 Subject: [PATCH] MAVEN-1669: Added support for the ejb-client type. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239415 13f79535-47bb-0310-9956-ffa450edef68 --- maven-model/maven.mdo | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/maven-model/maven.mdo b/maven-model/maven.mdo index 0907fa6d94..74333aa780 100644 --- a/maven-model/maven.mdo +++ b/maven-model/maven.mdo @@ -1312,19 +1312,38 @@ { return getJar(); } - - return getArtifactId() + "-" + getVersion() + "." + getExtension(); + + String artifact; + + if ("ejb-client".equals(getType())) { + artifact = getArtifactId() + "-" + getVersion() + "-client." + getExtension(); + } else { + artifact = getArtifactId() + "-" + getVersion() + "." + getExtension(); + } + + return artifact; + } + + public String getTypeDirectory() + { + String path; + if (getType().equals("ejb-client")) { + path = "ejbs"; + } else { + path = getType() + "s"; + } + return path; } public String getExtension() { - if ("ejb".equals(getType()) || "plugin".equals(getType()) || "aspect".equals(getType()) || "uberjar".equals(getType())) return "jar"; + if ("ejb".equals(getType()) || "ejb-client".equals(getType()) || "plugin".equals(getType()) || "aspect".equals(getType()) || "uberjar".equals(getType())) return "jar"; return getType(); } public boolean isAddedToClasspath() { - return ("jar".equals(getType()) || "ejb".equals(getType()) || "sar".equals(getType())); + return ("jar".equals(getType()) || "ejb".equals(getType()) || "ejb-client".equals(getType()) || "sar".equals(getType())); } public boolean isPlugin()