Author: sebb
Date: Sat Mar 25 16:38:08 2006
New Revision: 388865

URL: http://svn.apache.org/viewcvs?rev=388865&view=rev
Log:
HtmlParserHTMLParser now in separate jar

Modified:
    jakarta/jmeter/branches/rel-2-1/build.xml
    jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml

Modified: jakarta/jmeter/branches/rel-2-1/build.xml
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/build.xml?rev=388865&r1=388864&r2=388865&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/build.xml Sat Mar 25 16:38:08 2006
@@ -859,9 +859,10 @@
        </manifest>
     </jar>
 
-    <!-- http -->
+    <!-- http without HtmlParserHTMLParser -->
     <jar jarfile="${dest.jar}/ApacheJMeter_http.jar" 
manifest="${src.dir}/MANIFEST">
-      <fileset dir="${build.http}" includes="**/*.class" />
+      <fileset dir="${build.http}" includes="**/*.class" 
+       excludes="**/HtmlParserHTMLParser.class"/>
       <fileset dir="${src.http}" includes="**/*.properties" />
         <metainf dir="." includes="LICENSE,NOTICE"/>
        <manifest>
@@ -872,6 +873,18 @@
        </manifest>
     </jar>
     
+    <!-- HtmlParserHTMLParser -->
+    <jar jarfile="${lib.dir}/htmlparserparser.jar" 
manifest="${src.dir}/MANIFEST">
+      <fileset dir="${build.http}" includes="**/HtmlParserHTMLParser.class"/>
+        <metainf dir="." includes="LICENSE,NOTICE"/>
+       <manifest>
+           <attribute name="Built-By" value="${user.name}"/>
+           <attribute name="Implementation-Version" value="${jmeter.version}"/>
+           <attribute name="X-Compile-Source-JDK" value="${src.java.version}"/>
+           <attribute name="X-Compile-Target-JDK" 
value="${target.java.version}"/>
+       </manifest>
+    </jar>
+           
     <!-- ftp -->
     <jar jarfile="${dest.jar}/ApacheJMeter_ftp.jar" 
manifest="${src.dir}/MANIFEST">
       <fileset dir="${build.ftp}" includes="**/*.class" />
@@ -1087,6 +1100,7 @@
     <include name="${extras.dir}/**"/>
     <include name="${lib.dir}/jorphan.jar"/>
     <include name="${lib.dir}/htmlparser.jar"/>
+    <include name="${lib.dir}/htmlparserparser.jar"/>
     <include name="${lib.dir}/junit/test.jar"/>
   </patternset>
 

Modified: jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml?rev=388865&r1=388864&r2=388865&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml Sat Mar 25 16:38:08 2006
@@ -115,6 +115,8 @@
 <li>Updated to Commons Collections 3.1</li>
 <li>Improved formatting of Request Data in Tree View</li>
 <li>Expanded user documentation</li>
+<li>Added MANIFEST, NOTICE and LICENSE to all jars</li>
+<li>Extract htmlparser interface into separate jarfile to make it possible to 
replace the parser</li>
 </ul>
 
 <hr/>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to