You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2012/08/14 07:51:55 UTC
svn commit: r1372737 - in /servicemix/smx4/features/branches/features-4.4.x:
./
assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
Author: ffang
Date: Tue Aug 14 05:51:54 2012
New Revision: 1372737
URL: http://svn.apache.org/viewvc?rev=1372737&view=rev
Log:
Merged revisions 1372733 via svnmerge from
https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk
........
r1372733 | ffang | 2012-08-14 13:35:16 +0800 (二, 14 8 2012) | 1 line
[SMX4-1207]minimal kit by default will install activemq-broker.xml bundle
........
Modified:
servicemix/smx4/features/branches/features-4.4.x/ (props changed)
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
Merged /servicemix/smx4/features/trunk:r1372733
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 14 05:51:54 2012
@@ -1 +1 @@
-/servicemix/smx4/features/trunk:1-1215210,1232811,1239315,1244513,1298713,1299584,1302577,1307720,1347872,1358015,1372709
+/servicemix/smx4/features/trunk:1-1215210,1232811,1239315,1244513,1298713,1299584,1302577,1307720,1347872,1358015,1372709,1372733
Modified: servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml?rev=1372737&r1=1372736&r2=1372737&view=diff
==============================================================================
--- servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml (original)
+++ servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml Tue Aug 14 05:51:54 2012
@@ -71,6 +71,8 @@
<excludes>
<exclude>org.apache.servicemix.nmr.cfg</exclude>
<exclude>org.apache.servicemix.jbi.cfg</exclude>
+ <exclude>org.apache.felix.fileinstall-activemq.cfg</exclude>
+ <exclude>activemq-broker.xml</exclude>
</excludes>
</fileSet>
@@ -91,6 +93,8 @@
<excludes>
<exclude>org.apache.servicemix.nmr.cfg</exclude>
<exclude>org.apache.servicemix.jbi.cfg</exclude>
+ <exclude>activemq-broker.xml</exclude>
+ <exclude>org.apache.felix.fileinstall-activemq.cfg</exclude>
</excludes>
<lineEnding>unix</lineEnding>
<fileMode>0644</fileMode>
Modified: servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml?rev=1372737&r1=1372736&r2=1372737&view=diff
==============================================================================
--- servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml (original)
+++ servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml Tue Aug 14 05:51:54 2012
@@ -60,6 +60,8 @@
<excludes>
<exclude>org.apache.servicemix.nmr.cfg</exclude>
<exclude>org.apache.servicemix.jbi.cfg</exclude>
+ <exclude>activemq-broker.xml</exclude>
+ <exclude>org.apache.felix.fileinstall-activemq.cfg</exclude>
</excludes>
</fileSet>
@@ -79,6 +81,8 @@
<excludes>
<exclude>org.apache.servicemix.nmr.cfg</exclude>
<exclude>org.apache.servicemix.jbi.cfg</exclude>
+ <exclude>activemq-broker.xml</exclude>
+ <exclude>org.apache.felix.fileinstall-activemq.cfg</exclude>
</excludes>
<lineEnding>dos</lineEnding>
<fileMode>0644</fileMode>