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 2011/06/30 16:55:54 UTC
svn commit: r1141557 - in /qpid/branches/0.12/qpid: ./ extras/qmf/ java/
java/broker-plugins/experimental/shutdown/src/main/java/
java/broker/src/main/java/org/apache/qpid/server/plugins/
java/client/src/main/java/ java/common/src/main/java/ java/manag...
Author: jross
Date: Thu Jun 30 14:55:54 2011
New Revision: 1141557
URL: http://svn.apache.org/viewvc?rev=1141557&view=rev
Log:
QPID-3331: Update branch versions to 0.12
Modified:
qpid/branches/0.12/qpid/QPID_VERSION.txt
qpid/branches/0.12/qpid/extras/qmf/setup.py
qpid/branches/0.12/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
qpid/branches/0.12/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
qpid/branches/0.12/qpid/java/client/src/main/java/client.bnd
qpid/branches/0.12/qpid/java/common.xml
qpid/branches/0.12/qpid/java/common/src/main/java/common.bnd
qpid/branches/0.12/qpid/java/management/common/src/main/java/management-common.bnd
qpid/branches/0.12/qpid/packaging/windows/installer.proj
qpid/branches/0.12/qpid/python/setup.py
qpid/branches/0.12/qpid/tests/setup.py
qpid/branches/0.12/qpid/tools/setup.py
Modified: qpid/branches/0.12/qpid/QPID_VERSION.txt
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/QPID_VERSION.txt?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/QPID_VERSION.txt (original)
+++ qpid/branches/0.12/qpid/QPID_VERSION.txt Thu Jun 30 14:55:54 2011
@@ -1 +1 @@
-0.11
+0.12
Modified: qpid/branches/0.12/qpid/extras/qmf/setup.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/extras/qmf/setup.py?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/extras/qmf/setup.py (original)
+++ qpid/branches/0.12/qpid/extras/qmf/setup.py Thu Jun 30 14:55:54 2011
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-qmf",
- version="0.11",
+ version="0.12",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
packages=["qmf"],
Modified: qpid/branches/0.12/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd (original)
+++ qpid/branches/0.12/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd Thu Jun 30 14:55:54 2011
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.11.0
+ver: 0.12.0
Bundle-SymbolicName: qpid-shutdown-plugin
Bundle-Version: ${ver}
Modified: qpid/branches/0.12/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java (original)
+++ qpid/branches/0.12/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java Thu Jun 30 14:55:54 2011
@@ -63,7 +63,7 @@ public class PluginManager implements Cl
private static final Logger _logger = Logger.getLogger(PluginManager.class);
private static final int FELIX_STOP_TIMEOUT = 30000;
- private static final String QPID_VER_SUFFIX = "version=0.11,";
+ private static final String QPID_VER_SUFFIX = "version=0.12,";
private Framework _felix;
Modified: qpid/branches/0.12/qpid/java/client/src/main/java/client.bnd
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/java/client/src/main/java/client.bnd?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/java/client/src/main/java/client.bnd (original)
+++ qpid/branches/0.12/qpid/java/client/src/main/java/client.bnd Thu Jun 30 14:55:54 2011
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.11.0
+ver: 0.12.0
Bundle-SymbolicName: qpid-client
Bundle-Version: ${ver}
Modified: qpid/branches/0.12/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/java/common.xml?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/java/common.xml (original)
+++ qpid/branches/0.12/qpid/java/common.xml Thu Jun 30 14:55:54 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.11"/>
+ <property name="project.version" value="0.12"/>
<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/branches/0.12/qpid/java/common/src/main/java/common.bnd
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/java/common/src/main/java/common.bnd?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/java/common/src/main/java/common.bnd (original)
+++ qpid/branches/0.12/qpid/java/common/src/main/java/common.bnd Thu Jun 30 14:55:54 2011
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.11.0
+ver: 0.12.0
Bundle-SymbolicName: qpid-common
Bundle-Version: ${ver}
Modified: qpid/branches/0.12/qpid/java/management/common/src/main/java/management-common.bnd
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/java/management/common/src/main/java/management-common.bnd?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/java/management/common/src/main/java/management-common.bnd (original)
+++ qpid/branches/0.12/qpid/java/management/common/src/main/java/management-common.bnd Thu Jun 30 14:55:54 2011
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.11.0
+ver: 0.12.0
Bundle-SymbolicName: qpid-management-common
Bundle-Version: ${ver}
Modified: qpid/branches/0.12/qpid/packaging/windows/installer.proj
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/packaging/windows/installer.proj?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/packaging/windows/installer.proj (original)
+++ qpid/branches/0.12/qpid/packaging/windows/installer.proj Thu Jun 30 14:55:54 2011
@@ -218,9 +218,9 @@
OutputFile="boost_dlls.wxs" />
<Candle
ToolPath="$(WixToolPath)"
- DefineConstants="qpidc_version=0.11"
+ DefineConstants="qpidc_version=0.12"
InstallerPlatform="x64"
- OutputFile="qpidc-0.11-x64.msi" />
+ OutputFile="qpidc-0.12-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.11 -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.12 -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.11-$(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.12-$(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/branches/0.12/qpid/python/setup.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/python/setup.py?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/python/setup.py (original)
+++ qpid/branches/0.12/qpid/python/setup.py Thu Jun 30 14:55:54 2011
@@ -298,7 +298,7 @@ class install_lib(_install_lib):
return outfiles + extra
setup(name="qpid-python",
- version="0.11",
+ version="0.12",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
packages=["mllib", "qpid", "qpid.messaging", "qpid.tests",
Modified: qpid/branches/0.12/qpid/tests/setup.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/tests/setup.py?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/tests/setup.py (original)
+++ qpid/branches/0.12/qpid/tests/setup.py Thu Jun 30 14:55:54 2011
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tests",
- version="0.11",
+ version="0.12",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
packages=["qpid_tests", "qpid_tests.broker_0_10", "qpid_tests.broker_0_9",
Modified: qpid/branches/0.12/qpid/tools/setup.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.12/qpid/tools/setup.py?rev=1141557&r1=1141556&r2=1141557&view=diff
==============================================================================
--- qpid/branches/0.12/qpid/tools/setup.py (original)
+++ qpid/branches/0.12/qpid/tools/setup.py Thu Jun 30 14:55:54 2011
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tools",
- version="0.11",
+ version="0.12",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
scripts=["src/py/qpid-cluster",
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org