Author: jross
Date: Thu Nov 3 20:54:31 2011
New Revision: 1197304
URL: http://svn.apache.org/viewvc?rev=1197304&view=rev
Log:
QPID-3583: Update trunk version from 0.13 to 0.15
Modified:
qpid/trunk/qpid/QPID_VERSION.txt
qpid/trunk/qpid/extras/qmf/setup.py
qpid/trunk/qpid/java/bdbstore/bin/backup.sh
qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh
qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
qpid/trunk/qpid/java/broker/src/main/java/broker.bnd
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java
qpid/trunk/qpid/java/client/src/main/java/client.bnd
qpid/trunk/qpid/java/common.xml
qpid/trunk/qpid/java/common/src/main/java/common.bnd
qpid/trunk/qpid/java/ivy.xml
qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
qpid/trunk/qpid/packaging/windows/installer.proj
qpid/trunk/qpid/python/setup.py
qpid/trunk/qpid/tests/setup.py
qpid/trunk/qpid/tools/setup.py
Modified: qpid/trunk/qpid/QPID_VERSION.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/QPID_VERSION.txt?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/QPID_VERSION.txt (original)
+++ qpid/trunk/qpid/QPID_VERSION.txt Thu Nov 3 20:54:31 2011
@@ -1 +1 @@
-0.13
+0.15
Modified: qpid/trunk/qpid/extras/qmf/setup.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/setup.py?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/qmf/setup.py (original)
+++ qpid/trunk/qpid/extras/qmf/setup.py Thu Nov 3 20:54:31 2011
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-qmf",
- version="0.13",
+ version="0.15",
author="Apache Qpid",
author_email="[email protected]",
packages=["qmf"],
Modified: qpid/trunk/qpid/java/bdbstore/bin/backup.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/bin/backup.sh?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/bin/backup.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/bin/backup.sh Thu Nov 3 20:54:31 2011
@@ -31,7 +31,7 @@ WHEREAMI=`dirname $0`
if [ -z "$QPID_HOME" ]; then
export QPID_HOME=`cd $WHEREAMI/../ && pwd`
fi
-VERSION=0.13
+VERSION=0.15
LIBS=$QPID_HOME/lib/je-4.0.103.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
Modified: qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh Thu Nov 3 20:54:31 2011
@@ -36,7 +36,7 @@ if [ -z "$BDB_HOME" ]; then
export BDB_HOME=$(dirname $(dirname $(readlink -f $0)))
fi
-VERSION=0.13
+VERSION=0.15
LIBS=$BDB_HOME/lib/je-4.0.103.jar:$BDB_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
Modified:
qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
(original)
+++
qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
Thu Nov 3 20:54:31 2011
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.13.0
+ver: 0.15.0
Bundle-SymbolicName: qpid-shutdown-plugin
Bundle-Version: ${ver}
Modified: 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=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/broker.bnd (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/broker.bnd Thu Nov 3 20:54:31
2011
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.13.0
+ver: 0.15.0
Bundle-SymbolicName: qpid-broker
Bundle-Version: ${ver}
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java
Thu Nov 3 20:54:31 2011
@@ -72,11 +72,11 @@ public class OsgiSystemPackageUtilTest e
_map.put("org.apache.qpid.xyz", "1.0.0");
_map.put("org.abc", "1.2.3");
- _util = new OsgiSystemPackageUtil(new Version("0.13"), _map);
+ _util = new OsgiSystemPackageUtil(new Version("0.15"), _map);
final String systemPackageString =
_util.getFormattedSystemPackageString();
- assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz;
version=0.13.0", systemPackageString);
+ assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz;
version=0.15.0", systemPackageString);
}
public void testWithQpidPackageWithoutQpidReleaseNumberSet() throws
Exception
Modified: qpid/trunk/qpid/java/client/src/main/java/client.bnd
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/client.bnd?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/client.bnd (original)
+++ qpid/trunk/qpid/java/client/src/main/java/client.bnd Thu Nov 3 20:54:31
2011
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.13.0
+ver: 0.15.0
Bundle-SymbolicName: qpid-client
Bundle-Version: ${ver}
Modified: qpid/trunk/qpid/java/common.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Thu Nov 3 20:54:31 2011
@@ -23,7 +23,7 @@
<dirname property="project.root" file="${ant.file.common}"/>
<property name="project.name" value="qpid"/>
- <property name="project.version" value="0.13"/>
+ <property name="project.version" value="0.15"/>
<property name="project.url" value="http://qpid.apache.org"/>
<property name="project.groupid" value="org.apache.qpid"/>
<property name="project.namever"
value="${project.name}-${project.version}"/>
Modified: qpid/trunk/qpid/java/common/src/main/java/common.bnd
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/common.bnd?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/common.bnd (original)
+++ qpid/trunk/qpid/java/common/src/main/java/common.bnd Thu Nov 3 20:54:31
2011
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.13.0
+ver: 0.15.0
Bundle-SymbolicName: qpid-common
Bundle-Version: ${ver}
Modified: qpid/trunk/qpid/java/ivy.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.xml?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ivy.xml (original)
+++ qpid/trunk/qpid/java/ivy.xml Thu Nov 3 20:54:31 2011
@@ -18,7 +18,7 @@
<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd";>
- <info organisation="org/apache" module="qpid" revision="0.13"/>
+ <info organisation="org/apache" module="qpid" revision="0.15"/>
<publications xmlns:e="urn:ant.apache.org:ivy-extras">
<artifact name="qpid-client" type="pom" ext="pom"/>
Modified:
qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
(original)
+++ qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
Thu Nov 3 20:54:31 2011
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.13.0
+ver: 0.15.0
Bundle-SymbolicName: qpid-management-common
Bundle-Version: ${ver}
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
(original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF Thu Nov
3 20:54:31 2011
@@ -3,7 +3,7 @@ Bundle-License: http://www.apache.org/li
Bundle-ManifestVersion: 2
Bundle-Name: Qpid JMX Management Console Plug-in
Bundle-SymbolicName: org.apache.qpid.management.ui; singleton:=true
-Bundle-Version: 0.13.0
+Bundle-Version: 0.15.0
Bundle-Activator: org.apache.qpid.management.ui.Activator
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
Modified: qpid/trunk/qpid/packaging/windows/installer.proj
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/installer.proj?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/installer.proj (original)
+++ qpid/trunk/qpid/packaging/windows/installer.proj Thu Nov 3 20:54:31 2011
@@ -218,9 +218,9 @@
OutputFile="boost_dlls.wxs" />
<Candle
ToolPath="$(WixToolPath)"
- DefineConstants="qpidc_version=0.13"
+ DefineConstants="qpidc_version=0.15"
InstallerPlatform="x64"
- OutputFile="qpidc-0.13-x64.msi" />
+ OutputFile="qpidc-0.15-x64.msi" />
-->
<Exec
Command="heat dir $(staging_dir)\include\qpid -var
var.qpid_headers_dir -dr QpidInclude -gg -cg group_QpidHeaders -out
qpid_headers.wxs" />
@@ -240,9 +240,9 @@
<Exec
Command="heat dir $(staging_dir)\docs\api -var var.api_docs_dir
-dr QpidDoc -gg -cg group_APIDocs -out api_docs.wxs" />
<Exec
- Command="candle -dqpidc_version=0.13 -dProgramFiles=$(ProgramFiles)
-dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid
-dboost_headers_dir=$(staging_dir)\include\boost
-dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples
-dapi_docs_dir=$(staging_dir)\docs\api -ext WiXNetFxExtension qpidc.wxs
qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs
-arch $(Architecture)" />
+ Command="candle -dqpidc_version=0.15 -dProgramFiles=$(ProgramFiles)
-dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid
-dboost_headers_dir=$(staging_dir)\include\boost
-dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples
-dapi_docs_dir=$(staging_dir)\docs\api -ext WiXNetFxExtension qpidc.wxs
qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs
-arch $(Architecture)" />
<Exec
- Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext
WixUIExtension -cultures:en-us -out qpidc-0.13-$(Architecture).msi qpidc.wixobj
qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj
examples_README.wixobj examples_examples.wixobj examples_messaging.wixobj
examples_qmf-console.wixobj api_docs.wixobj" />
+ Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext
WixUIExtension -cultures:en-us -out qpidc-0.15-$(Architecture).msi qpidc.wixobj
qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj
examples_README.wixobj examples_examples.wixobj examples_messaging.wixobj
examples_qmf-console.wixobj api_docs.wixobj" />
</Target>
</Project>
Modified: qpid/trunk/qpid/python/setup.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/setup.py?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/python/setup.py (original)
+++ qpid/trunk/qpid/python/setup.py Thu Nov 3 20:54:31 2011
@@ -298,7 +298,7 @@ class install_lib(_install_lib):
return outfiles + extra
setup(name="qpid-python",
- version="0.13",
+ version="0.15",
author="Apache Qpid",
author_email="[email protected]",
packages=["mllib", "qpid", "qpid.messaging", "qpid.tests",
Modified: qpid/trunk/qpid/tests/setup.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tests/setup.py?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/tests/setup.py (original)
+++ qpid/trunk/qpid/tests/setup.py Thu Nov 3 20:54:31 2011
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tests",
- version="0.13",
+ version="0.15",
author="Apache Qpid",
author_email="[email protected]",
packages=["qpid_tests", "qpid_tests.broker_0_10",
"qpid_tests.broker_0_9",
Modified: qpid/trunk/qpid/tools/setup.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/setup.py?rev=1197304&r1=1197303&r2=1197304&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/setup.py (original)
+++ qpid/trunk/qpid/tools/setup.py Thu Nov 3 20:54:31 2011
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tools",
- version="0.13",
+ version="0.15",
author="Apache Qpid",
author_email="[email protected]",
scripts=["src/py/qpid-cluster",
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
