You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2011/10/24 14:51:26 UTC
svn commit: r1188128 [1/2] - in /servicemix/smx4/features/trunk: ./
assemblies/ assemblies/apache-servicemix-full/
assemblies/apache-servicemix-full/src/
assemblies/apache-servicemix-full/src/main/
assemblies/apache-servicemix-full/src/main/descriptors...
Author: gertv
Date: Mon Oct 24 12:51:23 2011
New Revision: 1188128
URL: http://svn.apache.org/viewvc?rev=1188128&view=rev
Log:
SMX4-939: Refactored binary assemblies (except examples)
Added:
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/pom.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-src.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-src.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/pom.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-src.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-src.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assemblies/shared/
servicemix/smx4/features/trunk/assemblies/shared/pom.xml
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/pom.xml
servicemix/smx4/features/trunk/assemblies/shared/src/
servicemix/smx4/features/trunk/assemblies/shared/src/main/
servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/
servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/pom.xml
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml
servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/META-INF/
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/META-INF/LICENSE.vm
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/META-INF/NOTICE
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/common-bin.xml
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-unix-bin.xml
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-windows-bin.xml
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/activemq-broker.xml
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/activemq-broker.xml
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/custom.properties
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/custom.properties
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/jre.properties
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.aries.transaction.cfg
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.web.cfg
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/system.properties
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/system.properties
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/users.properties
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/users.properties
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/asm.txt
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/asm.txt
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/bsd.txt
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/bsd.txt
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cddl-1.0.txt
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt
- copied, changed from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cpl-1.0.txt
Removed:
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/NOTICE
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/common-bin.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin-full.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin-jbi.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-full.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-jbi.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/activemq-broker.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/custom.properties
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/jre.properties
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.aries.transaction.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.web.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/system.properties
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/users.properties
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/asm.txt
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/bsd.txt
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cddl-1.0.txt
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cpl-1.0.txt
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties
Modified:
servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assemblies/pom.xml
servicemix/smx4/features/trunk/parent/pom.xml
servicemix/smx4/features/trunk/pom.xml
Added: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/pom.xml?rev=1188128&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/pom.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/pom.xml Mon Oct 24 12:51:23 2011
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>apache-servicemix</artifactId>
+ <version>4.4.0-SNAPSHOT</version>
+ <relativePath>../apache-servicemix/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>apache-servicemix-full</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache ServiceMix :: Features :: Assemblies :: Apache ServiceMix (Full)</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>add-features-to-repo</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-features-to-repo</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix/apache-servicemix/${project.version}/xml/features</descriptor>
+ </descriptors>
+ <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+ <repository>target/features-repo</repository>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml Mon Oct 24 12:51:23 2011
@@ -23,44 +23,14 @@
<format>tar.gz</format>
</formats>
+ <baseDirectory>apache-servicemix-${version}</baseDirectory>
+
<componentDescriptors>
- <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
</componentDescriptors>
<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 over karaf demo to examples folder -->
<fileSet>
<directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
@@ -71,37 +41,6 @@
<include>**/web/**</include>
</includes>
</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>src/main/distribution/text</directory>
- <outputDirectory>/</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>
- <lineEnding>unix</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
<!-- Copy over the examples -->
<fileSet>
@@ -114,7 +53,7 @@
<exclude>**/README.txt</exclude>
<!-- exclude the integration tests -->
<exclude>**/itests/**</exclude>
- <!-- exclude build output/IDE config/... files --> -->
+ <!-- exclude build output/IDE config/... files -->
<exclude>**/target/**</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
@@ -130,36 +69,6 @@
</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/classes/features.xml</source>
- <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
- <destName>${artifactId}-${version}-features.xml</destName>
- <fileMode>0644</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>
-
<!--filtering README.txt-->
<file>
<source>${basedir}/../../examples/README.txt</source>
@@ -289,7 +198,7 @@
<lineEnding>unix</lineEnding>
</file>
<file>
- <source>${basedir}/target/classes/pom.xml</source>
+ <source>${basedir}/target/shared/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
Added: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-src.xml?rev=1188128&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-src.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-src.xml Mon Oct 24 12:51:23 2011
@@ -0,0 +1,126 @@
+<?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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>jar</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>BUILDING.txt</include>
+ <include>README.txt</include>
+ <include>RELEASE*.txt</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <!-- Binary Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.exe</include>
+ <include>**/*.dll</include>
+ <include>**/*.jar</include>
+ <include>**/*.so</include>
+ <include>**/*.ks</include>
+ <include>**/*.ts</include>
+ <include>**/*.keystore</include>
+ <include>**/*.bin</include>
+ <include>**/*.jnilib</include>
+ <include>**/*.cert</include>
+ <include>**/*.jks</include>
+ <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.exe</exclude>
+ <exclude>**/*.dll</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.ks</exclude>
+ <exclude>**/*.ts</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.bin</exclude>
+ <exclude>**/*.jnilib</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>activemq-data/**</exclude>
+ <exclude>*/activemq-data/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.jks</exclude>
+
+ <exclude>**/cobertura.ser</exclude>
+
+ </excludes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+</assembly>
Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml Mon Oct 24 12:51:23 2011
@@ -22,34 +22,14 @@
<format>zip</format>
</formats>
+ <baseDirectory>apache-servicemix-${version}</baseDirectory>
+
<componentDescriptors>
- <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
</componentDescriptors>
<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>etc/startup.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 kernel demo to examples folder -->
<fileSet>
<directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
@@ -60,23 +40,6 @@
<include>**/web/**</include>
</includes>
</fileSet>
-
- <!-- Copy over ant files -->
- <fileSet>
- <directory>target/dependencies/win/apache-servicemix-nmr-${servicemix.nmr.version}/ant</directory>
- <outputDirectory>/ant</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
- <!-- Using the NMR's startup.properties because that has OBR support enabled by default -->
- <fileSet>
- <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/etc</directory>
- <outputDirectory>/etc</outputDirectory>
- <lineEnding>unix</lineEnding>
- <includes>
- <include>startup.properties</include>
- </includes>
- </fileSet>
<!-- Copy over nmr examples files -->
<fileSet>
@@ -93,32 +56,6 @@
<lineEnding>dos</lineEnding>
</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>src/main/distribution/text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/classes/etc</directory>
- <outputDirectory>/etc/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
-
<!-- Copy over the examples -->
<fileSet>
<directory>${basedir}/../../examples</directory>
@@ -141,36 +78,6 @@
</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/classes/features.xml</source>
- <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
- <destName>${artifactId}-${version}-features.xml</destName>
- <fileMode>0644</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>
-
<!--filtering README.txt-->
<file>
<source>${basedir}/../../examples/README.txt</source>
@@ -301,7 +208,7 @@
<lineEnding>dos</lineEnding>
</file>
<file>
- <source>${basedir}/target/classes/pom.xml</source>
+ <source>${basedir}/target/shared/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
Added: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-src.xml?rev=1188128&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-src.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-src.xml Mon Oct 24 12:51:23 2011
@@ -0,0 +1,125 @@
+<?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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>BUILDING.txt</include>
+ <include>README.txt</include>
+ <include>RELEASE*.txt</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <!-- Binary Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.exe</include>
+ <include>**/*.dll</include>
+ <include>**/*.jar</include>
+ <include>**/*.so</include>
+ <include>**/*.ks</include>
+ <include>**/*.ts</include>
+ <include>**/*.keystore</include>
+ <include>**/*.bin</include>
+ <include>**/*.jnilib</include>
+ <include>**/*.cert</include>
+ <include>**/*.jks</include>
+ <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.exe</exclude>
+ <exclude>**/*.dll</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.ks</exclude>
+ <exclude>**/*.ts</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.bin</exclude>
+ <exclude>**/*.jnilib</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>activemq-data/**</exclude>
+ <exclude>*/activemq-data/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.jks</exclude>
+ <exclude>**/cobertura.ser</exclude>
+
+ </excludes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+</assembly>
Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Added: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/pom.xml?rev=1188128&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/pom.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/pom.xml Mon Oct 24 12:51:23 2011
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>apache-servicemix</artifactId>
+ <version>4.4.0-SNAPSHOT</version>
+ <relativePath>../apache-servicemix/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>apache-servicemix-jbi</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache ServiceMix :: Features :: Assemblies :: Apache ServiceMix (JBI)</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>add-features-to-repo</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-features-to-repo</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix/apache-servicemix/${project.version}/xml/features</descriptor>
+ </descriptors>
+ <features>
+ <feature>cxf</feature>
+ <feature>saaj</feature>
+ <feature>obr</feature>
+ <feature>config</feature>
+ <feature>activemq</feature>
+ <feature>activemq-blueprint</feature>
+ <feature>activemq-spring</feature>
+ <feature>activemq-broker</feature>
+ <feature>camel</feature>
+ <feature>camel-activemq</feature>
+ <feature>camel-nmr</feature>
+ <feature>camel-cxf</feature>
+ <feature>camel-blueprint</feature>
+ <feature>jbi-cluster</feature>
+ <feature>war</feature>
+ <!-- ServiceMix Components -->
+ <feature>servicemix-cxf-bc</feature>
+ <feature>servicemix-file</feature>
+ <feature>servicemix-ftp</feature>
+ <feature>servicemix-http</feature>
+ <feature>servicemix-jms</feature>
+ <feature>servicemix-mail</feature>
+ <feature>servicemix-bean</feature>
+ <feature>servicemix-camel</feature>
+ <feature>servicemix-cxf-se</feature>
+ <feature>servicemix-drools</feature>
+ <feature>servicemix-eip</feature>
+ <feature>servicemix-osworkflow</feature>
+ <feature>servicemix-quartz</feature>
+ <feature>servicemix-scripting</feature>
+ <feature>servicemix-validation</feature>
+ <feature>servicemix-saxon</feature>
+ <feature>servicemix-wsn2005</feature>
+ <feature>servicemix-snmp</feature>
+ <feature>servicemix-vfs</feature>
+ <feature>servicemix-smpp</feature>
+ </features>
+ <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+ <repository>target/features-repo</repository>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml Mon Oct 24 12:51:23 2011
@@ -23,44 +23,14 @@
<format>tar.gz</format>
</formats>
+ <baseDirectory>apache-servicemix-${version}</baseDirectory>
+
<componentDescriptors>
- <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
</componentDescriptors>
<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 over karaf demo to examples folder -->
<fileSet>
<directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
@@ -71,37 +41,6 @@
<include>**/web/**</include>
</includes>
</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>src/main/distribution/text</directory>
- <outputDirectory>/</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>
- <lineEnding>unix</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
<!-- Copy over the examples -->
<fileSet>
@@ -114,7 +53,7 @@
<exclude>**/README.txt</exclude>
<!-- exclude the integration tests -->
<exclude>**/itests/**</exclude>
- <!-- exclude build output/IDE config/... files --> -->
+ <!-- exclude build output/IDE config/... files -->
<exclude>**/target/**</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
@@ -130,36 +69,6 @@
</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/classes/features.xml</source>
- <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
- <destName>${artifactId}-${version}-features.xml</destName>
- <fileMode>0644</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>
-
<!--filtering README.txt-->
<file>
<source>${basedir}/../../examples/README.txt</source>
@@ -289,7 +198,7 @@
<lineEnding>unix</lineEnding>
</file>
<file>
- <source>${basedir}/target/classes/pom.xml</source>
+ <source>${basedir}/target/shared/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
Added: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-src.xml?rev=1188128&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-src.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-src.xml Mon Oct 24 12:51:23 2011
@@ -0,0 +1,126 @@
+<?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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>jar</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>BUILDING.txt</include>
+ <include>README.txt</include>
+ <include>RELEASE*.txt</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <!-- Binary Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.exe</include>
+ <include>**/*.dll</include>
+ <include>**/*.jar</include>
+ <include>**/*.so</include>
+ <include>**/*.ks</include>
+ <include>**/*.ts</include>
+ <include>**/*.keystore</include>
+ <include>**/*.bin</include>
+ <include>**/*.jnilib</include>
+ <include>**/*.cert</include>
+ <include>**/*.jks</include>
+ <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.exe</exclude>
+ <exclude>**/*.dll</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.ks</exclude>
+ <exclude>**/*.ts</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.bin</exclude>
+ <exclude>**/*.jnilib</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>activemq-data/**</exclude>
+ <exclude>*/activemq-data/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.jks</exclude>
+
+ <exclude>**/cobertura.ser</exclude>
+
+ </excludes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+</assembly>
Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml Mon Oct 24 12:51:23 2011
@@ -22,34 +22,14 @@
<format>zip</format>
</formats>
+ <baseDirectory>apache-servicemix-${version}</baseDirectory>
+
<componentDescriptors>
- <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
</componentDescriptors>
<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>etc/startup.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 kernel demo to examples folder -->
<fileSet>
<directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
@@ -60,23 +40,6 @@
<include>**/web/**</include>
</includes>
</fileSet>
-
- <!-- Copy over ant files -->
- <fileSet>
- <directory>target/dependencies/win/apache-servicemix-nmr-${servicemix.nmr.version}/ant</directory>
- <outputDirectory>/ant</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
- <!-- Using the NMR's startup.properties because that has OBR support enabled by default -->
- <fileSet>
- <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/etc</directory>
- <outputDirectory>/etc</outputDirectory>
- <lineEnding>unix</lineEnding>
- <includes>
- <include>startup.properties</include>
- </includes>
- </fileSet>
<!-- Copy over nmr examples files -->
<fileSet>
@@ -93,32 +56,6 @@
<lineEnding>dos</lineEnding>
</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>src/main/distribution/text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/classes/etc</directory>
- <outputDirectory>/etc/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
-
<!-- Copy over the examples -->
<fileSet>
<directory>${basedir}/../../examples</directory>
@@ -141,36 +78,6 @@
</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/classes/features.xml</source>
- <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
- <destName>${artifactId}-${version}-features.xml</destName>
- <fileMode>0644</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>
-
<!--filtering README.txt-->
<file>
<source>${basedir}/../../examples/README.txt</source>
@@ -301,7 +208,7 @@
<lineEnding>dos</lineEnding>
</file>
<file>
- <source>${basedir}/target/classes/pom.xml</source>
+ <source>${basedir}/target/shared/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
Added: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-src.xml?rev=1188128&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-src.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-src.xml Mon Oct 24 12:51:23 2011
@@ -0,0 +1,125 @@
+<?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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>BUILDING.txt</include>
+ <include>README.txt</include>
+ <include>RELEASE*.txt</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <!-- Binary Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.exe</include>
+ <include>**/*.dll</include>
+ <include>**/*.jar</include>
+ <include>**/*.so</include>
+ <include>**/*.ks</include>
+ <include>**/*.ts</include>
+ <include>**/*.keystore</include>
+ <include>**/*.bin</include>
+ <include>**/*.jnilib</include>
+ <include>**/*.cert</include>
+ <include>**/*.jks</include>
+ <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.exe</exclude>
+ <exclude>**/*.dll</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.ks</exclude>
+ <exclude>**/*.ts</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.bin</exclude>
+ <exclude>**/*.jnilib</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>activemq-data/**</exclude>
+ <exclude>*/activemq-data/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.jks</exclude>
+ <exclude>**/cobertura.ser</exclude>
+
+ </excludes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+</assembly>
Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml?rev=1188128&r1=1188127&r2=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml Mon Oct 24 12:51:23 2011
@@ -32,6 +32,12 @@
<name>Apache ServiceMix :: Features :: Assemblies :: Apache ServiceMix</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.assemblies</groupId>
+ <artifactId>shared</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- Download Karaf assemblies for dependency:unpack-->
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -84,6 +90,13 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <appendedResourcesDirectory>${basedir}/target/shared/appended-resources</appendedResourcesDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>${karaf.version}</version>
@@ -122,6 +135,7 @@
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
<repository>target/features-repo</repository>
</configuration>
+ <inherited>false</inherited>
</execution>
</executions>
</plugin>
@@ -155,34 +169,25 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>enable-obr</id>
+ <id>unpack-shared</id>
<phase>generate-resources</phase>
<goals>
- <goal>run</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
- <target>
- <concat destfile="target/dependencies/unix/apache-karaf-${karaf.version}/etc/startup.properties"
- append="true" eol="unix">
- <fileset file="target/classes/startup-obr.properties" />
- </concat>
- <concat destfile="target/dependencies/win/apache-karaf-${karaf.version}/etc/startup.properties"
- append="true" eol="dos">
- <fileset file="target/classes/startup-obr.properties" />
- </concat>
- </target>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.assemblies</groupId>
+ <artifactId>shared</artifactId>
+ <type>jar</type>
+ <outputDirectory>target/shared</outputDirectory>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
<execution>
<id>unpack-unix</id>
<phase>generate-resources</phase>
@@ -220,12 +225,40 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enable-obr</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target name="enable-obr">
+ <echo message="Updating etc/startup.properties in unix assembly"/>
+ <concat destfile="target/dependencies/unix/apache-karaf-${karaf.version}/etc/startup.properties"
+ append="true" eol="unix">
+ <fileset file="target/shared/startup-obr.properties" />
+ </concat>
+ <echo message="Updating etc/startup.properties in windows assembly"/>
+ <concat destfile="target/dependencies/win/apache-karaf-${karaf.version}/etc/startup.properties"
+ append="true" eol="dos">
+ <fileset file="target/shared/startup-obr.properties" />
+ </concat>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
+ <inherited>false</inherited>
<goals>
<goal>attach-artifact</goal>
</goals>
Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=1188128&r1=1188127&r2=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml Mon Oct 24 12:51:23 2011
@@ -24,43 +24,11 @@
</formats>
<componentDescriptors>
- <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
</componentDescriptors>
<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 over karaf demo to examples folder -->
<fileSet>
<directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
@@ -71,37 +39,6 @@
<include>**/web/**</include>
</includes>
</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>src/main/distribution/text</directory>
- <outputDirectory>/</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>
- <lineEnding>unix</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
<!-- Copy over the examples -->
<fileSet>
@@ -114,7 +51,7 @@
<exclude>**/README.txt</exclude>
<!-- exclude the integration tests -->
<exclude>**/itests/**</exclude>
- <!-- exclude build output/IDE config/... files --> -->
+ <!-- exclude build output/IDE config/... files -->
<exclude>**/target/**</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
@@ -130,13 +67,7 @@
</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>
+ <!-- Install the features descriptor into the system repository -->
<file>
<source>${basedir}/target/classes/features.xml</source>
<outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
@@ -145,21 +76,6 @@
<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>
-
<!--filtering README.txt-->
<file>
<source>${basedir}/../../examples/README.txt</source>
@@ -289,7 +205,7 @@
<lineEnding>unix</lineEnding>
</file>
<file>
- <source>${basedir}/target/classes/pom.xml</source>
+ <source>${basedir}/target/shared/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>