QPID-3558: Add broker Maven and OSGi artifacts to build

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

7 files changed, 58 insertions, 5 deletions

diff --git a/qpid/bin/release.sh b/qpid/bin/release.sh
index 104fb077a0..decc1cdd75 100755
--- a/qpid/bin/release.sh
+++ b/qpid/bin/release.sh
@@ -222,6 +222,9 @@ if [ "JAVA" == "$JAVA" ] ; then
   # copy the Maven artifacts
   cp -a qpid-${VER}/java/client/release/maven artifacts/
   cp -a qpid-${VER}/java/common/release/maven artifacts/
+  cp -a qpid-${VER}/java/broker/release/maven artifacts/
+  cp -a qpid-${VER}/java/bdbstore/release/maven artifacts/
+  cp -a qpid-${VER}/java/management/common/release/maven artifacts/
 fi
 
 if [ "TOOLS" = "$TOOLS" ] ; then
diff --git a/qpid/java/bdbstore/build.xml b/qpid/java/bdbstore/build.xml
index 9355358e6c..e4bc721930 100644
--- a/qpid/java/bdbstore/build.xml
+++ b/qpid/java/bdbstore/build.xml
@@ -17,8 +17,9 @@
  - under the License.
  -->
 <project name="bdbstore" default="build">
-    <property name="module.depends" value="common client management/common broker perftests systests" />
-    <property name="module.test.depends" value="test common/test broker/test management/common perftests systests" />
+    <property name="module.depends" value="common broker" />
+    <property name="module.test.depends" value="test client common/test broker/test management/common perftests systests" />
+    <property name="module.genpom" value="true"/>
 
     <import file="../module.xml" />
 
@@ -80,5 +81,4 @@ http://www.oracle.com/technetwork/database/berkeleydb/downloads/jeoslicense-0868
         <fileset dir="src/test/resources/upgrade"/>
       </copy>
     </target>
-
 </project>
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java
index f6344b3d7d..f6344b3d7d 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java
diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml
index e733474ef0..0731e08103 100644
--- a/qpid/java/broker/build.xml
+++ b/qpid/java/broker/build.xml
@@ -19,10 +19,10 @@
  -
  -->
 <project name="AMQ Broker" default="build">
-
     <property name="module.depends" value="management/common common"/>
     <property name="module.test.depends" value="common/test" />
     <property name="module.main" value="org.apache.qpid.server.Main"/>
+    <property name="module.genpom" value="true"/>
 
     <import file="../module.xml"/>
 
@@ -84,4 +84,5 @@
 
     <target name="release-bin" depends="release-bin-tasks"/>
 
+    <target name="bundle" depends="bundle-tasks"/>
 </project>
diff --git a/qpid/java/broker/src/main/java/broker.bnd b/qpid/java/broker/src/main/java/broker.bnd
new file mode 100755
index 0000000000..36c7d1a5b3
--- /dev/null
+++ b/qpid/java/broker/src/main/java/broker.bnd
@@ -0,0 +1,26 @@
+#
+# 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.
+#
+
+ver: 0.13.0
+
+Bundle-SymbolicName: qpid-broker
+Bundle-Version: ${ver}
+Export-Package: *;version=${ver}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
diff --git a/qpid/java/lib/poms/je-4.0.103.xml b/qpid/java/lib/poms/je-4.0.103.xml
new file mode 100644
index 0000000000..20d09d3451
--- /dev/null
+++ b/qpid/java/lib/poms/je-4.0.103.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   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.
+-->
+<dep>
+  <groupId>com.sleepycat</groupId>
+  <artifactId>je</artifactId>
+  <version>4.0.103</version>
+</dep>
diff --git a/qpid/java/management/common/build.xml b/qpid/java/management/common/build.xml
index ce2ec3a106..1a0520b1e3 100644
--- a/qpid/java/management/common/build.xml
+++ b/qpid/java/management/common/build.xml
@@ -19,8 +19,9 @@
  -
  -->
 <project name="Management Common" default="build">
-
     <import file="../../module.xml"/>
 
+    <property name="module.genpom" value="true"/>
+
     <target name="bundle" depends="bundle-tasks"/>
 </project>