Author: aadamchik
Date: Wed Jul 19 18:58:33 2006
New Revision: 423710

URL: http://svn.apache.org/viewvc?rev=423710&view=rev
Log:
fixing license copy

Modified:
    incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml?rev=423710&r1=423709&r2=423710&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml Wed Jul 19 
18:58:33 2006
@@ -61,14 +61,6 @@
                        <param name="stage-target" value="stage-modeler"/>
                        <param name="m2.artifactId" 
value="${project.name}-modeler"/>
                </antcall>
-               
-<!-- Ignore Ashwood - it is deployed on ibiblio and never changes 
-               <antcall target="bundle">
-                       <param name="stage-target" value="stage-lib"/>
-                       <param name="m2.artifactId" value="ashwood"/>
-                       <param name="project.version" value="1.1"/>
-               </antcall>
--->
        </target>
        
        <!-- 
@@ -168,8 +160,9 @@
                        </filterset>
                </copy>
                
-               <copy file="${cayenne.other}/licenses/LICENSE.txt"
-                       tofile="${stage}/LICENSE.txt"/>
+               <copy todir="${stage}">
+                       <fileset dir="${cayenne.other}/licenses/top/"/>
+               </copy>
                
                <copy
                        
file="${dist.base}/${project.name}-${project.version}/lib/modeler/${m2.artifactId}.jar"
@@ -179,25 +172,6 @@
                        <fileset dir="${cayenne.java}/src/modeler/java" 
includes="**/*.java"/>
                </jar>
        </target>
-       
-<!-- related to ashwood
-       <target name="stage-lib" depends="validate-pom">
-               <property name="stage" value="${build}/${m2.artifactId}"/>
-               <mkdir dir="${stage}"/>
-               
-               <copy file="maven/${m2.artifactId}-pom.xml" 
tofile="${stage}/pom.xml"/>
-               
-               <copy 
file="${cayenne.other}/licenses/LICENSE.${m2.artifactId}.txt"
-                       tofile="${stage}/LICENSE.txt"/>
-               
-               <copy
-                       
file="${cayenne.java}/lib/${m2.artifactId}-${project.version}.jar"
-                       todir="${stage}"/>
-               <copy
-                       
file="${cayenne.java}/lib-src/${m2.artifactId}-${project.version}-src.jar"
-                       
tofile="${stage}/${m2.artifactId}-${project.version}-sources.jar"/>
-       </target>
--->
        
        <!-- 
                Performs POM Schema validation.


Reply via email to