You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gr...@apache.org on 2011/10/31 18:20:53 UTC
svn commit: r1195572 - in /qpid/trunk/qpid: bin/ java/bdbstore/
java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/testclient/
java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/
java/broker/ java/broker/src...
Author: grkvlt
Date: Mon Oct 31 17:20:53 2011
New Revision: 1195572
URL: http://svn.apache.org/viewvc?rev=1195572&view=rev
Log:
QPID-3558: Add broker Maven and OSGi artifacts to build
Added:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java
- copied, changed from r1195433, qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java
qpid/trunk/qpid/java/broker/src/main/java/broker.bnd (with props)
qpid/trunk/qpid/java/lib/poms/je-4.0.103.xml
Removed:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java
Modified:
qpid/trunk/qpid/bin/release.sh
qpid/trunk/qpid/java/bdbstore/build.xml
qpid/trunk/qpid/java/broker/build.xml
qpid/trunk/qpid/java/management/common/build.xml
Modified: qpid/trunk/qpid/bin/release.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/bin/release.sh?rev=1195572&r1=1195571&r2=1195572&view=diff
==============================================================================
--- qpid/trunk/qpid/bin/release.sh (original)
+++ qpid/trunk/qpid/bin/release.sh Mon Oct 31 17:20:53 2011
@@ -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
Modified: qpid/trunk/qpid/java/bdbstore/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/build.xml?rev=1195572&r1=1195571&r2=1195572&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/build.xml Mon Oct 31 17:20:53 2011
@@ -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/databa
<fileset dir="src/test/resources/upgrade"/>
</copy>
</target>
-
</project>
Copied: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java (from r1195433, qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java?p2=qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java&p1=qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/testclient/BackupTestClient.java&r1=1195433&r2=1195572&rev=1195572&view=diff
==============================================================================
(empty)
Modified: qpid/trunk/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?rev=1195572&r1=1195571&r2=1195572&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/build.xml (original)
+++ qpid/trunk/qpid/java/broker/build.xml Mon Oct 31 17:20:53 2011
@@ -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>
Added: qpid/trunk/qpid/java/broker/src/main/java/broker.bnd
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/broker.bnd?rev=1195572&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/broker.bnd (added)
+++ qpid/trunk/qpid/java/broker/src/main/java/broker.bnd Mon Oct 31 17:20:53 2011
@@ -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
+
Propchange: qpid/trunk/qpid/java/broker/src/main/java/broker.bnd
------------------------------------------------------------------------------
svn:executable = *
Added: qpid/trunk/qpid/java/lib/poms/je-4.0.103.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/je-4.0.103.xml?rev=1195572&view=auto
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/je-4.0.103.xml (added)
+++ qpid/trunk/qpid/java/lib/poms/je-4.0.103.xml Mon Oct 31 17:20:53 2011
@@ -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>
Modified: qpid/trunk/qpid/java/management/common/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/build.xml?rev=1195572&r1=1195571&r2=1195572&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/build.xml (original)
+++ qpid/trunk/qpid/java/management/common/build.xml Mon Oct 31 17:20:53 2011
@@ -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>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org