servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1188127 - in /servicemix/smx4/features/trunk: assemblies/ assemblies/apache-servicemix/ assemblies/apache-servicemix/src/ assemblies/apache-servicemix/src/main/ assemblies/apache-servicemix/src/main/appended-resources/ assemblies/apache-se...
Date Mon, 24 Oct 2011 12:50:16 GMT
Author: gertv
Date: Mon Oct 24 12:50:13 2011
New Revision: 1188127

URL: http://svn.apache.org/viewvc?rev=1188127&view=rev
Log:
SMX4-939: First stab at split out assembly builds

Added:
    servicemix/smx4/features/trunk/assemblies/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/NOTICE
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/NOTICE
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/
    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
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-full.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin-jbi.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-jbi.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-src.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-full.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-full.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-jbi.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-jbi.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-src.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/activemq-broker.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/custom.properties
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/jre.properties
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/jre.properties
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.aries.transaction.cfg
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/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
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/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
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/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
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/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
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/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
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.web.cfg
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/system.properties
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/users.properties
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/asm.txt
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/asm.txt
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/bsd.txt
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/bsd.txt
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cddl-1.0.txt
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/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
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-full/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-jbi/
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties
    servicemix/smx4/features/trunk/assemblies/pom.xml
      - copied, changed from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml
Removed:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm
    servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/NOTICE
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-full.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-jbi.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-src.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-full.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-jbi.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-src.xml
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/jre.properties
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.web.cfg
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/asm.txt
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/bsd.txt
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml
Modified:
    servicemix/smx4/features/trunk/parent/pom.xml

Added: 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=1188127&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml Mon Oct 24 12:50:13 2011
@@ -0,0 +1,323 @@
+<?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>assemblies</artifactId>
+        <version>4.4.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>apache-servicemix</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache ServiceMix :: Features :: Assemblies :: Apache ServiceMix</name>
+
+    <dependencies>
+        <!-- Download Karaf assemblies for dependency:unpack-->
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>apache-karaf</artifactId>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>apache-karaf</artifactId>
+            <type>tar.gz</type>
+        </dependency>
+
+        <!--Xerces jar to be included in lib/endorsed -->
+        <dependency>
+            <groupId>org.apache.xerces</groupId>
+            <artifactId>xml-apis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+
+        <!--xalan jar to be included in lib/endorsed-->
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>serializer</artifactId>
+        </dependency>
+
+        <!-- branding -->
+        <dependency>
+            <groupId>org.apache.servicemix.features</groupId>
+            <artifactId>org.apache.servicemix.features.branding</artifactId>
+        </dependency>
+        
+    </dependencies>
+    
+    <build>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/filtered-resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+        <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>compile</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>file:${basedir}/target/classes/features.xml</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-cxf</feature>
+                                <feature>camel-blueprint</feature>
+                                <feature>war</feature>
+                            </features>
+                            <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+                            <repository>target/features-repo</repository>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>copy-system-folder</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/features-repo</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>target/dependencies/unix/apache-karaf-${karaf.version}/system</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </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>
+                                <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>
+                        </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>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.karaf</groupId>
+                                    <artifactId>apache-karaf</artifactId>
+                                    <type>tar.gz</type>
+                                    <outputDirectory>target/dependencies/unix</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unpack-win</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.karaf</groupId>
+                                    <artifactId>apache-karaf</artifactId>
+                                    <type>zip</type>
+                                    <outputDirectory>target/dependencies/win</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </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>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>target/classes/features.xml</file>
+                                    <type>xml</type>
+                                    <classifier>features</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>${maven-assembly-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>unix-bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>windows-bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unix-src</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attached</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>windows-src</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attached</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/descriptors/windows-src.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
+

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm&p1=servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/LICENSE.vm&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/NOTICE (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/NOTICE)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/NOTICE?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/NOTICE&p1=servicemix/smx4/features/trunk/assembly/src/main/appended-resources/META-INF/NOTICE&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Added: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/common-bin.xml?rev=1188127&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/common-bin.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/common-bin.xml Mon Oct 24 12:50:13 2011
@@ -0,0 +1,47 @@
+<?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>
+        <fileSet>
+          <outputDirectory>system</outputDirectory>
+          <directory>target/features-repo</directory>
+        </fileSet>
+    </fileSets>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
+            <fileMode>0644</fileMode>
+            <includes>
+                <include>org.apache.servicemix.features:org.apache.servicemix.features.branding</include>
+            </includes>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib/endorsed</outputDirectory>
+            <fileMode>0644</fileMode>
+            <includes>
+                <include>org.apache.xerces:xercesImpl</include>
+                <include>org.apache.xerces:xml-apis</include>
+                <include>xalan:xalan</include>
+                <include>xalan:serializer</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+</component>
\ No newline at end of file

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin-full.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-full.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin-full.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin-full.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-full.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin-jbi.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-jbi.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin-jbi.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin-jbi.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-jbi.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml (from r1182326, servicemix/smx4/features/trunk/assembly/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?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml Mon Oct 24 12:50:13 2011
@@ -16,14 +16,19 @@
     limitations under the License.
 -->
 <assembly>
-    <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+    <id>apache-servicemix</id>
+
     <formats>
-        <format>jar</format>
+        <format>jar</format>        <!-- SMX4-775: Added JAR assembly for *nix systems without GNU TAR  -->
         <format>tar.gz</format>
     </formats>
-    <fileSets>
 
-        <!-- Expanded ServiceMix Runtime -->
+    <componentDescriptors>
+        <componentDescriptor>src/main/descriptors/common-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>
@@ -37,11 +42,7 @@
               <exclude>etc/users.properties</exclude>
               <exclude>etc/custom.properties</exclude>
               <exclude>etc/jre.properties</exclude>
-              <exclude>etc/startup.properties</exclude>
-              <!-- SMX4-764 - Override Felix Framework version -->
-              <!-- begin snippet -->
-              <exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
-              <!-- end snippet -->
+              <exclude>system/**</exclude>
               <exclude>LICENSE</exclude>
               <exclude>NOTICE</exclude>
               <exclude>README</exclude>
@@ -71,41 +72,9 @@
             </includes>
         </fileSet>
        
-       <!-- Copy over ant files -->
-       <fileSet>
-            <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/ant</directory>
-            <outputDirectory>/ant</outputDirectory>
-            <lineEnding>unix</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>
-            <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <excludes>
-                <exclude>pom.xml</exclude>
-                <exclude>**/itests/**</exclude>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-            </excludes>
-            <lineEnding>unix</lineEnding>
-       </fileSet>
-
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>${basedir}/../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>README</include>
@@ -115,59 +84,48 @@
             <fileMode>0644</fileMode>
         </fileSet>
 
-        <!-- Copy over jar files -->
-        <fileSet>
-            <directory>target/dependencies</directory>
-            <includes>
-                <include>servicemix-version.jar</include>
-            </includes>
-            <outputDirectory>/lib/</outputDirectory>
-        </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>        
+        </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>
-       <fileSet>
-            <directory>src/main/distribution/unix-shell</directory>
-            <outputDirectory>/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0755</fileMode>
-        </fileSet>
 
         <!-- Copy over the examples -->
         <fileSet>
-            <directory>${basedir}/../examples</directory>
+            <directory>${basedir}/../../examples</directory>
             <outputDirectory>/examples/</outputDirectory>
             <lineEnding>unix</lineEnding>
             <excludes>
                 <exclude>pom.xml</exclude>
-                <!--we need add filtered README.txt, so exclude the raw one here-->
+                <!-- we need add filtered README.txt, so exclude the raw one here -->
                 <exclude>**/README.txt</exclude>
+                <!-- exclude the integration tests -->
                 <exclude>**/itests/**</exclude>
+                <!-- exclude build output/IDE config/... files --> -->
                 <exclude>**/target/**</exclude>
                 <exclude>**/.classpath</exclude>
                 <exclude>**/.project</exclude>
                 <exclude>**/.settings/**</exclude>
+                <exclude>**/*.i??</exclude>
+                <!-- exclude these 3 failing demos -->
                 <exclude>**/wsdl-first/**</exclude>
                 <exclude>**/loan-broker-bpel/**</exclude>
                 <exclude>**/web/**</exclude>
             </excludes>
         </fileSet>
-        
-        <fileSet>
-          <directory>target/features-repo</directory>
-          <outputDirectory>system</outputDirectory>
-        </fileSet>
 
     </fileSets>
 
@@ -180,11 +138,6 @@
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/target/dependencies/servicemix-version.jar</source>
-            <outputDirectory>/lib/</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
             <source>${basedir}/target/classes/features.xml</source>
             <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
             <destName>${artifactId}-${version}-features.xml</destName>
@@ -209,112 +162,112 @@
 
         <!--filtering README.txt-->
         <file>
-            <source>${basedir}/../examples/README.txt</source>
+            <source>${basedir}/../../examples/README.txt</source>
             <outputDirectory>/examples/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/bridge/README.txt</source>
+            <source>${basedir}/../../examples/bridge/README.txt</source>
             <outputDirectory>/examples/bridge</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/cxf-ws-addressing/README.txt</source>
+            <source>${basedir}/../../examples/cxf-ws-addressing/README.txt</source>
             <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/cxf-jaxrs/README.txt</source>
+            <source>${basedir}/../../examples/cxf-jaxrs/README.txt</source>
             <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/cxf-wsdl-first-osgi-package/README.txt</source>
+            <source>${basedir}/../../examples/cxf-wsdl-first-osgi-package/README.txt</source>
             <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/bridge-camel/README.txt</source>
+            <source>${basedir}/../../examples/bridge-camel/README.txt</source>
             <outputDirectory>/examples/bridge-camel</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/camel/README.txt</source>
+            <source>${basedir}/../../examples/camel/README.txt</source>
             <outputDirectory>/examples/camel</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/camel-blueprint/README.txt</source>
+            <source>${basedir}/../../examples/camel-blueprint/README.txt</source>
             <outputDirectory>/examples/camel-blueprint</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/cxf-wsdl-first/README.txt</source>
+            <source>${basedir}/../../examples/cxf-wsdl-first/README.txt</source>
             <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/camel-osgi/README.txt</source>
+            <source>${basedir}/../../examples/camel-osgi/README.txt</source>
             <outputDirectory>/examples/camel-osgi</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/camel-nmr/README.txt</source>
+            <source>${basedir}/../../examples/camel-nmr/README.txt</source>
             <outputDirectory>/examples/camel-nmr</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-          <source>${basedir}/../examples/camel-nmr-blueprint/README.txt</source>
+          <source>${basedir}/../../examples/camel-nmr-blueprint/README.txt</source>
           <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
           <filtered>true</filtered>
           <fileMode>0644</fileMode>
           <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/cxf-nmr/README.txt</source>
+            <source>${basedir}/../../examples/cxf-nmr/README.txt</source>
             <outputDirectory>/examples/cxf-nmr</outputDirectory>               
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/cxf-osgi/README.txt</source>
+            <source>${basedir}/../../examples/cxf-osgi/README.txt</source>
             <outputDirectory>/examples/cxf-osgi</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/cxf-ws-security-osgi/README.txt</source>
+            <source>${basedir}/../../examples/cxf-ws-security-osgi/README.txt</source>
             <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/cxf-ws-rm/README.txt</source>
+            <source>${basedir}/../../examples/cxf-ws-rm/README.txt</source>
             <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
@@ -322,14 +275,14 @@
         </file>
 
         <file>
-            <source>${basedir}/../examples/cxf-camel-nmr/README.txt</source>
+            <source>${basedir}/../../examples/cxf-camel-nmr/README.txt</source>
             <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/simple/README.txt</source>
+            <source>${basedir}/../../examples/simple/README.txt</source>
             <outputDirectory>/examples/simple</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
@@ -344,38 +297,4 @@
         </file>
     </files>
 
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib/endorsed</outputDirectory>
-            <includes>
-                <include>org.apache.xerces:xercesImpl</include>
-                <include>org.apache.xerces:xml-apis</include>
-                <include>xalan:xalan</include>
-                <include>xalan:serializer</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix:org.osgi.compendium</include>
-            </includes>
-        </dependencySet>
-        <!-- SMX4-764 - Override Felix Framework to 3.0.8 version -->
-        <!-- begin snippet -->
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix:org.apache.felix.framework</include>
-            </includes>
-        </dependencySet>
-        <!-- end snippet -->
-
-    </dependencySets>
-
 </assembly>

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-src.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-src.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-src.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml Mon Oct 24 12:50:13 2011
@@ -24,7 +24,7 @@
     <fileSets>
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>${basedir}/../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>BUILDING.txt</include>
@@ -36,7 +36,7 @@
 
         <!-- Binary Files -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>${basedir}/../..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*.jpeg</include>

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-full.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-full.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-full.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-full.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-full.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-jbi.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-jbi.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-jbi.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin-jbi.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-jbi.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml Mon Oct 24 12:50:13 2011
@@ -16,13 +16,18 @@
     limitations under the License.
 -->
 <assembly>
-    <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+    <id>apache-servicemix</id>
+
     <formats>
         <format>zip</format>
     </formats>
-    <fileSets>
 
-      <!-- Expanded ServiceMix Runtime -->
+    <componentDescriptors>
+        <componentDescriptor>src/main/descriptors/common-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>
@@ -36,10 +41,7 @@
              <exclude>etc/custom.properties</exclude>
              <exclude>etc/jre.properties</exclude>
              <exclude>etc/startup.properties</exclude>
-             <!-- SMX4-764 - Override the Felix Framework version -->
-             <!-- begin snippet -->
-             <exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
-             <!-- end snippet -->
+             <exclude>system/**</exclude>
              <exclude>LICENSE</exclude>
              <exclude>NOTICE</exclude>
              <exclude>README</exclude>
@@ -93,7 +95,7 @@
 
       <!-- Copy license and other files from root -->
       <fileSet>
-          <directory>${basedir}/..</directory>
+          <directory>${basedir}/../..</directory>
           <outputDirectory>/</outputDirectory>
           <includes>
               <include>README</include>
@@ -117,18 +119,9 @@
           <fileMode>0644</fileMode>
       </fileSet>
 
-      <!-- Copy over jar files -->
-      <fileSet>
-          <directory>target/dependencies</directory>
-          <includes>
-              <include>servicemix-version.jar</include>
-          </includes>
-          <outputDirectory>/lib/</outputDirectory>
-      </fileSet>
-
       <!-- Copy over the examples -->
       <fileSet>
-          <directory>${basedir}/../examples</directory>
+          <directory>${basedir}/../../examples</directory>
           <outputDirectory>/examples/</outputDirectory>
           <lineEnding>dos</lineEnding>
           <excludes>
@@ -145,12 +138,6 @@
               <exclude>**/web/**</exclude>
           </excludes>
       </fileSet>
-
-      <fileSet>
-        <directory>target/features-repo</directory>
-        <outputDirectory>system</outputDirectory>
-      </fileSet>
-      
     </fileSets>
 
     <files>
@@ -162,11 +149,6 @@
             <lineEnding>dos</lineEnding>
         </file>
         <file>
-            <source>${basedir}/target/dependencies/servicemix-version.jar</source>
-            <outputDirectory>/lib/</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
             <source>${basedir}/target/classes/features.xml</source>
             <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
             <destName>${artifactId}-${version}-features.xml</destName>
@@ -191,7 +173,7 @@
         
         <!--filtering README.txt-->
         <file>
-            <source>${basedir}/../examples/README.txt</source>
+            <source>${basedir}/../../examples/README.txt</source>
             <outputDirectory>/examples/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
@@ -199,105 +181,105 @@
         </file>
 
         <file>
-              <source>${basedir}/../examples/bridge/README.txt</source>
+              <source>${basedir}/../../examples/bridge/README.txt</source>
               <outputDirectory>/examples/bridge</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
         </file>
         <file>
-              <source>${basedir}/../examples/cxf-ws-addressing/README.txt</source>
+              <source>${basedir}/../../examples/cxf-ws-addressing/README.txt</source>
               <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
         </file>
         <file>
-              <source>${basedir}/../examples/cxf-jaxrs/README.txt</source>
+              <source>${basedir}/../../examples/cxf-jaxrs/README.txt</source>
               <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
         </file>
         <file>
-            <source>${basedir}/../examples/cxf-wsdl-first-osgi-package/README.txt</source>
+            <source>${basedir}/../../examples/cxf-wsdl-first-osgi-package/README.txt</source>
             <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
             <lineEnding>dos</lineEnding>
         </file>
         <file>
-              <source>${basedir}/../examples/bridge-camel/README.txt</source>
+              <source>${basedir}/../../examples/bridge-camel/README.txt</source>
               <outputDirectory>/examples/bridge-camel</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
         </file>
         <file>
-              <source>${basedir}/../examples/camel/README.txt</source>
+              <source>${basedir}/../../examples/camel/README.txt</source>
               <outputDirectory>/examples/camel</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
         </file>
         <file>
-              <source>${basedir}/../examples/camel-blueprint/README.txt</source>
+              <source>${basedir}/../../examples/camel-blueprint/README.txt</source>
               <outputDirectory>/examples/camel-blueprint</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
         </file>
         <file>
-              <source>${basedir}/../examples/cxf-wsdl-first/README.txt</source>
+              <source>${basedir}/../../examples/cxf-wsdl-first/README.txt</source>
               <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
         </file>
         <file>
-              <source>${basedir}/../examples/camel-osgi/README.txt</source>
+              <source>${basedir}/../../examples/camel-osgi/README.txt</source>
               <outputDirectory>/examples/camel-osgi</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
             </file>
             <file>
-              <source>${basedir}/../examples/camel-nmr/README.txt</source>
+              <source>${basedir}/../../examples/camel-nmr/README.txt</source>
               <outputDirectory>/examples/camel-nmr</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
             </file>
         <file>
-          <source>${basedir}/../examples/camel-nmr-blueprint/README.txt</source>
+          <source>${basedir}/../../examples/camel-nmr-blueprint/README.txt</source>
           <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
           <filtered>true</filtered>
           <fileMode>0644</fileMode>
           <lineEnding>dos</lineEnding>
         </file>
             <file>
-              <source>${basedir}/../examples/cxf-nmr/README.txt</source>
+              <source>${basedir}/../../examples/cxf-nmr/README.txt</source>
               <outputDirectory>/examples/cxf-nmr</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
             </file>
             <file>
-              <source>${basedir}/../examples/cxf-osgi/README.txt</source>
+              <source>${basedir}/../../examples/cxf-osgi/README.txt</source>
               <outputDirectory>/examples/cxf-osgi</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
             </file>
             <file>
-              <source>${basedir}/../examples/cxf-ws-security-osgi/README.txt</source>
+              <source>${basedir}/../../examples/cxf-ws-security-osgi/README.txt</source>
               <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
             </file>
             <file>
-              <source>${basedir}/../examples/cxf-ws-rm/README.txt</source>
+              <source>${basedir}/../../examples/cxf-ws-rm/README.txt</source>
               <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
@@ -305,14 +287,14 @@
             </file>
 
             <file>
-              <source>${basedir}/../examples/cxf-camel-nmr/README.txt</source>
+              <source>${basedir}/../../examples/cxf-camel-nmr/README.txt</source>
               <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
               <lineEnding>dos</lineEnding>
             </file>
             <file>
-              <source>${basedir}/../examples/simple/README.txt</source>
+              <source>${basedir}/../../examples/simple/README.txt</source>
               <outputDirectory>/examples/simple</outputDirectory>
               <filtered>true</filtered>
               <fileMode>0644</fileMode>
@@ -328,38 +310,4 @@
 
     </files>
 
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib/endorsed</outputDirectory>
-            <includes>
-                <include>org.apache.xerces:xercesImpl</include>
-                <include>org.apache.xerces:xml-apis</include>
-                <include>xalan:xalan</include>
-                <include>xalan:serializer</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix:org.osgi.compendium</include>
-            </includes>
-        </dependencySet>
-        <!-- SMX4-764 - Override the Felix Framework version -->
-        <!-- begin snippet -->
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.felix:org.apache.felix.framework</include>
-            </includes>
-        </dependencySet>
-        <!-- end snippet -->
-
-    </dependencySets>
-
 </assembly>

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-src.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-src.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/activemq-broker.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/activemq-broker.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/activemq-broker.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/custom.properties (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/custom.properties?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/custom.properties&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/jre.properties (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/jre.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/jre.properties?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/jre.properties&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/jre.properties&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.aries.transaction.cfg (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.aries.transaction.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.aries.transaction.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.web.cfg (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.web.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.web.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.web.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.web.cfg&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/system.properties (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/system.properties?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/system.properties&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/users.properties (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/users.properties?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/users.properties&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/users.properties&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/asm.txt (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/asm.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/asm.txt?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/asm.txt&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/asm.txt&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/bsd.txt (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/bsd.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/bsd.txt?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/bsd.txt&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/bsd.txt&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cddl-1.0.txt (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cddl-1.0.txt?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cddl-1.0.txt&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cddl-1.0.txt&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cpl-1.0.txt (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cpl-1.0.txt?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cpl-1.0.txt&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/licenses/cpl-1.0.txt&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Mon Oct 24 12:50:13 2011
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,camel,camel-activemq,camel-cxf,camel-blueprint
+featuresBoot=karaf-framework,obr,config,activemq-broker,activemq-spring,camel,camel-activemq,camel-cxf,camel-blueprint
 

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml?p2=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
    (empty)

Added: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties?rev=1188127&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties (added)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties Mon Oct 24 12:50:13 2011
@@ -0,0 +1,4 @@
+
+# enabling features OBR resolver support
+org/apache/felix/org.apache.felix.bundlerepository/1.6.4/org.apache.felix.bundlerepository-1.6.4.jar=10
+org/apache/karaf/features/org.apache.karaf.features.obr/2.2.2/org.apache.karaf.features.obr-2.2.2.jar=30

Copied: servicemix/smx4/features/trunk/assemblies/pom.xml (from r1182326, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/pom.xml?p2=servicemix/smx4/features/trunk/assemblies/pom.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml&r1=1182326&r2=1188127&rev=1188127&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/pom.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/pom.xml Mon Oct 24 12:50:13 2011
@@ -1,4 +1,5 @@
-<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/maven-v4_0_0.xsd">
+<?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">
 
     <!--
 
@@ -21,32 +22,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.features</groupId>
-        <artifactId>features</artifactId>
-        <version>${project.version}</version>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>parent</artifactId>
+        <version>4.4.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.servicemix.examples</groupId>
-    <artifactId>examples</artifactId>
+    <artifactId>assemblies</artifactId>
     <packaging>pom</packaging>
-    <version>${project.version}</version>
-    <name>Apache ServiceMix Examples</name>
+    <name>Apache ServiceMix :: Features :: Assemblies</name>
 
     <modules>
-        <module>bridge</module>
-        <module>bridge-camel</module>
-        <module>camel</module>
-        <module>cxf-wsdl-first</module>
-        <module>camel-nmr</module>
-        <module>camel-osgi</module>
-        <module>cxf-camel-nmr</module>
-        <module>cxf-nmr</module>
-        <module>cxf-osgi</module>
-        <module>cxf-ws-addressing</module>
-        <module>cxf-jaxrs</module>
-        <module>cxf-wsdl-first-osgi-package</module>
-        <module>cxf-ws-security-osgi</module>
-        <module>cxf-ws-rm</module> 
-   </modules>
+        <module>apache-servicemix</module>
+    </modules>
 
-</project>
+
+</project>
\ No newline at end of file

Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1188127&r1=1188126&r2=1188127&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Mon Oct 24 12:50:13 2011
@@ -60,6 +60,12 @@
         <scope>import</scope>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.servicemix.features</groupId>
+        <artifactId>org.apache.servicemix.features.branding</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <!-- ServiceMix NMR -->
       <dependency>
         <groupId>org.apache.servicemix.nmr</groupId>



Mime
View raw message