You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/04/02 18:27:25 UTC
svn commit: r390847 - in /jakarta/jmeter/branches/rel-2-1: MANIFEST
build.xml src/MANIFEST
Author: sebb
Date: Sun Apr 2 09:27:24 2006
New Revision: 390847
URL: http://svn.apache.org/viewcvs?rev=390847&view=rev
Log:
Move MANIFEST to top-level directory
Added:
jakarta/jmeter/branches/rel-2-1/MANIFEST (contents, props changed)
- copied, changed from r390613, jakarta/jmeter/branches/rel-2-1/src/MANIFEST
Removed:
jakarta/jmeter/branches/rel-2-1/src/MANIFEST
Modified:
jakarta/jmeter/branches/rel-2-1/build.xml
Copied: jakarta/jmeter/branches/rel-2-1/MANIFEST (from r390613, jakarta/jmeter/branches/rel-2-1/src/MANIFEST)
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/MANIFEST?p2=jakarta/jmeter/branches/rel-2-1/MANIFEST&p1=jakarta/jmeter/branches/rel-2-1/src/MANIFEST&r1=390613&r2=390847&rev=390847&view=diff
==============================================================================
(empty)
Propchange: jakarta/jmeter/branches/rel-2-1/MANIFEST
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/jmeter/branches/rel-2-1/MANIFEST
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: jakarta/jmeter/branches/rel-2-1/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/build.xml?rev=390847&r1=390846&r2=390847&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/build.xml Sun Apr 2 09:27:24 2006
@@ -800,7 +800,7 @@
<jar jarfile="${dest.jar.jmeter}/ApacheJMeter.jar"
includes="**/NewDriver*,**/DynamicClassLoader*"
basedir="${build.core}"
- manifest="${src.dir}/MANIFEST">
+ manifest="MANIFEST">
<metainf dir="." includes="LICENSE,NOTICE"/>
<manifest>
<attribute name="Main-Class" value="org.apache.jmeter.NewDriver"/>
@@ -814,7 +814,7 @@
<!-- core -->
<jar jarfile="${dest.jar}/ApacheJMeter_core.jar"
excludes="**/NewDriver*,**/DynamicClassLoader*"
- manifest="${src.dir}/MANIFEST">
+ manifest="MANIFEST">
<!-- Only include class files from build tree - see above -->
<fileset dir="${build.core}" includes="**/*.class"/>
<fileset dir="${src.core}" includes="org/apache/jmeter/images/**"
@@ -834,7 +834,7 @@
</jar>
<!-- components -->
- <jar jarfile="${dest.jar}/ApacheJMeter_components.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_components.jar" manifest="MANIFEST">
<fileset dir="${build.components}" includes="**/*.class" />
<fileset dir="${src.components}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -847,7 +847,7 @@
</jar>
<!-- functions -->
- <jar jarfile="${dest.jar}/ApacheJMeter_functions.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_functions.jar" manifest="MANIFEST">
<fileset dir="${build.functions}" includes="**/*.class" />
<fileset dir="${src.functions}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -860,7 +860,7 @@
</jar>
<!-- http without HtmlParserHTMLParser -->
- <jar jarfile="${dest.jar}/ApacheJMeter_http.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_http.jar" manifest="MANIFEST">
<fileset dir="${build.http}" includes="**/*.class"
excludes="**/HtmlParserHTMLParser.class"/>
<fileset dir="${src.http}" includes="**/*.properties" />
@@ -874,7 +874,7 @@
</jar>
<!-- HtmlParserHTMLParser -->
- <jar jarfile="${lib.dir}/htmlparserparser.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${lib.dir}/htmlparserparser.jar" manifest="MANIFEST">
<fileset dir="${build.http}" includes="**/HtmlParserHTMLParser.class"/>
<metainf dir="." includes="LICENSE,NOTICE"/>
<manifest>
@@ -886,7 +886,7 @@
</jar>
<!-- ftp -->
- <jar jarfile="${dest.jar}/ApacheJMeter_ftp.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_ftp.jar" manifest="MANIFEST">
<fileset dir="${build.ftp}" includes="**/*.class" />
<fileset dir="${src.ftp}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -899,7 +899,7 @@
</jar>
<!-- jdbc -->
- <jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="MANIFEST">
<fileset dir="${build.jdbc}" includes="**/*.class" />
<fileset dir="${src.jdbc}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -912,7 +912,7 @@
</jar>
<!-- java -->
- <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="MANIFEST">
<fileset dir="${build.java}" includes="**/*.class" />
<fileset dir="${src.java}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -925,7 +925,7 @@
</jar>
<!-- junit -->
- <jar jarfile="${dest.jar}/ApacheJMeter_junit.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_junit.jar" manifest="MANIFEST">
<fileset dir="${build.junit}" includes="**/*.class" />
<fileset dir="${src.junit}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -938,7 +938,7 @@
</jar>
<!-- report -->
- <jar jarfile="${dest.jar}/ApacheJMeter_report.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_report.jar" manifest="MANIFEST">
<fileset dir="${build.report}" includes="**/*.class" />
<fileset dir="${src.report}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -951,7 +951,7 @@
</jar>
<!-- ldap -->
- <jar jarfile="${dest.jar}/ApacheJMeter_ldap.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_ldap.jar" manifest="MANIFEST">
<fileset dir="${build.ldap}" includes="**/*.class" />
<fileset dir="${src.ldap}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -964,7 +964,7 @@
</jar>
<!-- mail -->
- <jar jarfile="${dest.jar}/ApacheJMeter_mail.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_mail.jar" manifest="MANIFEST">
<fileset dir="${build.mail}" includes="**/*.class" />
<fileset dir="${src.mail}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -977,7 +977,7 @@
</jar>
<!-- tcp -->
- <jar jarfile="${dest.jar}/ApacheJMeter_tcp.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_tcp.jar" manifest="MANIFEST">
<fileset dir="${build.tcp}" includes="**/*.class" />
<fileset dir="${src.tcp}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -990,7 +990,7 @@
</jar>
<!-- monitor -->
- <jar jarfile="${dest.jar}/ApacheJMeter_monitors.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_monitors.jar" manifest="MANIFEST">
<fileset dir="${build.monitor.model}" includes="**/*.class" />
<fileset dir="${build.monitor.components}" includes="**/*.class" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -1005,7 +1005,7 @@
<!-- jms -->
<!-- Ensure that build dir exists, even if JMS has not been built -->
<mkdir dir="${build.jms}"/>
- <jar jarfile="${dest.jar}/ApacheJMeter_jms.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_jms.jar" manifest="MANIFEST">
<fileset dir="${build.jms}" includes="**/*.class" />
<fileset dir="${src.jms}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -1017,7 +1017,7 @@
</manifest>
</jar>
- <jar jarfile="${lib.dir}/htmlparser.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${lib.dir}/htmlparser.jar" manifest="MANIFEST">
<fileset dir="${build.htmlparser}" includes="**/*.class" excludes="org/htmlparser/tests/**/*.class"/>
<fileset dir="${src.htmlparser}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -1029,7 +1029,7 @@
</manifest>
</jar>
- <jar jarfile="${lib.dir}/jorphan.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${lib.dir}/jorphan.jar" manifest="MANIFEST">
<fileset dir="${build.jorphan}" includes="**/*.class"/>
<fileset dir="${src.jorphan}" includes="**/*.properties"/>
<metainf dir="." includes="LICENSE,NOTICE"/>
@@ -1050,7 +1050,7 @@
description="Default: build from source. Does not create docs."/>
<target name="install-examples" depends="compile-examples" description="Build and installs the example components.">
- <jar jarfile="${dest.jar}/ApacheJMeter_examples.jar" manifest="${src.dir}/MANIFEST">
+ <jar jarfile="${dest.jar}/ApacheJMeter_examples.jar" manifest="MANIFEST">
<fileset dir="${build.examples}" includes="**/*.class" />
<fileset dir="${src.examples}" includes="**/*.properties" />
<metainf dir="." includes="LICENSE,NOTICE"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org