QPID-993: added an osgi manifest to broker-plugins jar

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@652672 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 40 insertions, 16 deletions

diff --git a/qpid/java/broker-plugins/MANIFEST.MF b/qpid/java/broker-plugins/MANIFEST.MF
new file mode 100644
index 0000000000..e682614ed4
--- /dev/null
+++ b/qpid/java/broker-plugins/MANIFEST.MF
@@ -0,0 +1,14 @@
+Bundle-ManifestVersion: 2
+Bundle-Name: Qpid Plugins
+Bundle-Description: A simple plugin for qpid.
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-DocURL: http://www.apache.org/
+Bundle-SymbolicName: org.apache.qpid.extras.example-plugin
+Bundle-Activator: org.apache.qpid.extras.Activator
+Private-Package: org.apache.qpid.extras,org.apache.qpid.extras.exchang
+ es.diagnostic,org.apache.qpid.extras.exchanges.example
+Import-Package: javax.management,javax.management.openmbean,org.apache
+ .qpid,org.apache.qpid.framing,org.apache.qpid.junit.extensions.util,o
+ rg.apache.qpid.protocol,org.apache.qpid.server.exchange,org.apache.qp
+ id.server.management,org.apache.qpid.server.queue,org.apache.qpid.ser
+ ver.virtualhost,org.osgi.framework;version=1.3
diff --git a/qpid/java/broker-plugins/build.xml b/qpid/java/broker-plugins/build.xml
index 669eadd2e8..9787eeebc3 100644
--- a/qpid/java/broker-plugins/build.xml
+++ b/qpid/java/broker-plugins/build.xml
@@ -19,9 +19,11 @@ nn - or more contributor license agreements.  See the NOTICE file
  -
  -->
 <project name="AMQ Broker-Plugins" default="build">
+
     <property name="module.depends" value="client broker common junit-toolkit"/>
-    <property name="module.dist" value="false"/>
-    <property name="module.vm.version" value="1.5"/>
+    <property name="module.manifest" value="MANIFEST.MF"/>
+    <property name="module.plugin" value="true"/>
+
     <import file="../module.xml"/>
 
 </project>
diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml
index bf402af7f7..295c38a3a3 100644
--- a/qpid/java/broker/build.xml
+++ b/qpid/java/broker/build.xml
@@ -22,7 +22,6 @@
 
   <property name="module.depends" value="common"/>
   <property name="module.main" value="org.apache.qpid.server.Main"/>
-  <property name="module.vm.version" value="1.5"/>
 
   <import file="../module.xml"/>
 
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 203ed19154..443159cc3a 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -61,7 +61,14 @@
     <pathelement location="${module.precompiled}"/>
   </path>
 
-  <property name="module.jar" location="${build.lib}/${project.name}-${module.name}-${project.version}.jar"/>
+  <condition property="module.jar"
+             value="${build.plugins}/${project.name}-${module.name}-${project.version}.jar"
+             else="${build.lib}/${project.name}-${module.name}-${project.version}.jar">
+    <and>
+      <isset property="module.plugin"/>
+      <istrue value="${module.plugin}"/>
+    </and>
+  </condition>
   <property name="module.test.jar" location="${build.lib}/${project.name}-${module.name}-tests-${project.version}.jar"/>
 
   <!-- module.depends and module.test.depends are supplied by the importing file -->
@@ -163,7 +170,7 @@
   </target>
 
   <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/>
-  
+
   <condition property="config" value="${profile}.testprofile" else="default.testprofile">
       <and>
           <isset property="profile"/>
@@ -173,15 +180,13 @@
 
   <property file="${project.root}/${config}"/>
 
-  <target name="test" depends="compile-tests" if="module.test.src.exists"
+  <target name="test" depends="build,compile-tests" if="module.test.src.exists"
           description="execute unit tests">
 
-    <copy file="${build.lib}/${project.name}-broker-plugins-${project.version}.jar" todir="${build.plugins}"/>   
-     
     <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no"
-           haltonfailure="${haltonfailure}" haltonerror="${haltonerror}" 
+           haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
            printsummary="on" timeout="600000" >
-       
+
       <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
       <sysproperty key="root.logging.level" value="${root.logging.level}"/>
       <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
@@ -192,7 +197,7 @@
       <sysproperty key="broker.version" value="${broker.version}"/>
       <sysproperty key="test.excludes" value="${test.excludes}"/>
       <sysproperty key="test.excludesfile" value="${test.excludesfile}"/>
-      <sysproperty key="max_prefetch" value ="${max_prefetch}"/>  
+      <sysproperty key="max_prefetch" value ="${max_prefetch}"/>
       <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
       <sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/broker"/>
       <sysproperty key="QPID_HOME" value="${project.root}/broker"/>
@@ -205,7 +210,7 @@
       <batchtest fork="${test.fork}" todir="${build.results}">
         <fileset dir="${module.test.src}">
           <include name="**/${test1}.java"/>
-          <include name="**/${test}.java"/>     
+          <include name="**/${test}.java"/>
         </fileset>
       </batchtest>
     </junit>
@@ -221,10 +226,16 @@
     </copy>
   </target>
 
-  <target name="jar" depends="compile" description="create jar">
+  <target name="jar.manifest" depends="compile" if="module.manifest">
+    <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}"/>
+  </target>
+
+  <target name="jar.nomanifest" depends="compile" unless="module.manifest">
     <jar destfile="${module.jar}" basedir="${module.classes}"/>
   </target>
 
+  <target name="jar" depends="jar.manifest,jar.nomanifest" description="create jar"/>
+
   <target name="jar-tests" depends="compile-tests" description="create unit test jar">
     <jar destfile="${module.test.jar}" basedir="${module.test.classes}"/>
   </target>
diff --git a/qpid/java/systests/build.xml b/qpid/java/systests/build.xml
index db7f594421..da72657185 100644
--- a/qpid/java/systests/build.xml
+++ b/qpid/java/systests/build.xml
@@ -19,12 +19,10 @@ nn - or more contributor license agreements.  See the NOTICE file
  -
  -->
 <project name="System Tests" default="build">
-    <property name="module.depends" value="client broker common junit-toolkit"/>
-    <property name="module.dist" value="false"/>
 
+    <property name="module.depends" value="client broker common junit-toolkit"/>
     <property name="module.test.src" location="src/main/java"/>
 
     <import file="../module.xml"/>
-    <property name="module.test.classes" location="${module.build}/main/classes"/>
 
 </project>