ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject [5/5] ant git commit: Merge branch '1.9.x'
Date Mon, 10 Jul 2017 19:45:45 GMT
Merge branch '1.9.x'

closes #33 by @niggemannmj


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c848ace1
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c848ace1
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c848ace1

Branch: refs/heads/master
Commit: c848ace1ed5c882b532e8fdf45293837b2d6b4a6
Parents: 7a7307b 4e2e7d9
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Mon Jul 10 21:44:40 2017 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Mon Jul 10 21:44:40 2017 +0200

----------------------------------------------------------------------
 CONTRIBUTORS                                    |  1 +
 WHATSNEW                                        |  3 +
 contributors.xml                                |  4 ++
 manual/Tasks/ejb.html                           | 43 ++++++++++++-
 .../tools/ant/taskdefs/optional/ejb/EjbJar.java | 13 ++++
 .../optional/ejb/OrionDeploymentTool.java       | 66 ++++++++++++++++++++
 6 files changed, 128 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/c848ace1/CONTRIBUTORS
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ant/blob/c848ace1/WHATSNEW
----------------------------------------------------------------------
diff --cc WHATSNEW
index ba2213e,42f49a7..b3a7a4e
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -39,8 -22,11 +39,11 @@@ 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
 -===================================
 +Changes from Ant 1.10.0 TO Ant 1.10.1
 +=====================================
  
  Fixed bugs:
  -----------

http://git-wip-us.apache.org/repos/asf/ant/blob/c848ace1/contributors.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ant/blob/c848ace1/manual/Tasks/ejb.html
----------------------------------------------------------------------
diff --cc manual/Tasks/ejb.html
index aa140e7,68f7e91..4911e14
--- a/manual/Tasks/ejb.html
+++ b/manual/Tasks/ejb.html
@@@ -61,6 -61,8 +61,8 @@@ In general these tasks are specific to 
    Application Server 6.0</li>
    <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 <em>since 1.9.10</em></li>
++  Orion Application Server</a> 2.0 <em>since 1.10.2</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>

http://git-wip-us.apache.org/repos/asf/ant/blob/c848ace1/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
----------------------------------------------------------------------
diff --cc src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
index f582091,6e7166b..948da53
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
@@@ -224,6 -222,19 +224,19 @@@ public class EjbJar extends MatchingTas
      }
  
      /**
+      * Create a orion nested element used to configure a
+      * deployment tool for Orion server.
+      *
+      * @return the deployment tool instance to be configured.
 -     * @since Ant 1.9.10
++     * @since Ant 1.10.2
+      */
+     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/c848ace1/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
----------------------------------------------------------------------
diff --cc src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
index 0000000,93bbbc0..38e2ae3
mode 000000,100644..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,0 -1,66 +1,66 @@@
+ /*
+  *  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
+  *
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  *
+  *  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.
+  *
+  */
+ 
+ package org.apache.tools.ant.taskdefs.optional.ejb;
+ 
+ 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.
+  *
 - * @since Ant 1.9.10
++ * @since Ant 1.10.2
+  * @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";
+ 
+     /**
+      * Add any vendor specific files which should be included in the
+      * EJB Jar.
+      */
+     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;
+         }
+ 
+     }
+ 
+     /**
+      * 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);
+     }
+ }


Mime
View raw message