You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2012/03/08 11:23:20 UTC
svn commit: r1298340 - in /qpid/trunk/qpid: ./ extras/qmf/ java/
java/bdbstore/bin/ java/bdbstore/etc/scripts/
java/broker-plugins/experimental/shutdown/src/main/java/
java/broker/src/main/java/
java/broker/src/main/java/org/apache/qpid/server/configur...
Author: jross
Date: Thu Mar 8 10:23:19 2012
New Revision: 1298340
URL: http://svn.apache.org/viewvc?rev=1298340&view=rev
Log:
QPID-3864: Adjust version numbers on trunk for development toward 0.18
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/bdbstore/etc/scripts/bdbtest.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/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
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/INSTALL_NOTES.html
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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/QPID_VERSION.txt (original)
+++ qpid/trunk/qpid/QPID_VERSION.txt Thu Mar 8 10:23:19 2012
@@ -1 +1 @@
-0.15
+0.17
Modified: qpid/trunk/qpid/extras/qmf/setup.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/setup.py?rev=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/qmf/setup.py (original)
+++ qpid/trunk/qpid/extras/qmf/setup.py Thu Mar 8 10:23:19 2012
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-qmf",
- version="0.15",
+ version="0.17",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/bin/backup.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/bin/backup.sh Thu Mar 8 10:23:19 2012
@@ -34,7 +34,7 @@ if [ -z "${QPID_HOME}" ]; then
export QPID_HOME=`cd ${WHEREAMI}/../ && pwd`
fi
-VERSION=0.15
+VERSION=0.17
# BDB's je JAR expected to be found in lib/opt
LIBS="${QPID_HOME}/lib/opt/*:${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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh Thu Mar 8 10:23:19 2012
@@ -33,7 +33,7 @@ if [ -z "${QPID_HOME}" ]; then
export QPID_HOME=`cd ${WHEREAMI}/../ && pwd`
fi
-VERSION=0.15
+VERSION=0.17
# BDB's je JAR expected to be found in lib/opt
LIBS="$QPID_HOME/lib/opt/*:$QPID_HOME/lib/qpid-bdbstore-${VERSION}.jar:$QPID_HOME/lib/qpid-all.jar"
Modified: qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbtest.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbtest.sh?rev=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbtest.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbtest.sh Thu Mar 8 10:23:19 2012
@@ -32,7 +32,7 @@ for arg in "$@"; do
fi
done
-VERSION=0.15
+VERSION=0.17
# Set classpath to include Qpid jar with all required jars in manifest
QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.6.1.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=1298340&r1=1298339&r2=1298340&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 Mar 8 10:23:19 2012
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.15.0
+ver: 0.17.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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/broker.bnd (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/broker.bnd Thu Mar 8 10:23:19 2012
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.15.0
+ver: 0.17.0
Bundle-SymbolicName: qpid-broker
Bundle-Version: ${ver}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java Thu Mar 8 10:23:19 2012
@@ -737,7 +737,7 @@ public class ServerConfiguration extends
public String getConnectorKeyManagerFactoryAlgorithm()
{
final String systemFallback = KeyManagerFactory.getDefaultAlgorithm();
- // deprecated, pre-0.15 brokers supported this name.
+ // deprecated, pre-0.17 brokers supported this name.
final String fallback = getStringValue("connector.ssl.certType", systemFallback);
return getStringValue("connector.ssl.keyManagerFactoryAlgorithm", fallback);
}
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=1298340&r1=1298339&r2=1298340&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 Mar 8 10:23:19 2012
@@ -73,11 +73,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.15"), _map);
+ _util = new OsgiSystemPackageUtil(new Version("0.17"), _map);
final String systemPackageString = _util.getFormattedSystemPackageString();
- assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz; version=0.15.0", systemPackageString);
+ assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz; version=0.17.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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/client.bnd (original)
+++ qpid/trunk/qpid/java/client/src/main/java/client.bnd Thu Mar 8 10:23:19 2012
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.15.0
+ver: 0.17.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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Thu Mar 8 10:23:19 2012
@@ -23,7 +23,7 @@
<dirname property="project.root" file="${ant.file.common}"/>
<property name="project.name" value="qpid"/>
- <property name="project.version" value="0.15"/>
+ <property name="project.version" value="0.17"/>
<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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/common.bnd (original)
+++ qpid/trunk/qpid/java/common/src/main/java/common.bnd Thu Mar 8 10:23:19 2012
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.15.0
+ver: 0.17.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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ivy.xml (original)
+++ qpid/trunk/qpid/java/ivy.xml Thu Mar 8 10:23:19 2012
@@ -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.15"/>
+ <info organisation="org/apache" module="qpid" revision="0.17"/>
<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=1298340&r1=1298339&r2=1298340&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 Mar 8 10:23:19 2012
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.15.0
+ver: 0.17.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=1298340&r1=1298339&r2=1298340&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 Mar 8 10:23:19 2012
@@ -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.15.0
+Bundle-Version: 0.17.0
Bundle-Activator: org.apache.qpid.management.ui.Activator
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html?rev=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html (original)
+++ qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html Thu Mar 8 10:23:19 2012
@@ -1,11 +1,11 @@
<html>
<head>
-<title>Apache Qpid C++ 0.15 Installation Notes</title>
+<title>Apache Qpid C++ 0.17 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.15 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.17 Installation Notes</H1>
-<p>Thank you for installing Apache Qpid version 0.15 for Windows.
+<p>Thank you for installing Apache Qpid version 0.17 for Windows.
If the requisite features were installed, you can now run a broker,
use the example programs, and design your own messaging programs while
reading the Qpid C++ API reference documentation.</p>
@@ -83,7 +83,7 @@ default; therefore, to gain support for
must be loaded into the broker. This can be done using the
<code>--load-module</code> option to load the needed plugins. For example:
<pre>
-cd "C:\Program Files\Apache\qpidc-0.15"
+cd "C:\Program Files\Apache\qpidc-0.17"
qpidd.exe --load-module plugins\broker\store.dll --load-module plugins\broker\msclfs_store.dll
</pre>
The <code>--load-module</code> option can also take a full path. The option
Modified: qpid/trunk/qpid/packaging/windows/installer.proj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/installer.proj?rev=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/installer.proj (original)
+++ qpid/trunk/qpid/packaging/windows/installer.proj Thu Mar 8 10:23:19 2012
@@ -32,7 +32,7 @@
<source_root>$(MSBuildProjectDirectory)\..\..</source_root>
<staging_dir>$(MSBuildProjectDirectory)\stage</staging_dir>
<bits Condition="'$(bits)' == ''">32</bits>
- <qpid_version>0.14</qpid_version>
+ <qpid_version>0.17</qpid_version>
<OutputName>qpidc</OutputName>
<OutputType>Package</OutputType>
<WixToolPath>C:\Program Files (x86)\Windows Installer XML v3.5\bin</WixToolPath>
Modified: qpid/trunk/qpid/python/setup.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/setup.py?rev=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/python/setup.py (original)
+++ qpid/trunk/qpid/python/setup.py Thu Mar 8 10:23:19 2012
@@ -298,7 +298,7 @@ class install_lib(_install_lib):
return outfiles + extra
setup(name="qpid-python",
- version="0.15",
+ version="0.17",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/tests/setup.py (original)
+++ qpid/trunk/qpid/tests/setup.py Thu Mar 8 10:23:19 2012
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tests",
- version="0.15",
+ version="0.17",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
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=1298340&r1=1298339&r2=1298340&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/setup.py (original)
+++ qpid/trunk/qpid/tools/setup.py Thu Mar 8 10:23:19 2012
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tools",
- version="0.15",
+ version="0.17",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
package_dir={'' : 'src/py'},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org