svn commit: r1525731 - in /qpid/trunk/qpid/java: broker-core/ broker/

[ro...@apache.org]

Author: robbie
Date: Mon Sep 23 23:26:35 2013
New Revision: 1525731

URL: http://svn.apache.org/r1525731
Log:
QPID-5159: move the entire broker dir to broker-core, no other changes, fixups in next commit

Added:
    qpid/trunk/qpid/java/broker-core/   (props changed)
      - copied from r1525730, qpid/trunk/qpid/java/broker/
Removed:
    qpid/trunk/qpid/java/broker/

Propchange: qpid/trunk/qpid/java/broker-core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 23 23:26:35 2013
@@ -0,0 +1,9 @@
+*.iml
+intellijclasses
+log
+target
+release
+qpid-broker.ipr
+qpid-broker.iws
+.classpath
+.project

Propchange: qpid/trunk/qpid/java/broker-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 23 23:26:35 2013
@@ -0,0 +1,7 @@
+/qpid/branches/0.5.x-dev/qpid/java/broker:886720-886722,887145,892761,930288
+/qpid/branches/java-broker-0-10/qpid/java/broker:795950-829653
+/qpid/branches/java-broker-vhost-refactor/java/broker:1493674-1494547
+/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
+/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
+/qpid/branches/qpid-2935/qpid/java/broker:1061302-1072333
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org