You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2013/07/21 19:21:34 UTC
svn commit: r1505427 - in /felix/trunk/ipojo/runtime/distributions:
maven-tutorial/ maven-tutorial/src/ maven-tutorial/src/main/
maven-tutorial/src/main/appended-resources/
maven-tutorial/src/main/appended-resources/META-INF/
maven-tutorial/src/main/as...
Author: clement
Date: Sun Jul 21 17:21:33 2013
New Revision: 1505427
URL: http://svn.apache.org/r1505427
Log:
added the maven tutorial distribution
Added:
felix/trunk/ipojo/runtime/distributions/maven-tutorial/ (with props)
felix/trunk/ipojo/runtime/distributions/maven-tutorial/pom.xml
- copied, changed from r1498838, felix/trunk/ipojo/runtime/distributions/quickstart/pom.xml
felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/
felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/
felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/
felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/
felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/DEPENDENCIES
felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/NOTICE
felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/assembly/
felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/assembly/distribution.xml
- copied, changed from r1498838, felix/trunk/ipojo/runtime/distributions/quickstart/src/main/assembly/distribution.xml
felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/skeleton/
Modified:
felix/trunk/ipojo/runtime/distributions/quickstart/pom.xml
Propchange: felix/trunk/ipojo/runtime/distributions/maven-tutorial/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 21 17:21:33 2013
@@ -0,0 +1,5 @@
+target
+*.iml
+.project
+.classpath
+
Copied: felix/trunk/ipojo/runtime/distributions/maven-tutorial/pom.xml (from r1498838, felix/trunk/ipojo/runtime/distributions/quickstart/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/distributions/maven-tutorial/pom.xml?p2=felix/trunk/ipojo/runtime/distributions/maven-tutorial/pom.xml&p1=felix/trunk/ipojo/runtime/distributions/quickstart/pom.xml&r1=1498838&r2=1505427&rev=1505427&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/distributions/quickstart/pom.xml (original)
+++ felix/trunk/ipojo/runtime/distributions/maven-tutorial/pom.xml Sun Jul 21 17:21:33 2013
@@ -8,7 +8,7 @@
~ "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
+ ~ 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
@@ -27,75 +27,49 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
<version>2.1</version>
- <relativePath>../../../pom/pom.xml</relativePath>
+ <relativePath>../../../../pom/pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
- <name>Apache Felix iPOJO - Distribution - Quickstart</name>
- <artifactId>org.apache.felix.ipojo.distribution.quickstart</artifactId>
+ <name>Apache Felix iPOJO - Distribution - Maven Tutorial</name>
+ <artifactId>org.apache.felix.ipojo.distribution.maventutorial</artifactId>
<version>1.10.2-SNAPSHOT</version>
- <properties>
- <!-- Felix version -->
- <felix.version>4.2.1</felix.version>
-
- <!-- The location where the felix distribution is downloaded and expanded -->
- <felix.destination>${project.build.directory}/felix-distribution</felix.destination>
-
- <!-- The location where the legal files are generated -->
- <legal.files>${project.build.directory}/maven-shared-archive-resources/META-INF</legal.files>
-
- <!-- The base directory of the distribution -->
- <distribution.baseDirectory>ipojo-distribution-${project.version}</distribution.baseDirectory>
- </properties>
-
- <description>
- A distribution of Felix including iPOJO core and gogo commands
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main.distribution</artifactId>
- <version>${felix.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.gogo</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+
+ <description>This project builds the iPOJO Maven tutorial package</description>
+
<build>
<plugins>
<!--
- The build is configured to download and unpack the felix distribution to the felix-distribution folder.
- The assembly copy the unpacked file, stripping the base directory of the distribution
+ The build is configured to filter the skeleton and generate a distribution out of it.
-->
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
<executions>
<execution>
- <id>copy-felix-distribution</id>
- <phase>package</phase>
<goals>
- <goal>unpack-dependencies</goal>
+ <goal>copy-resources</goal>
</goals>
+ <phase>compile</phase>
+ <id>copy-skeleton</id>
<configuration>
- <includeGroupIds>org.apache.felix</includeGroupIds>
- <includeTypes>zip</includeTypes>
- <includeArtifactsIds>org.apache.felix.main.distribution</includeArtifactsIds>
- <outputDirectory>${felix.destination}</outputDirectory>
+ <outputDirectory>${project.build.directory}/maven-tutorial</outputDirectory>
+ <delimiters>
+ <!-- we use a specific delimiter to avoid filtering internal properties -->
+ <delimiter>@</delimiter>
+ </delimiters>
+ <escapeString>\</escapeString>
+ <resources>
+ <resource>
+ <directory>src/main/skeleton</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</configuration>
</execution>
</executions>
@@ -124,23 +98,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <searchPaths>
- <searchPath>${distribution.baseDirectory}</searchPath>
- </searchPaths>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Added: felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1505427&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/DEPENDENCIES (added)
+++ felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/DEPENDENCIES Sun Jul 21 17:21:33 2013
@@ -0,0 +1,27 @@
+
+I. Included Third-Party Software
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2012).
+Licensed under the Apache License 2.0.
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2012).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Codehaus (http://www.codehaus.org)
+Licensed under the Apache License 2.0.
+
+III. License Summary
+
+- Apache License 2.0
+- BSD License
Added: felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/NOTICE?rev=1505427&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/NOTICE (added)
+++ felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/appended-resources/META-INF/NOTICE Sun Jul 21 17:21:33 2013
@@ -0,0 +1,8 @@
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2012).
+Licensed under the Apache License 2.0.
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
\ No newline at end of file
Copied: felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/assembly/distribution.xml (from r1498838, felix/trunk/ipojo/runtime/distributions/quickstart/src/main/assembly/distribution.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/assembly/distribution.xml?p2=felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/assembly/distribution.xml&p1=felix/trunk/ipojo/runtime/distributions/quickstart/src/main/assembly/distribution.xml&r1=1498838&r2=1505427&rev=1505427&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/distributions/quickstart/src/main/assembly/distribution.xml (original)
+++ felix/trunk/ipojo/runtime/distributions/maven-tutorial/src/main/assembly/distribution.xml Sun Jul 21 17:21:33 2013
@@ -7,7 +7,7 @@
~ "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
+ ~ 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
@@ -23,39 +23,23 @@
<id>distribution</id>
<formats>
- <format>dir</format>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${distribution.baseDirectory}</baseDirectory>
+
<fileSets>
<fileSet>
- <directory>${felix.destination}/felix-framework-${felix.version}</directory>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
<outputDirectory/>
- <includes>
- <include>bin/**</include>
- <include>bundle/**</include>
- <include>conf/**</include>
- </includes>
</fileSet>
<fileSet>
- <directory>${legal.files}</directory>
+ <directory>${project.build.directory}/maven-tutorial</directory>
<outputDirectory/>
</fileSet>
</fileSets>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>*:org.apache.felix.ipojo:*</include>
- <include>*:org.apache.felix.ipojo.gogo:*</include>
- </includes>
- <unpack>false</unpack>
- <outputDirectory>bundle</outputDirectory>
- </dependencySet>
- </dependencySets>
</assembly>
\ No newline at end of file
Modified: felix/trunk/ipojo/runtime/distributions/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/distributions/quickstart/pom.xml?rev=1505427&r1=1505426&r2=1505427&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/distributions/quickstart/pom.xml (original)
+++ felix/trunk/ipojo/runtime/distributions/quickstart/pom.xml Sun Jul 21 17:21:33 2013
@@ -27,7 +27,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
<version>2.1</version>
- <relativePath>../../../pom/pom.xml</relativePath>
+ <relativePath>../../../../pom/pom.xml</relativePath>
</parent>
@@ -94,7 +94,7 @@
<configuration>
<includeGroupIds>org.apache.felix</includeGroupIds>
<includeTypes>zip</includeTypes>
- <includeArtifactsIds>org.apache.felix.main.distribution</includeArtifactsIds>
+ <includeArtifactIds>org.apache.felix.main.distribution</includeArtifactIds>
<outputDirectory>${felix.destination}</outputDirectory>
</configuration>
</execution>