Add an assembly.xml for building the framework distribution.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@906653 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/NOTICE b/main/NOTICE
index a092643..872049a 100644
--- a/main/NOTICE
+++ b/main/NOTICE
@@ -13,6 +13,9 @@
Copyright (c) OSGi Alliance (2000, 2009).
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 Software
@@ -27,3 +30,4 @@
III. License Summary
- Apache License 2.0
+- BSD License
diff --git a/main/assembly.xml b/main/assembly.xml
new file mode 100644
index 0000000..73a261a
--- /dev/null
+++ b/main/assembly.xml
@@ -0,0 +1,69 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>distribution</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/bundle</directory>
+ <outputDirectory>bundle</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/doc</directory>
+ <outputDirectory>doc</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ <outputDirectory>.</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/main/pom.xml b/main/pom.xml
index d071dae..9705c57 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
@@ -47,7 +47,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.4.1</version>
+ <version>${shell.version}</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
@@ -62,7 +62,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.4.1</version>
+ <version>${shell.tui.version}</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
@@ -77,7 +77,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.4.2</version>
+ <version>${obr.version}</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -109,6 +109,10 @@
<properties>
<log.level>4</log.level>
<dollar>$</dollar>
+ <shell.version>1.4.1</shell.version>
+ <shell.tui.version>1.4.1</shell.tui.version>
+ <obr.version>1.4.2</obr.version>
+ <security.version>0.9.0-SNAPSHOT</security.version>
</properties>
<profiles>
<profile>
@@ -173,14 +177,14 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -189,26 +193,26 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.4.1</version>
+ <version>${shell.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/bundle</outputDirectory>
+ <outputDirectory>${project.basedir}/bundle</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.4.1</version>
+ <version>${shell.tui.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/bundle</outputDirectory>
+ <outputDirectory>${project.basedir}/bundle</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.4.2</version>
+ <version>${obr.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/bundle</outputDirectory>
+ <outputDirectory>${project.basedir}/bundle</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -219,17 +223,15 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>install</phase>
+ <phase>package</phase>
<configuration>
<tasks>
<delete dir="${basedir}/bin" />
<mkdir dir="${basedir}/bin" />
<delete dir="${basedir}/conf" />
<mkdir dir="${basedir}/conf" />
- <delete dir="${basedir}/bundle" />
<copy file="${basedir}/target/org.apache.felix.main-${pom.version}.jar" tofile="${basedir}/bin/felix.jar" />
<copy file="${basedir}/target/classes/config.properties" todir="${basedir}/conf" />
- <move file="${basedir}/target/bundle" todir="${basedir}" />
</tasks>
</configuration>
<goals>
@@ -238,6 +240,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>felix-framework-${pom.version}</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
<resource>
diff --git a/main/src/main/resources/config.properties b/main/src/main/resources/config.properties
index ef60e45..cd77c48 100644
--- a/main/src/main/resources/config.properties
+++ b/main/src/main/resources/config.properties
@@ -76,7 +76,7 @@
# may be specified for different start levels.
#felix.auto.start.1=
-felix.log.level=4
+felix.log.level=${log.level}
# Sets the initial start level of the framework upon startup.
#org.osgi.framework.startlevel.beginning=1