Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Subject: Patch for Orion EjbJar support
From: Patrick Higgins <phiggins@transzap.com>
To: dev@ant.apache.org
Content-Type: multipart/mixed; boundary="=-ENBkJStl3ILjn1+x3ZNb"
Message-Id: <1060298116.2101.13.camel@phiggins.transzap.com>
Mime-Version: 1.0
Date: 07 Aug 2003 17:15:17 -0600

--=-ENBkJStl3ILjn1+x3ZNb
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

I have attached a patch adding an OrionDeploymentTool so that the ejbjar
task supports the Orion application server. The patch is against Ant
version 1.5.3-1.

--=-ENBkJStl3ILjn1+x3ZNb
Content-Disposition: attachment; filename=orion-ant-1.5.3.patch
Content-Type: text/x-patch; name=orion-ant-1.5.3.patch; charset=iso-8859-1
Content-Transfer-Encoding: 7bit

diff -urN apache-ant-1.5.3-1/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java apache-ant-1.5.3-1.orion/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
--- apache-ant-1.5.3-1/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java	2003-04-16 03:28:25.000000000 -0600
+++ apache-ant-1.5.3-1.orion/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java	2003-08-07 16:33:39.000000000 -0600
@@ -313,6 +313,17 @@
     }
 
     /**
+     * Adds a deployment tool for Orion server.
+     *
+     * @return the deployment tool instance to be configured.
+     */
+    public OrionDeploymentTool createOrion() {
+        OrionDeploymentTool tool = new OrionDeploymentTool();
+        addDeploymentTool(tool);
+        return tool;
+    }
+
+    /**
      * Adds a deployment tool for Weblogic when using the Toplink
      * Object-Relational mapping.
      *
diff -urN apache-ant-1.5.3-1/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java apache-ant-1.5.3-1.orion/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
--- apache-ant-1.5.3-1/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java	1969-12-31 17:00:00.000000000 -0700
+++ apache-ant-1.5.3-1.orion/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java	2003-08-07 16:36:31.000000000 -0600
@@ -0,0 +1,98 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.apache.tools.ant.taskdefs.optional.ejb;
+
+import java.io.File;
+import java.util.Hashtable;
+import org.apache.tools.ant.*;
+
+/**
+ * The deployment tool to add the orion specific deployment descriptor to the
+ * ejb jar file.  Orion only requires one additional file
+ * ${BeanName}-orion-ejb-jar.xml and does not require any additional
+ * compilation.
+ *
+ * @author <a href="mailto:phiggins@transzap.com">Patrick Higgins</a>
+ * @version 1.0
+ * @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 orion jarfile. */
+    private String jarSuffix = ".jar";
+
+    /**
+     * Add any vendor specific files which should be included in the
+     * EJB Jar.
+     */
+    protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
+        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;
+        }
+    }
+
+    /**
+     * Get the vendor specific name of the Jar that will be output. The
+     * modification date of this jar will be checked against the dependent
+     * bean classes.
+     */
+    File getVendorOutputJarFile(String baseName) {
+        return new File(getDestDir(), baseName + jarSuffix);
+    }
+}


--=-ENBkJStl3ILjn1+x3ZNb
Content-Type: text/plain; charset=us-ascii

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
--=-ENBkJStl3ILjn1+x3ZNb--