Author: ffang
Date: Tue Aug 14 03:16:51 2012
New Revision: 1372710
URL: http://svn.apache.org/viewvc?rev=1372710&view=rev
Log:
Merged revisions 1372709 via svnmerge from
https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk
........
r1372709 | ffang | 2012-08-14 11:12:28 +0800 (二, 14 8 2012) | 1 line
[SMX4-1206]JBI configuration present in non-JBI assemblies
........
Added:
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
- copied unchanged from r1372709,
servicemix/smx4/features/trunk/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
- copied unchanged from r1372709,
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
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/unix-bin.xml
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
Merged /servicemix/smx4/features/trunk:r1372709
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 14 03:16:51 2012
@@ -1 +1 @@
-/servicemix/smx4/features/trunk:1-1215210,1232811,1239315,1244513,1298713,1299584,1302577,1307720,1347872,1358015
+/servicemix/smx4/features/trunk:1-1215210,1232811,1239315,1244513,1298713,1299584,1302577,1307720,1347872,1358015,1372709
Modified:
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml?rev=1372710&r1=1372709&r2=1372710&view=diff
==============================================================================
---
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml
(original)
+++
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml
Tue Aug 14 03:16:51 2012
@@ -26,7 +26,7 @@
<componentDescriptors>
<componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-
<componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
+ <componentDescriptor>./minimal-unix-bin.xml</componentDescriptor>
<componentDescriptor>target/shared/examples-unix-bin.xml</componentDescriptor>
</componentDescriptors>
Modified:
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml?rev=1372710&r1=1372709&r2=1372710&view=diff
==============================================================================
---
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
(original)
+++
servicemix/smx4/features/branches/features-4.4.x/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
Tue Aug 14 03:16:51 2012
@@ -26,7 +26,7 @@
<componentDescriptors>
<componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-
<componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
+ <componentDescriptor>./minimal-windows-bin.xml</componentDescriptor>
<componentDescriptor>target/shared/examples-windows-bin.xml</componentDescriptor>
</componentDescriptors>
