Add Orion EJB deployment tool to EjbJar taskdef.
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/49d63a11 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/49d63a11 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/49d63a11 Branch: refs/heads/master Commit: 49d63a1196840393653b262337e6be31016558e5 Parents: c75d148 Author: Mark Niggemann <[email protected]> Authored: Tue Apr 18 11:23:36 2017 -0500 Committer: Stefan Bodewig <[email protected]> Committed: Mon Jul 10 21:33:29 2017 +0200 ---------------------------------------------------------------------- .../tools/ant/taskdefs/optional/ejb/EjbJar.java | 12 ++++ .../optional/ejb/OrionDeploymentTool.java | 69 +++++--------------- 2 files changed, 29 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/49d63a11/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 e9b7ed4..2981cab 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 @@ -222,6 +222,18 @@ public class EjbJar extends MatchingTask { } /** + * Create a orion nested element used to configure 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 server. * * @return the deployment tool instance to be configured. http://git-wip-us.apache.org/repos/asf/ant/blob/49d63a11/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 683561c..058e2e4 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 @@ -1,68 +1,33 @@ /* - * The Apache Software License, Version 1.1 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * - * 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 [email protected]. - * - * 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.*; -import java.util.*; -import org.apache.tools.ant.*; +import java.io.File; +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 * and does not require any additional compilation. * - * @author <a href="mailto:[email protected]";>Atul Setlur</a> + * @author <a href="mailto:[email protected]";>Mark Niggemann</a> * @version 1.0 * @see EjbJar#createOrion */
