You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/11/26 15:37:43 UTC
svn commit: r1716700 - in /qpid/java/branches/6.0.x: ./
broker/src/main/assembly/qpid-broker-bin.xml
client/src/main/assembly/qpid-client-bin.xml doc/book/src/java-broker/
doc/book/src/java-broker/commonEntities.xml
Author: orudyy
Date: Thu Nov 26 14:37:43 2015
New Revision: 1716700
URL: http://svn.apache.org/viewvc?rev=1716700&view=rev
Log:
QPID-6910: Restore building of zip distribution bundle for java broker and client
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716610 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker/src/main/assembly/qpid-broker-bin.xml
qpid/java/branches/6.0.x/client/src/main/assembly/qpid-client-bin.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/ (props changed)
qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:37:43 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716609
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.0.x/broker/src/main/assembly/qpid-broker-bin.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker/src/main/assembly/qpid-broker-bin.xml?rev=1716700&r1=1716699&r2=1716700&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker/src/main/assembly/qpid-broker-bin.xml (original)
+++ qpid/java/branches/6.0.x/broker/src/main/assembly/qpid-broker-bin.xml Thu Nov 26 14:37:43 2015
@@ -25,6 +25,7 @@
<id>bin</id>
<formats>
<format>tar.gz</format>
+ <format>zip</format>
</formats>
<baseDirectory>qpid-broker/${project.version}</baseDirectory>
<fileSets>
Modified: qpid/java/branches/6.0.x/client/src/main/assembly/qpid-client-bin.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/client/src/main/assembly/qpid-client-bin.xml?rev=1716700&r1=1716699&r2=1716700&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/client/src/main/assembly/qpid-client-bin.xml (original)
+++ qpid/java/branches/6.0.x/client/src/main/assembly/qpid-client-bin.xml Thu Nov 26 14:37:43 2015
@@ -25,6 +25,7 @@
<id>bin</id>
<formats>
<format>tar.gz</format>
+ <format>zip</format>
</formats>
<baseDirectory>qpid-client/${project.version}</baseDirectory>
<fileSets>
Propchange: qpid/java/branches/6.0.x/doc/book/src/java-broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:37:43 2015
@@ -7,4 +7,4 @@
/qpid/branches/mcpierce-QPID-4719/qpid/doc/book/src/java-broker:1477004-1477093
/qpid/branches/qpid-2935/qpid/doc/book/src/java-broker:1061302-1072333
/qpid/branches/qpid-3346/qpid/doc/book/src/java-broker:1144319-1179855
-/qpid/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455,1716489,1716497
+/qpid/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455,1716489,1716497,1716610
Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml?rev=1716700&r1=1716699&r2=1716700&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml (original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml Thu Nov 26 14:37:43 2015
@@ -24,10 +24,10 @@
<!ENTITY qpidCurrentRelease "6.1.0-SNAPSHOT">
-<!ENTITY windowsBrokerDownloadFileName "qpid-java-broker-&qpidCurrentRelease;.zip">
-<!ENTITY windowsExtractedBrokerDirName "qpid-broker-&qpidCurrentRelease;">
-<!ENTITY unixBrokerDownloadFileName "qpid-java-broker-&qpidCurrentRelease;.tar.gz">
-<!ENTITY unixExtractedBrokerDirName "qpid-broker-&qpidCurrentRelease;">
+<!ENTITY windowsBrokerDownloadFileName "qpid-broker-&qpidCurrentRelease;-bin.zip">
+<!ENTITY windowsExtractedBrokerDirName "qpid-broker\&qpidCurrentRelease;">
+<!ENTITY unixBrokerDownloadFileName "qpid-broker-&qpidCurrentRelease;-bin.tar.gz">
+<!ENTITY unixExtractedBrokerDirName "qpid-broker/&qpidCurrentRelease;">
<!-- Client doc links -->
<!ENTITY qpidjmsdocClientConectionUrl "../../Programming-In-Apache-Qpid/html/QpidJNDI.html#section-jms-connection-url">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org