You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2008/05/01 23:29:04 UTC
svn commit: r652672 - in /incubator/qpid/trunk/qpid/java:
broker-plugins/MANIFEST.MF broker-plugins/build.xml broker/build.xml
module.xml systests/build.xml
Author: rhs
Date: Thu May 1 14:29:04 2008
New Revision: 652672
URL: http://svn.apache.org/viewvc?rev=652672&view=rev
Log:
QPID-993: added an osgi manifest to broker-plugins jar
Added:
incubator/qpid/trunk/qpid/java/broker-plugins/MANIFEST.MF
Modified:
incubator/qpid/trunk/qpid/java/broker-plugins/build.xml
incubator/qpid/trunk/qpid/java/broker/build.xml
incubator/qpid/trunk/qpid/java/module.xml
incubator/qpid/trunk/qpid/java/systests/build.xml
Added: incubator/qpid/trunk/qpid/java/broker-plugins/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker-plugins/MANIFEST.MF?rev=652672&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker-plugins/MANIFEST.MF (added)
+++ incubator/qpid/trunk/qpid/java/broker-plugins/MANIFEST.MF Thu May 1 14:29:04 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/java/broker-plugins/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker-plugins/build.xml?rev=652672&r1=652671&r2=652672&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker-plugins/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker-plugins/build.xml Thu May 1 14:29:04 2008
@@ -19,9 +19,11 @@
-
-->
<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>
Modified: incubator/qpid/trunk/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/build.xml?rev=652672&r1=652671&r2=652672&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/build.xml Thu May 1 14:29:04 2008
@@ -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"/>
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=652672&r1=652671&r2=652672&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Thu May 1 14:29:04 2008
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/systests/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/build.xml?rev=652672&r1=652671&r2=652672&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/systests/build.xml Thu May 1 14:29:04 2008
@@ -19,12 +19,10 @@
-
-->
<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>