Re-organized UPnP sub-project. Now UPnP artifacts can be built from UPnP directory (and samples directory too)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@607057 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom/pom.xml b/pom/pom.xml
index 5e4b368..9e9660c 100644
--- a/pom/pom.xml
+++ b/pom/pom.xml
@@ -125,15 +125,7 @@
<value>bundle</value>
</property>
</activation>
- <modules>
-
- <module>../upnp/extra</module>
- <module>../upnp/basedriver</module>
- <module>../upnp/tester</module>
- <module>../upnp/samples/tv</module>
- <module>../upnp/samples/clock</module>
- <module>../upnp/samples/binarylight</module>
-
+ <modules>
<module>../org.osgi.foundation</module>
<module>../javax.servlet</module>
<module>../org.osgi.core</module>
@@ -149,6 +141,7 @@
<module>../log</module>
<module>../eventadmin</module>
<module>../http.jetty</module>
+ <module>../upnp</module>
<module>../scr</module>
<module>../configadmin</module>
<module>../metatype</module>
diff --git a/upnp/pom.xml b/upnp/pom.xml
new file mode 100644
index 0000000..fe0e9a8
--- /dev/null
+++ b/upnp/pom.xml
@@ -0,0 +1,31 @@
+<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <name>Apache Felix UPnP: Build</name>
+ <artifactId>upnp.build</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+
+ <profiles>
+ <profile>
+ <id>packaging-bundle</id>
+ <activation>
+ <property>
+ <name>packaging</name>
+ <value>bundle</value>
+ </property>
+ </activation>
+ <modules>
+ <module>extra</module>
+ <module>basedriver</module>
+ <module>tester</module>
+ <module>samples</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
diff --git a/upnp/samples/pom.xml b/upnp/samples/pom.xml
new file mode 100644
index 0000000..42c23a5
--- /dev/null
+++ b/upnp/samples/pom.xml
@@ -0,0 +1,30 @@
+<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <name>Apache Felix UPnP Examples: Build</name>
+ <artifactId>upnp.examples.build</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+
+ <profiles>
+ <profile>
+ <id>packaging-bundle</id>
+ <activation>
+ <property>
+ <name>packaging</name>
+ <value>bundle</value>
+ </property>
+ </activation>
+ <modules>
+ <module>binarylight</module>
+ <module>clock</module>
+ <module>tv</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>