servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ioca...@apache.org
Subject svn commit: r1170200 - in /servicemix/smx4/features/trunk/assembly: ./ src/main/descriptors/ src/main/filtered-resources/etc-full/ src/main/filtered-resources/etc-jbi/ src/main/filtered-resources/etc/
Date Tue, 13 Sep 2011 14:50:53 GMT
Author: iocanel
Date: Tue Sep 13 14:50:52 2011
New Revision: 1170200

URL: http://svn.apache.org/viewvc?rev=1170200&view=rev
Log:
[SMX4-883] Added a a basic distribution which contains basic features. Renamed the existing distribution to apache-servicemix-4.x-jbi. Added a distribution with basic features which works fully offline.

Added:
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-full.xml
      - copied, changed from r1170097, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-jbi.xml
      - copied, changed from r1170097, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-full.xml
      - copied, changed from r1170097, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-jbi.xml
      - copied, changed from r1170097, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-full/
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg
      - copied, changed from r1170097, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-jbi/
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg
      - copied, changed from r1170097, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1170200&r1=1170199&r2=1170200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Sep 13 14:50:52 2011
@@ -191,6 +191,147 @@
                             <repository>target/features-repo</repository>
                         </configuration>
                     </execution>
+                    <!-- We are going to repeat this execution to prepare a repository for the full distro -->
+                    <execution>
+                        <id>add-features-to-repo-full</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>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-broker</feature>
+                                <feature>camel</feature>
+                                <feature>camel-activemq</feature>
+                                <feature>camel-ahc</feature>
+                                <feature>camel-amqp</feature>
+                                <feature>camel-atom</feature>
+                                <feature>camel-aws</feature>
+                                <feature>camel-bam</feature>
+                                <feature>camel-bean-validator</feature>
+                                <feature>camel-bindy</feature>
+                                <feature>camel-blueprint</feature>
+                                <feature>camel-castor</feature>
+                                <feature>camel-cometd</feature>
+                                <feature>camel-crypto</feature>
+                                <feature>camel-csv</feature>
+                                <feature>camel-cxf</feature>
+                                <feature>camel-cxf</feature>
+                                <feature>camel-dozer</feature>
+                                <feature>camel-eventadmin</feature>
+                                <feature>camel-exec</feature>
+                                <feature>camel-flatpack</feature>
+                                <feature>camel-ftp</feature>
+                                <feature>camel-groovy</feature>
+                                <feature>camel-guice</feature>
+                                <feature>camel-hawtdb</feature>
+                                <feature>camel-hazelcast</feature>
+                                <feature>camel-hdfs</feature>
+                                <feature>camel-hl7</feature>
+                                <feature>camel-http4</feature>
+                                <feature>camel-http</feature>
+                                <feature>camel-ibatis</feature>
+                                <feature>camel-irc</feature>
+                                <feature>camel-jackson</feature>
+                                <feature>camel-jasypt</feature>
+                                <feature>camel-jaxb</feature>
+                                <feature>camel-jcr</feature>
+                                <feature>camel-jdbc</feature>
+                                <feature>camel-jetty</feature>
+                                <feature>camel-jibx</feature>
+                                <feature>camel-jing</feature>
+                                <feature>camel-jms</feature>
+                                <feature>camel-jmx</feature>
+                                <feature>camel-josql</feature>
+                                <feature>camel-jpa</feature>
+                                <feature>camel-juel</feature>
+                                <feature>camel-jxpath</feature>
+                                <feature>camel-kestrel</feature>
+                                <feature>camel-ldap</feature>
+                                <feature>camel-lucene</feature>
+                                <feature>camel-mail</feature>
+                                <feature>camel-mina</feature>
+                                <feature>camel-msv</feature>
+                                <feature>camel-mvel</feature>
+                                <feature>camel-mybatis</feature>
+                                <feature>camel-nagios</feature>
+                                <feature>camel-nmr</feature>
+                                <feature>camel-ognl</feature>
+                                <feature>camel-paxlogging</feature>
+                                <feature>camel-printer</feature>
+                                <feature>camel-protobuf</feature>
+                                <feature>camel-quartz</feature>
+                                <feature>camel-quickfix</feature>
+                                <feature>camel-restlet</feature>
+                                <feature>camel-rmi</feature>
+                                <feature>camel-routebox</feature>
+                                <feature>camel-rss</feature>
+                                <feature>camel-ruby</feature>
+                                <feature>camel-saxon</feature>
+                                <feature>camel-scala</feature>
+                                <feature>camel-script</feature>
+                                <feature>camel-servlet</feature>
+                                <feature>camel-shiro</feature>
+                                <feature>camel-smpp</feature>
+                                <feature>camel-snmp</feature>
+                                <feature>camel-soap</feature>
+                                <feature>camel-spring-integration</feature>
+                                <feature>camel-spring-javaconfig</feature>
+                                <feature>camel-spring-security</feature>
+                                <feature>camel-spring-ws</feature>
+                                <feature>camel-sql</feature>
+                                <feature>camel-stream</feature>
+                                <feature>camel-string-template</feature>
+                                <feature>camel-syslog</feature>
+                                <feature>camel-tagsoup</feature>
+                                <feature>camel-velocity</feature>
+                                <feature>camel-xmlbeans</feature>
+                                <feature>camel-xmlsecurity</feature>
+                                <feature>camel-xmpp</feature>
+                                <feature>camel-xstream</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-full</repository>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -319,6 +460,34 @@
                         </configuration>
                     </execution>
                     <execution>
+                        <id>unix-bin-jbi</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/unix-bin-jbi.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unix-bin-full</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/unix-bin-full.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>windows-bin</id>
                         <phase>package</phase>
                         <goals>
@@ -332,6 +501,33 @@
                         </configuration>
                     </execution>
                     <execution>
+                        <id>windows-bin-jbi</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/windows-bin-jbi.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>windows-bin-full</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/windows-bin-full.xml</descriptor>
+                            </descriptors>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                        </configuration>
+                    </execution>
+
+                    <execution>
                         <id>unix-src</id>
                         <phase>package</phase>
                         <goals>

Copied: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-full.xml (from r1170097, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-full.xml?p2=servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-full.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml&r1=1170097&r2=1170200&rev=1170200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-full.xml Tue Sep 13 14:50:52 2011
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <assembly>
-    <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+    <id>full</id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
     <formats>
         <format>jar</format>
         <format>tar.gz</format>
@@ -132,7 +132,7 @@
             <fileMode>0644</fileMode>
         </fileSet>        
         <fileSet>
-            <directory>target/classes/etc</directory>
+            <directory>target/classes/etc-full</directory>
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
             <fileMode>0644</fileMode>
@@ -165,7 +165,7 @@
         </fileSet>
         
         <fileSet>
-          <directory>target/features-repo</directory>
+          <directory>target/features-repo-full</directory>
           <outputDirectory>system</outputDirectory>
         </fileSet>
 
@@ -363,60 +363,6 @@
                 <include>org.apache.felix:org.osgi.compendium</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <include>org.springframework:spring-tx</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework.osgi:spring-osgi-core</include>
-                <include>org.springframework.osgi:spring-osgi-extender</include>
-                <include>org.springframework.osgi:spring-osgi-io</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-            </includes>
-        </dependencySet>
         <!-- SMX4-764 - Override Felix Framework to 3.0.8 version -->
         <!-- begin snippet -->
         <dependencySet>

Copied: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-jbi.xml (from r1170097, servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-jbi.xml?p2=servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-jbi.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml&r1=1170097&r2=1170200&rev=1170200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin-jbi.xml Tue Sep 13 14:50:52 2011
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <assembly>
-    <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+    <id>jbi</id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
     <formats>
         <format>jar</format>
         <format>tar.gz</format>
@@ -132,7 +132,7 @@
             <fileMode>0644</fileMode>
         </fileSet>        
         <fileSet>
-            <directory>target/classes/etc</directory>
+            <directory>target/classes/etc-full</directory>
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
             <fileMode>0644</fileMode>
@@ -363,60 +363,6 @@
                 <include>org.apache.felix:org.osgi.compendium</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <include>org.springframework:spring-tx</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework.osgi:spring-osgi-core</include>
-                <include>org.springframework.osgi:spring-osgi-extender</include>
-                <include>org.springframework.osgi:spring-osgi-io</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-            </includes>
-        </dependencySet>
         <!-- SMX4-764 - Override Felix Framework to 3.0.8 version -->
         <!-- begin snippet -->
         <dependencySet>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1170200&r1=1170199&r2=1170200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Sep 13 14:50:52 2011
@@ -363,60 +363,6 @@
                 <include>org.apache.felix:org.osgi.compendium</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <include>org.springframework:spring-tx</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework.osgi:spring-osgi-core</include>
-                <include>org.springframework.osgi:spring-osgi-extender</include>
-                <include>org.springframework.osgi:spring-osgi-io</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-            </includes>
-        </dependencySet>
         <!-- SMX4-764 - Override Felix Framework to 3.0.8 version -->
         <!-- begin snippet -->
         <dependencySet>

Copied: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-full.xml (from r1170097, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-full.xml?p2=servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-full.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml&r1=1170097&r2=1170200&rev=1170200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-full.xml Tue Sep 13 14:50:52 2011
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <assembly>
-    <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+    <id>full</id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
     <formats>
         <format>zip</format>
     </formats>
@@ -111,7 +111,7 @@
           <fileMode>0644</fileMode>
       </fileSet>        
       <fileSet>
-          <directory>target/classes/etc</directory>
+          <directory>target/classes/etc-full</directory>
           <outputDirectory>/etc/</outputDirectory>
           <lineEnding>dos</lineEnding>
           <fileMode>0644</fileMode>
@@ -147,7 +147,7 @@
       </fileSet>
 
       <fileSet>
-        <directory>target/features-repo</directory>
+        <directory>target/features-repo-full</directory>
         <outputDirectory>system</outputDirectory>
       </fileSet>
       
@@ -347,66 +347,6 @@
                 <include>org.apache.felix:org.osgi.compendium</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <include>org.springframework:spring-tx</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework.osgi:spring-osgi-core</include>
-                <include>org.springframework.osgi:spring-osgi-extender</include>
-                <include>org.springframework.osgi:spring-osgi-io</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.oro</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-vfs</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-codec</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-httpclient</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-            </includes>
-        </dependencySet>
         <!-- SMX4-764 - Override the Felix Framework version -->
         <!-- begin snippet -->
         <dependencySet>

Copied: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-jbi.xml (from r1170097, servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-jbi.xml?p2=servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-jbi.xml&p1=servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml&r1=1170097&r2=1170200&rev=1170200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin-jbi.xml Tue Sep 13 14:50:52 2011
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <assembly>
-    <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+    <id>jbi</id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
     <formats>
         <format>zip</format>
     </formats>
@@ -111,7 +111,7 @@
           <fileMode>0644</fileMode>
       </fileSet>        
       <fileSet>
-          <directory>target/classes/etc</directory>
+          <directory>target/classes/etc-jbi</directory>
           <outputDirectory>/etc/</outputDirectory>
           <lineEnding>dos</lineEnding>
           <fileMode>0644</fileMode>
@@ -347,66 +347,6 @@
                 <include>org.apache.felix:org.osgi.compendium</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <include>org.springframework:spring-tx</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework.osgi:spring-osgi-core</include>
-                <include>org.springframework.osgi:spring-osgi-extender</include>
-                <include>org.springframework.osgi:spring-osgi-io</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.oro</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-vfs</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-codec</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-httpclient</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-            </includes>
-        </dependencySet>
         <!-- SMX4-764 - Override the Felix Framework version -->
         <!-- begin snippet -->
         <dependencySet>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1170200&r1=1170199&r2=1170200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Sep 13 14:50:52 2011
@@ -347,66 +347,6 @@
                 <include>org.apache.felix:org.osgi.compendium</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <include>org.springframework:spring-tx</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.springframework.osgi:spring-osgi-core</include>
-                <include>org.springframework.osgi:spring-osgi-extender</include>
-                <include>org.springframework.osgi:spring-osgi-io</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.oro</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-vfs</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-codec</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-httpclient</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/system</outputDirectory>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <includes>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-            </includes>
-        </dependencySet>
         <!-- SMX4-764 - Override the Felix Framework version -->
         <!-- begin snippet -->
         <dependencySet>

Copied: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg (from r1170097, 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/assembly/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg?p2=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&r1=1170097&r2=1170200&rev=1170200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-full/org.apache.karaf.features.cfg Tue Sep 13 14:50:52 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,camel,camel-activemq,camel-nmr,camel-cxf,camel-blueprint,jbi-cluster,war,servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-smpp,servicemix-snmp,servicemix-vfs,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-osworkflow,servicemix-quartz,servicemix-scripting,servicemix-validation,servicemix-saxon,servicemix-wsn2005,servicemix-exec
+featuresBoot=karaf-framework,config,activemq-broker,camel,camel-activemq,camel-cxf,camel-blueprint
 

Copied: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg (from r1170097, 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/assembly/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg?p2=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc-jbi/org.apache.karaf.features.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&r1=1170097&r2=1170200&rev=1170200&view=diff
==============================================================================
    (empty)

Modified: 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/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1170200&r1=1170199&r2=1170200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Tue Sep 13 14:50:52 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,camel,camel-activemq,camel-nmr,camel-cxf,camel-blueprint,jbi-cluster,war,servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-smpp,servicemix-snmp,servicemix-vfs,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-osworkflow,servicemix-quartz,servicemix-scripting,servicemix-validation,servicemix-saxon,servicemix-wsn2005,servicemix-exec
+featuresBoot=karaf-framework,config,activemq-broker,camel,camel-activemq,camel-cxf,camel-blueprint
 



Mime
View raw message