You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2016/01/29 22:51:49 UTC
servicemix git commit: SM-2768: Upgrade to Apache Karaf 4
Repository: servicemix
Updated Branches:
refs/heads/master 9dc21d3ed -> eab102970
SM-2768: Upgrade to Apache Karaf 4
- minimize the custom assembly definition
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/eab10297
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/eab10297
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/eab10297
Branch: refs/heads/master
Commit: eab102970bea1b7af6321a74c399f4dc0f90b427
Parents: 9dc21d3
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 29 22:50:29 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 29 22:50:29 2016 +0100
----------------------------------------------------------------------
assemblies/apache-servicemix-examples/pom.xml | 61 +++++++++++++++
assemblies/apache-servicemix/pom.xml | 64 +++++++++++++---
.../src/main/descriptors/unix-bin.xml | 1 -
.../src/main/resources/common-unix-bin.xml | 46 ------------
.../src/main/resources/examples-unix-bin.xml | 78 --------------------
assemblies/pom.xml | 1 +
6 files changed, 114 insertions(+), 137 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/eab10297/assemblies/apache-servicemix-examples/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix-examples/pom.xml b/assemblies/apache-servicemix-examples/pom.xml
new file mode 100644
index 0000000..6d2e8b9
--- /dev/null
+++ b/assemblies/apache-servicemix-examples/pom.xml
@@ -0,0 +1,61 @@
+<?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>
+ <artifactId>assemblies</artifactId>
+ <groupId>org.apache.servicemix.assemblies</groupId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>apache-servicemix-examples</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache ServiceMix :: Assemblies :: ServiceMix Examples</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../examples</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.iwl</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../examples</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/README.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/eab10297/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
index b65cc20..15907d9 100644
--- a/assemblies/apache-servicemix/pom.xml
+++ b/assemblies/apache-servicemix/pom.xml
@@ -171,6 +171,8 @@
<includes>
<include>README</include>
<include>RELEASE*</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
</resource>
<resource>
@@ -259,18 +261,41 @@
<goals>
<goal>unpack</goal>
</goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>apache-servicemix-examples</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/dependencies/examples</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>demos</artifactId>
+ <version>${karaf.version}</version>
+ <outputDirectory>${project.build.directory}/dependencies/examples/karaf</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>org.apache.servicemix.branding</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory>
+ <destFileName>servicemix-version.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
</execution>
</executions>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.karaf</groupId>
- <artifactId>demos</artifactId>
- <version>${karaf.version}</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/dependencies/examples/karaf</outputDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -284,7 +309,6 @@
</execution>
</executions>
</plugin>
- <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -292,7 +316,6 @@
<skip>true</skip>
</configuration>
</plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -316,6 +339,23 @@
</target>
</configuration>
</execution>
+ <execution>
+ <id>copy-karaf-to-servicemix</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target name="copy-karaf-to-servicemix">
+ <echo message="Copying bin/karaf to bin/servicemix" />
+ <copy file="${project.build.directory}/assembly/bin/karaf"
+ tofile="${project.build.directory}/assembly/bin/servicemix" />
+ <echo message="Copying bin/karaf.bat to bin/servicemix.bat" />
+ <copy file="${project.build.directory}/assembly/bin/karaf.bat"
+ tofile="${project.build.directory}/assembly/bin/servicemix.bat" />
+ </target>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/eab10297/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml b/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
index 1b478ef..9a1d054 100644
--- a/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
@@ -24,7 +24,6 @@
<componentDescriptors>
<componentDescriptor>${project.build.outputDirectory}/common-unix-bin.xml</componentDescriptor>
- <componentDescriptor>${project.build.outputDirectory}/examples-unix-bin.xml</componentDescriptor>
</componentDescriptors>
</assembly>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/eab10297/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
index 8a649b4..8705587 100644
--- a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
@@ -23,8 +23,6 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
- <exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
<exclude>**/META-INF/**</exclude>
<exclude>setenv-*</exclude>
<exclude>*-unix-bin.xml</exclude>
@@ -54,48 +52,4 @@
</fileSet>
</fileSets>
-
- <files>
- <file>
- <source>${project.build.directory}/assembly/bin/karaf</source>
- <outputDirectory>/bin/</outputDirectory>
- <destName>servicemix</destName>
- <fileMode>0755</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>${project.build.directory}/assembly/bin/karaf.bat</source>
- <outputDirectory>/bin/</outputDirectory>
- <destName>servicemix.bat</destName>
- <fileMode>0755</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- <file>
- <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
- <outputDirectory>/</outputDirectory>
- <destName>LICENSE</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
- <outputDirectory>/</outputDirectory>
- <destName>NOTICE</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
- <fileMode>0644</fileMode>
- <includes>
- <include>org.apache.servicemix:org.apache.servicemix.branding</include>
- </includes>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/eab10297/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml b/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
deleted file mode 100644
index 3277d6e..0000000
--- a/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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>
-
- <!-- Copy over the examples -->
- <fileSet>
- <directory>${basedir}/../../examples</directory>
- <outputDirectory>/examples/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <includes>
- <include>activemq/**</include>
- <include>activiti/**</include>
- <include>akka/**</include>
- <include>camel/**</include>
- <include>cxf/**</include>
- <include>drools/**</include>
- </includes>
- <excludes>
- <exclude>pom.xml</exclude>
- <!-- we need add filtered README.txt, so exclude the raw one here -->
- <exclude>**/README.txt</exclude>
- <!-- exclude build output/IDE config/... files -->
- <exclude>**/target/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/*.i??</exclude>
- <exclude>**/*.jks</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../../examples</directory>
- <outputDirectory>/examples/</outputDirectory>
- <lineEnding>keep</lineEnding>
- <includes>
- <include>activemq/**/*.jks</include>
- <include>activiti/**/*.jks</include>
- <include>akka/**/*.jks</include>
- <include>camel/**/*.jks</include>
- <include>cxf/**/*.jks</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../../examples</directory>
- <outputDirectory>/examples/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <includes>
- <include>README.txt</include>
- <include>activemq/**/README.txt</include>
- <include>activiti/**/README.txt</include>
- <include>akka/**/README.txt</include>
- <include>camel/**/README.txt</include>
- <include>cxf/**/README.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-
-</component>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/eab10297/assemblies/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
index f277e72..7bbfb8f 100644
--- a/assemblies/pom.xml
+++ b/assemblies/pom.xml
@@ -36,6 +36,7 @@
<modules>
<module>features</module>
<module>apache-servicemix</module>
+ <module>apache-servicemix-examples</module>
</modules>
</project>
\ No newline at end of file