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 2008/09/10 19:12:01 UTC
svn commit: r693899 - in
/servicemix/smx4/kernel/branches/kernel-1.0.x/assembly: ./
src/main/descriptors/ src/main/distribution/text/etc/
src/main/filtered-resources/ src/main/filtered-resources/etc/
Author: gnodet
Date: Wed Sep 10 10:12:00 2008
New Revision: 693899
URL: http://svn.apache.org/viewvc?rev=693899&view=rev
Log:
SMX4KNL-81: The wrapper feature can not be installed out of the box
Added:
servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/features.xml
Removed:
servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/distribution/text/etc/org.apache.servicemix.features.cfg
Modified:
servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/pom.xml
servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/windows-bin.xml
Modified: servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/pom.xml?rev=693899&r1=693898&r2=693899&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/pom.xml Wed Sep 10 10:12:00 2008
@@ -250,6 +250,28 @@
</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>2.2-beta-2</version>
Modified: servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/unix-bin.xml?rev=693899&r1=693898&r2=693899&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/unix-bin.xml Wed Sep 10 10:12:00 2008
@@ -45,8 +45,8 @@
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -94,6 +94,13 @@
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
+ <file>
+ <source>${basedir}/target/classes/features.xml</source>
+ <outputDirectory>/system/org/apache/servicemix/kernel/apache-servicemix-kernel/${version}</outputDirectory>
+ <destName>apache-servicemix-kernel-${version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
</files>
<dependencySets>
Modified: servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/windows-bin.xml?rev=693899&r1=693898&r2=693899&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/descriptors/windows-bin.xml Wed Sep 10 10:12:00 2008
@@ -46,8 +46,8 @@
<lineEnding>dos</lineEnding>
</fileSet>
<fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -77,14 +77,21 @@
<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/kernel/apache-servicemix-kernel/${version}</outputDirectory>
+ <destName>apache-servicemix-kernel-${version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
</file>
</files>
Added: servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg?rev=693899&view=auto
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg (added)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg Wed Sep 10 10:12:00 2008
@@ -0,0 +1,28 @@
+################################################################################
+#
+# 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.kernel/apache-servicemix-kernel/${version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=
Added: servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/features.xml?rev=693899&view=auto
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/features.xml (added)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/filtered-resources/features.xml Wed Sep 10 10:12:00 2008
@@ -0,0 +1,23 @@
+<?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.
+-->
+<features>
+ <feature name="wrapper">
+ <bundle>mvn:org.apache.servicemix.kernel.gshell/org.apache.servicemix.kernel.gshell.wrapper/${version}</bundle>
+ </feature>
+</features>