Author: ffang
Date: Tue Aug 14 03:12:28 2012
New Revision: 1372709
URL: http://svn.apache.org/viewvc?rev=1372709&view=rev
Log:
[SMX4-1206]JBI configuration present in non-JBI assemblies
Added:
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
Modified:
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
Added:
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml?rev=1372709&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
(added)
+++
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-unix-bin.xml
Tue Aug 14 03:12:28 2012
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<component>
+ <fileSets>
+ <!-- Cherry-pick files from the expanded Karaf distribution -->
+ <fileSet>
+
<directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/demos/**</exclude>
+ <exclude>bin/**</exclude>
+ <exclude>etc/system.properties</exclude>
+ <exclude>etc/org.apache.karaf.features.cfg</exclude>
+ <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
+ <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
+ <exclude>etc/users.properties</exclude>
+ <exclude>etc/custom.properties</exclude>
+ <exclude>etc/jre.properties</exclude>
+ <exclude>system/**</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>karaf-manual*</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy over bin/* scripts separately to get the correct file mode
-->
+ <fileSet>
+
<directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/../..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <!-- Copy over everything that needs to get unix line endings -->
+ <fileSet>
+ <directory>target/shared/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>org.apache.servicemix.nmr.cfg</exclude>
+ <exclude>org.apache.servicemix.jbi.cfg</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/shared/licenses</directory>
+ <outputDirectory>/licenses/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <!-- Copy over filtered resources -->
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <includes>
+ <include>*.*</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.servicemix.nmr.cfg</exclude>
+ <exclude>org.apache.servicemix.jbi.cfg</exclude>
+ </excludes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <file>
+
<source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
+ <outputDirectory>/bin/</outputDirectory>
+ <destName>servicemix</destName>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+
<source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+
+</component>
Added:
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml?rev=1372709&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
(added)
+++
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/minimal-windows-bin.xml
Tue Aug 14 03:12:28 2012
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<component>
+ <fileSets>
+ <!-- Cherry-pick files from the expanded Karaf distribution -->
+ <fileSet>
+
<directory>target/dependencies/win/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/demos/**</exclude>
+ <exclude>etc/system.properties</exclude>
+ <exclude>etc/org.apache.karaf.features.cfg</exclude>
+ <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
+ <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
+ <exclude>etc/users.properties</exclude>
+ <exclude>etc/custom.properties</exclude>
+ <exclude>etc/jre.properties</exclude>
+ <exclude>system/**</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>karaf-manual*</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/../..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <!-- Copy over everything that needs to get dos line endings -->
+ <fileSet>
+ <directory>target/shared/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>org.apache.servicemix.nmr.cfg</exclude>
+ <exclude>org.apache.servicemix.jbi.cfg</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/shared/licenses</directory>
+ <outputDirectory>/licenses/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <includes>
+ <include>*.*</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.servicemix.nmr.cfg</exclude>
+ <exclude>org.apache.servicemix.jbi.cfg</exclude>
+ </excludes>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <file>
+
<source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
+ <outputDirectory>/bin/</outputDirectory>
+ <destName>servicemix.bat</destName>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+
<source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ </files>
+
+</component>
Modified:
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml?rev=1372709&r1=1372708&r2=1372709&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml
(original)
+++
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/unix-bin.xml
Tue Aug 14 03:12:28 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/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml?rev=1372709&r1=1372708&r2=1372709&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
(original)
+++
servicemix/smx4/features/trunk/assemblies/apache-servicemix-minimal/src/main/descriptors/windows-bin.xml
Tue Aug 14 03:12:28 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>
