ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r503745 - in /ant/antlibs/common/trunk: common-tasks.xml ivy.xml m2.xml
Date Mon, 05 Feb 2007 16:02:11 GMT
Author: bodewig
Date: Mon Feb  5 08:02:10 2007
New Revision: 503745

URL: http://svn.apache.org/viewvc?view=rev&rev=503745
Log:
extract common functionality

Added:
    ant/antlibs/common/trunk/common-tasks.xml   (with props)
Modified:
    ant/antlibs/common/trunk/ivy.xml
    ant/antlibs/common/trunk/m2.xml

Added: ant/antlibs/common/trunk/common-tasks.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/common-tasks.xml?view=auto&rev=503745
==============================================================================
--- ant/antlibs/common/trunk/common-tasks.xml (added)
+++ ant/antlibs/common/trunk/common-tasks.xml Mon Feb  5 08:02:10 2007
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+<project name="common-tasks">
+  <!-- copy that expands Ant properties -->
+  <presetdef name="expandingcopy">
+    <sequential>
+      <copy>
+        <filterchain>
+          <expandproperties/>
+        </filterchain>
+      </copy>
+    </sequential>
+  </presetdef>
+</project>

Propchange: ant/antlibs/common/trunk/common-tasks.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ant/antlibs/common/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/ivy.xml?view=diff&rev=503745&r1=503744&r2=503745
==============================================================================
--- ant/antlibs/common/trunk/ivy.xml (original)
+++ ant/antlibs/common/trunk/ivy.xml Mon Feb  5 08:02:10 2007
@@ -20,6 +20,9 @@
 <project name="ivy">
   <description>Targets for ivy.xml creation/handling</description>
 
+  <dirname property="common.basedir" file="${ant.file.ivy}"/>
+  <import file="${common.basedir}/common-tasks.xml"/>
+
   <!-- ========================================================== -->
   <!-- init all the Ivy support   -->
   <!-- ========================================================== -->
@@ -44,12 +47,7 @@
 
   <!--copy an existing template-->
   <target name="copy-ivy.xml" depends="ivy-init" if="project.has-ivy.xml?">
-    <copy file="${project.ivy.xml}" tofile="${target.ivy.xml}">
-      <!-- we expand ant properties here.  -->
-      <filterchain>
-        <expandproperties/>
-      </filterchain>
-    </copy>
+    <expandingcopy file="${project.ivy.xml}" tofile="${target.ivy.xml}"/>
   </target>
 
 

Modified: ant/antlibs/common/trunk/m2.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/m2.xml?view=diff&rev=503745&r1=503744&r2=503745
==============================================================================
--- ant/antlibs/common/trunk/m2.xml (original)
+++ ant/antlibs/common/trunk/m2.xml Mon Feb  5 08:02:10 2007
@@ -20,6 +20,9 @@
 <project name="m2">
   <description>Targets for Maven2 POM creation/handling</description>
 
+  <dirname property="common.basedir" file="${ant.file.m2}"/>
+  <import file="${common.basedir}/common-tasks.xml"/>
+
   <!-- ========================================================== -->
   <!-- init all the maven2 support   -->
   <!-- ========================================================== -->
@@ -41,12 +44,7 @@
 
   <!--copy an existing template-->
   <target name="m2-copy-pom" depends="m2-init" if="project.haspom?">
-    <copy file="${project.pom}" tofile="${target.pom}">
-      <!-- we expand ant properties here.  -->
-      <filterchain>
-        <expandproperties/>
-      </filterchain>
-    </copy>
+    <expandingcopy file="${project.pom}" tofile="${target.pom}"/>
   </target>
 
 



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


Mime
View raw message