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

[se...@apache.org]

Author: sebb
Date: Mon Jan 23 13:53:31 2012
New Revision: 1234794

URL: http://svn.apache.org/viewvc?rev=1234794&view=rev
Log:
Parent pom has to be packaged as a pom
Add new config jar and pom

Added:
    jmeter/trunk/res/maven/ApacheJMeter_config.pom   (with props)
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=1234794&r1=1234793&r2=1234794&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Mon Jan 23 13:53:31 2012
@@ -1469,7 +1469,11 @@ 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">
+    <!-- 
+        Create the Maven jar needed to hold configuration data
+        Cannot be added to any of the other jars as that would cause problems for stand-alone JMeter usage.
+    -->
+    <jar jarfile="${maven.dir}/ApacheJMeter_config.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"
@@ -1585,10 +1589,11 @@ run JMeter unless all the JMeter jars ar
     </macrodef>
 
 
-    <deployfile stem="ApacheJMeter_parent"/>
+    <deployfile stem="ApacheJMeter_parent" packaging="pom"/>
     <deployfile stem="jorphan"/>
     <deployfile stem="ApacheJMeter"/>
     <deployfile stem="ApacheJMeter_components"/>
+    <deployfile stem="ApacheJMeter_config"/>
     <deployfile stem="ApacheJMeter_core"/>
     <deployfile stem="ApacheJMeter_ftp"/>
     <deployfile stem="ApacheJMeter_functions"/>

Added: jmeter/trunk/res/maven/ApacheJMeter_config.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_config.pom?rev=1234794&view=auto
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_config.pom (added)
+++ jmeter/trunk/res/maven/ApacheJMeter_config.pom Mon Jan 23 13:53:31 2012
@@ -0,0 +1,32 @@
+<!--
+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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.jmeter</groupId>
+      <artifactId>ApacheJMeter_parent</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <relativePath>.</relativePath>
+    </parent>
+    <groupId>org.apache.jmeter</groupId>
+    <artifactId>ApacheJMeter_config</artifactId>
+    <name>Apache JMeter Configuration</name>
+
+</project>
\ No newline at end of file

Propchange: jmeter/trunk/res/maven/ApacheJMeter_config.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1234794&r1=1234793&r2=1234794&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Mon Jan 23 13:53:31 2012
@@ -22,7 +22,8 @@ under the License.
     <artifactId>ApacheJMeter_parent</artifactId>
     <version>@MAVEN.DEPLOY.VERSION@</version>
     <name>Apache JMeter parent</name>
-    <packaging>jar</packaging>
+    <!-- Parent poms have to be packaged as pom, not jar -->
+    <packaging>pom</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