svn commit: r1234668 - in /jmeter/trunk: build.xml res/maven/ApacheJMeter_parent.pom

[se...@apache.org]

Author: sebb
Date: Mon Jan 23 02:09:30 2012
New Revision: 1234668

URL: http://svn.apache.org/viewvc?rev=1234668&view=rev
Log:
Create parent jar with configuration files from bin/

Modified:
    jmeter/trunk/build.xml
    jmeter/trunk/res/maven/ApacheJMeter_parent.pom

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1234668&r1=1234667&r2=1234668&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Mon Jan 23 02:09:30 2012
@@ -1469,6 +1469,19 @@ run JMeter unless all the JMeter jars ar
       <fileset dir="${dest.jar.jmeter}" includes="ApacheJMeter.jar"/>
       <fileset dir="${lib.dir}" includes="jorphan.jar"/>
     </copy>
+    <jar jarfile="${maven.dir}/ApacheJMeter_parent.jar" manifest="${build.dir}/MANIFEST_SRC.MF">
+        <zipfileset file="${resources.meta-inf}/default.notice"
+          fullpath="META-INF/NOTICE" />
+        <zipfileset file="${resources.meta-inf}/default.license"
+          fullpath="META-INF/LICENSE" />
+      <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="*.bshrc"/>
+      <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="*.parameters"/>
+      <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="log4j.conf"/>
+      <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="logkit.xml"/>
+      <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="proxyserver.jks"/>
+      <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="users.dtd"/>
+      <zipfileset dir="${dest.jar.jmeter}" prefix="bin" includes="users.xml"/>
+    </jar>
   </target>
 
   <!-- 
@@ -1572,7 +1585,7 @@ run JMeter unless all the JMeter jars ar
     </macrodef>
 
 
-    <deployfile stem="ApacheJMeter_parent" packaging="pom"/>
+    <deployfile stem="ApacheJMeter_parent"/>
     <deployfile stem="jorphan"/>
     <deployfile stem="ApacheJMeter"/>
     <deployfile stem="ApacheJMeter_components"/>

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1234668&r1=1234667&r2=1234668&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Mon Jan 23 02:09:30 2012
@@ -22,7 +22,7 @@ under the License.
     <artifactId>ApacheJMeter_parent</artifactId>
     <version>@MAVEN.DEPLOY.VERSION@</version>
     <name>Apache JMeter parent</name>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
     
     <description>Apache JMeter is open source software, a 100% pure Java desktop application designed to load test
         functional behavior and measure performance. It was originally designed for testing Web Applications but has