You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/02/12 12:20:15 UTC
svn commit: r743687 - in /servicemix/smx4/nmr/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/distribution/
assembly/src/main/distribution/ant/ assembly/src/main/filtered-resources/etc/
Author: gnodet
Date: Thu Feb 12 11:20:14 2009
New Revision: 743687
URL: http://svn.apache.org/viewvc?rev=743687&view=rev
Log:
SMX4NMR-74: Change the distribution to include ant tasks and the kernel to have a fully operational minimal jbi container
Added:
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/ (props changed)
- copied from r743663, servicemix/smx4/features/trunk/assembly/src/main/distribution/ant/
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=743687&r1=743686&r2=743687&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Thu Feb 12 11:20:14 2009
@@ -34,6 +34,16 @@
<dependencies>
<dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <type>tar.gz</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.document</groupId>
<artifactId>org.apache.servicemix.document</artifactId>
</dependency>
@@ -147,7 +157,7 @@
<executions>
<execution>
<id>filter</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>resources</goal>
</goals>
@@ -155,23 +165,63 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
+ <id>unpack-unix</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>attach-artifact</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
- <artifacts>
- <artifact>
- <file>target/classes/features.xml</file>
- <type>xml </type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</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.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <type>zip</type>
+ <outputDirectory>target/dependencies/win</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-features-to-repo</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-features-to-repo</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
+ </descriptors>
+ <features>
+ <feature>jbi</feature>
+ </features>
+ <repository>target/features-repo</repository>
</configuration>
</execution>
</executions>
@@ -234,6 +284,28 @@
</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>
</plugins>
</build>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=743687&r1=743686&r2=743687&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Feb 12 11:20:14 2009
@@ -17,14 +17,41 @@
-->
<assembly>
<id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+
<formats>
<format>tar.gz</format>
</formats>
+
<fileSets>
+ <!-- Expanded ServiceMix Runtime -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/**</exclude>
+ <exclude>demos/**</exclude>
+ <exclude>etc/org.apache.servicemix.features.cfg</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>RELEASE-NOTES.txt</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy over bin/servicemix separately to get the correct file mode -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
<!-- Copy license and other files from root -->
<fileSet>
- <directory>..</directory>
+ <directory>${basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README.txt</include>
@@ -35,46 +62,20 @@
<!-- Copy over everything that needs to get unix line endings -->
<fileSet>
- <directory>src/main/distribution/text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/main/distribution/unix-text</directory>
- <outputDirectory>/</outputDirectory>
+ <directory>${basedir}/src/main/distribution/ant</directory>
+ <outputDirectory>/ant</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
-
- <!-- Copy over files that should not get the line endings converted -->
- <fileSet>
- <directory>src/main/distribution/binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
<fileSet>
- <directory>src/main/distribution/unix-binary</directory>
- <outputDirectory>/</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
-
- <!-- Copy over the files that need unix line endings and also chmod to 755 -->
- <fileSet>
- <directory>src/main/distribution/unix-shell</directory>
- <outputDirectory>/</outputDirectory>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
- <fileMode>0755</fileMode>
</fileSet>
- <!-- Copy over jar files -->
<fileSet>
- <directory>target/dependencies</directory>
- <outputDirectory>/lib/</outputDirectory>
+ <directory>${basedir}/target/features-repo</directory>
+ <outputDirectory>system</outputDirectory>
</fileSet>
</fileSets>
@@ -94,42 +95,13 @@
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
+ <file>
+ <source>${basedir}/target/classes/features.xml</source>
+ <outputDirectory>system/org/apache/servicemix/nmr/${artifactId}/${version}</outputDirectory>
+ <destName>${artifactId}-${version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
</files>
- <dependencySets>
-
- <!-- Mandatory bundles for everything -->
- <dependencySet>
- <outputDirectory>/lib/</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.javamail-api-1.4</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
- <include>org.apache.xbean:xbean-classloader</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.commands</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.management</include>
- <include>org.apache.servicemix.document:org.apache.servicemix.document</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.management</include>
- <include>org.apache.servicemix.jbi.cluster:org.apache.servicemix.jbi.cluster.requestor</include>
- <include>org.apache.servicemix.jbi.cluster:org.apache.servicemix.jbi.cluster.engine</include>
- <include>org.apache.servicemix.jbi.cluster:org.apache.servicemix.jbi.cluster.config</include>
- </includes>
- </dependencySet>
-
- </dependencySets>
-
</assembly>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=743687&r1=743686&r2=743687&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Feb 12 11:20:14 2009
@@ -17,57 +17,66 @@
-->
<assembly>
<id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+
<formats>
<format>zip</format>
</formats>
+
<fileSets>
+ <!-- Expanded ServiceMix Runtime -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/**</exclude>
+ <exclude>demos/**</exclude>
+ <exclude>etc/org.apache.servicemix.features.cfg</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>RELEASE-NOTES.txt</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy over bin/servicemix separately to get the correct file mode -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
- <!-- Copy license and other files from root -->
- <fileSet>
- <directory>..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README.txt</include>
- <include>RELEASE*.txt</include>
- </includes>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
- <!-- Copy over everything that needs to get dos line endings -->
- <fileSet>
- <directory>src/main/distribution/text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/main/distribution/windows-text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
- <!-- Copy over files that should not get the line endings converted -->
- <fileSet>
- <directory>src/main/distribution/binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
-
- <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
- <fileSet>
- <directory>src/main/distribution/windows-binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
-
- <!-- Copy over jar files -->
- <fileSet>
- <directory>target/dependencies</directory>
- <outputDirectory>/lib/</outputDirectory>
- </fileSet>
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README.txt</include>
+ <include>RELEASE*.txt</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <!-- Copy over everything that needs to get unix line endings -->
+ <fileSet>
+ <directory>${basedir}/src/main/distribution/ant</directory>
+ <outputDirectory>/ant</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/target/features-repo</directory>
+ <outputDirectory>system</outputDirectory>
+ </fileSet>
</fileSets>
@@ -77,50 +86,23 @@
<outputDirectory>/</outputDirectory>
<destName>LICENSE.txt</destName>
<fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
+ <lineEnding>dos</lineEnding>
</file>
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
<outputDirectory>/</outputDirectory>
<destName>NOTICE.txt</destName>
<fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/classes/features.xml</source>
+ <outputDirectory>system/org/apache/servicemix/nmr/${artifactId}/${version}</outputDirectory>
+ <destName>${artifactId}-${version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
</file>
</files>
- <dependencySets>
-
- <!-- Mandatory bundles for everything -->
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.javamail-api-1.4</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
- <include>org.apache.xbean:xbean-classloader</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.commands</include>
- <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.management</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.management</include>
- <include>org.apache.servicemix.jbi.cluster:org.apache.servicemix.jbi.cluster.requestor</include>
- <include>org.apache.servicemix.jbi.cluster:org.apache.servicemix.jbi.cluster.engine</include>
- <include>org.apache.servicemix.jbi.cluster:org.apache.servicemix.jbi.cluster.config</include>
- </includes>
- </dependencySet>
-
- </dependencySets>
</assembly>
Propchange: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/
------------------------------------------------------------------------------
svn:mergeinfo =
Added: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg?rev=743687&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg (added)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg Thu Feb 12 11:20:14 2009
@@ -0,0 +1,29 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories=mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=jbi
+
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=743687&r1=743686&r2=743687&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Thu Feb 12 11:20:14 2009
@@ -580,6 +580,18 @@
<version>${servicemix.legal.version}</version>
<type>xml</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <version>${servicemix.kernel.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <version>${servicemix.kernel.version}</version>
+ <type>tar.gz</type>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -684,6 +696,11 @@
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>