Author: lenzi
Date: Thu Aug 23 15:05:21 2007
New Revision: 569167
URL: http://svn.apache.org/viewvc?rev=569167&view=rev
Log:
UPnP Base Driver now depends on the version 1.8.0-SNAPSHOT of the
CyberLink UPnP Stack
All the UPnP projects moved to the maven-bundle-plugin
Removed:
felix/trunk/upnp.basedriver/src/main/resources/debug/
felix/trunk/upnp.basedriver/src/main/resources/release/
Modified:
felix/trunk/pom/pom.xml
felix/trunk/upnp.basedriver/pom.xml
felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java
felix/trunk/upnp.extra/pom.xml
felix/trunk/upnp.sample.binaryLight/pom.xml
felix/trunk/upnp.sample.clock/pom.xml
felix/trunk/upnp.sample.tv/pom.xml
felix/trunk/upnp.tester/pom.xml
Modified: felix/trunk/pom/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/pom/pom.xml?rev=569167&r1=569166&r2=569167&view=diff
==============================================================================
--- felix/trunk/pom/pom.xml (original)
+++ felix/trunk/pom/pom.xml Thu Aug 23 15:05:21 2007
@@ -127,6 +127,12 @@
</property>
</activation>
<modules>
+ <module>../upnp.extra</module>
+ <module>../upnp.basedriver</module>
+ <module>../upnp.tester</module>
+ <module>../upnp.sample.tv</module>
+ <module>../upnp.sample.clock</module>
+ <module>../upnp.sample.binaryLight</module>
<module>../org.osgi.foundation</module>
<module>../javax.servlet</module>
<module>../org.osgi.core</module>
@@ -168,13 +174,6 @@
</activation>
<modules>
<module>../org.apache.felix.daemon</module>
-
- <module>../upnp.extra</module>
- <module>../upnp.basedriver</module>
- <module>../upnp.tester</module>
- <module>../upnp.sample.tv</module>
- <module>../upnp.sample.clock</module>
- <module>../upnp.sample.binaryLight</module>
<!-- <module>tools/mangen</module> -->
Modified: felix/trunk/upnp.basedriver/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/upnp.basedriver/pom.xml?rev=569167&r1=569166&r2=569167&view=diff
==============================================================================
--- felix/trunk/upnp.basedriver/pom.xml (original)
+++ felix/trunk/upnp.basedriver/pom.xml Thu Aug 23 15:05:21 2007
@@ -7,17 +7,17 @@
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<groupId>org.apache.felix</groupId>
<name>Apache Felix UPnP Base Driver</name>
<artifactId>org.apache.felix.upnp.basedriver</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
<repositories>
<!-- For snapshots (no release jars or non-apache jars) -->
<repository>
- <id>domoware.isti.cnr.it</id>
- <name>DomoWare Repository for Missing Artifacts</name>
- <url>http://domoware.isti.cnr.it/maven2</url>
+ <id>cgupnpjava.sourceforge.net</id>
+ <name>CyberLink for Java repository</name>
+ <url>http://cgupnpjava.sourceforge.net/snapshots-repository/</url>
</repository>
</repositories> <!-- <url>http://maven.apache.org</url> -->
<dependencies>
@@ -40,38 +40,38 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org-cybergarage</groupId>
- <artifactId>cyberlink-upnp-patched</artifactId>
- <version>1.7.2</version>
- <scope>provided</scope>
+ <groupId>org.cybergarage.cyberlink</groupId>
+ <artifactId>upnp-stack</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>UPnPBaseDriver</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleVersion>0.1.0</bundleVersion>
- <bundleDescription>
+ <instructions>
+ <Bundle-Name>${pom.name}</Bundle-Name>
+
<Bundle-Activator>org.apache.felix.upnp.basedriver.Activator</Bundle-Activator>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Version>0.2.0</Bundle-Version>
+ <Bundle-Author><![CDATA[Matteo Demuru <[EMAIL
PROTECTED]>,Francesco Furfari <[EMAIL PROTECTED]>,Stefano "Kismet" Lenzi
<[EMAIL PROTECTED]>]]></Bundle-Author>
+ <Bundle-Description>
A Bundle implementation of the UPnP Service
Specification R4
- </bundleDescription>
-
<bundleSymbolicName>org.apache.felix.upnp.basedriver</bundleSymbolicName>
-
<bundleActivator>org.apache.felix.upnp.basedriver.Activator</bundleActivator>
- </osgiManifest>
-
<manifestFile>src/main/resources/release/META-INF/Manifest.mf</manifestFile>
+ </Bundle-Description>
+
<Bundle-SymbolicName>org.apache.felix.upnp.basedriver</Bundle-SymbolicName>
+ <Export-Package>org.cybergarage.upnp</Export-Package>
+ <Import-Package>
+ org.apache.felix.upnp.extra.*, org.xml.sax.*, org.osgi.*,
javax.*, org.w3c.*,
+ !org.apache.xerces.*, !org.kxml2.io, !org.xmlpull.v1
+ </Import-Package>
+
<Private-Package>org.apache.felix.upnp.basedriver.*,org.cybergarage.*</Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources/release</directory>
- </resource>
- </resources>
</build>
</project>
Modified:
felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java?rev=569167&r1=569166&r2=569167&view=diff
==============================================================================
---
felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
(original)
+++
felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
Thu Aug 23 15:05:21 2007
@@ -76,6 +76,8 @@
Activator.logger.setCyberDebug(cyberLog);
UPnP.setXMLParser(new JaxpParser());
+ UPnP.setEnable(UPnP.USE_ONLY_IPV4_ADDR);
+ UPnP.setDisable(UPnP.USE_LOOPBACK_ADDR);
//Setting up Base Driver Exporter
this.queue = new RootDeviceExportingQueue();
Modified:
felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java
URL:
http://svn.apache.org/viewvc/felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java?rev=569167&r1=569166&r2=569167&view=diff
==============================================================================
---
felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java
(original)
+++
felix/trunk/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java
Thu Aug 23 15:05:21 2007
@@ -28,6 +28,7 @@
import org.cybergarage.upnp.Device;
import org.cybergarage.upnp.Service;
import org.cybergarage.upnp.StateVariable;
+import org.cybergarage.upnp.RootDescription;
import org.cybergarage.upnp.xml.DeviceData;
import org.cybergarage.xml.Node;
@@ -37,8 +38,6 @@
import org.osgi.service.upnp.UPnPDevice;
import org.osgi.service.upnp.UPnPService;
import org.osgi.service.upnp.UPnPStateVariable;
-
-import org.ungoverned.device.RootDescription;
import org.apache.felix.upnp.basedriver.Activator;
import org.apache.felix.upnp.extra.util.Converter;
Modified: felix/trunk/upnp.extra/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/upnp.extra/pom.xml?rev=569167&r1=569166&r2=569167&view=diff
==============================================================================
--- felix/trunk/upnp.extra/pom.xml (original)
+++ felix/trunk/upnp.extra/pom.xml Thu Aug 23 15:05:21 2007
@@ -7,11 +7,11 @@
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<groupId>org.apache.felix</groupId>
<name>Apache Felix UPnP Extra </name>
<artifactId>org.apache.felix.upnp.extra</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
<!-- <url>http://maven.apache.org</url> -->
<dependencies>
<dependency>
@@ -24,23 +24,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>UPnPExtra</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleVersion>0.1.0</bundleVersion>
- <bundleDescription>
+ <instructions>
+ <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Version>0.2.0</Bundle-Version>
+ <Bundle-Author><![CDATA[Matteo Demuru <[EMAIL
PROTECTED]>,Francesco Furfari <[EMAIL PROTECTED]>,Stefano "Kismet" Lenzi
<[EMAIL PROTECTED]>]]></Bundle-Author>
+ <Bundle-Description>
A library used to extend the integration between UPnP
and OSGi that is not part of the standard. Also services that allow to change
the beahviour of the UPnP Base Driver
- </bundleDescription>
-
<bundleSymbolicName>org.apache.felix.upnp.extra</bundleSymbolicName>
- <exportPackage>
-
org.apache.felix.upnp.extra.util;specification-version=1.0,org.apache.felix.upnp.extra.controller;specification-version=1.0
- </exportPackage>
- </osgiManifest>
+ </Bundle-Description>
+
<Bundle-SymbolicName>org.apache.felix.upnp.extra</Bundle-SymbolicName>
+ <Export-Package>org.apache.felix.upnp.extra.*</Export-Package>
+ <Private-Package>org.apache.xerces.impl.dv.util</Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/upnp.sample.binaryLight/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/upnp.sample.binaryLight/pom.xml?rev=569167&r1=569166&r2=569167&view=diff
==============================================================================
--- felix/trunk/upnp.sample.binaryLight/pom.xml (original)
+++ felix/trunk/upnp.sample.binaryLight/pom.xml Thu Aug 23 15:05:21 2007
@@ -7,11 +7,11 @@
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<groupId>org.apache.felix</groupId>
<name>Apache Felix UPnP Sample Binary-Light</name>
<artifactId>org.apache.felix.upnp.sample.binaryLight</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
<!-- <url>http://maven.apache.org</url> -->
<dependencies>
<dependency>
@@ -36,29 +36,26 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>UPnPBinaryLight</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleVersion>0.1.0</bundleVersion>
- <bundleDescription>
+ <instructions>
+ <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Version>0.2.0</Bundle-Version>
+ <Bundle-Author><![CDATA[Matteo Demuru <[EMAIL
PROTECTED]>,Francesco Furfari <[EMAIL PROTECTED]>,Stefano "Kismet" Lenzi
<[EMAIL PROTECTED]>]]></Bundle-Author>
+ <Bundle-Description>
Standardized BinaryLight DCPs to test UPnP Base Driver
- </bundleDescription>
-
<bundleSymbolicName>org.apache.felix.upnp.sample.binaryLight</bundleSymbolicName>
-
<bundleActivator>org.apache.felix.upnp.sample.binaryLight.Activator</bundleActivator>
- </osgiManifest>
- <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
+ </Bundle-Description>
+
<Bundle-SymbolicName>org.apache.felix.upnp.sample.binaryLight</Bundle-SymbolicName>
+
<Bundle-Activator>org.apache.felix.upnp.sample.binaryLight.Activator</Bundle-Activator>
+
<Private-Package>org.apache.felix.upnp.sample.binaryLight.*</Private-Package>
+ <Import-Package>*</Import-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
</build>
</project>
Modified: felix/trunk/upnp.sample.clock/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/upnp.sample.clock/pom.xml?rev=569167&r1=569166&r2=569167&view=diff
==============================================================================
--- felix/trunk/upnp.sample.clock/pom.xml (original)
+++ felix/trunk/upnp.sample.clock/pom.xml Thu Aug 23 15:05:21 2007
@@ -7,11 +7,11 @@
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<groupId>org.apache.felix</groupId>
<name>Apache Felix UPnP Sample Clock</name>
<artifactId>org.apache.felix.upnp.sample.clock</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
<!-- <url>http://maven.apache.org</url> -->
<dependencies>
<dependency>
@@ -30,29 +30,26 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>UPnPClock</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleVersion>0.1.0</bundleVersion>
- <bundleDescription>
+ <instructions>
+ <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Version>0.2.0</Bundle-Version>
+ <Bundle-Author><![CDATA[Matteo Demuru <[EMAIL
PROTECTED]>,Francesco Furfari <[EMAIL PROTECTED]>,Stefano "Kismet" Lenzi
<[EMAIL PROTECTED]>]]></Bundle-Author>
+ <Bundle-Description>
CyberLink Clock clone to test UPnPBase driver
- </bundleDescription>
-
<bundleSymbolicName>org.apache.felix.upnp.sample.clock</bundleSymbolicName>
-
<bundleActivator>org.apache.felix.upnp.sample.clock.Activator</bundleActivator>
- </osgiManifest>
- <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
+ </Bundle-Description>
+
<Bundle-SymbolicName>org.apache.felix.upnp.sample.clock</Bundle-SymbolicName>
+
<Bundle-Activator>org.apache.felix.upnp.sample.clock.Activator</Bundle-Activator>
+
<Private-Package>org.apache.felix.upnp.sample.clock.*</Private-Package>
+ <Import-Package>*</Import-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
</build>
</project>
Modified: felix/trunk/upnp.sample.tv/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/upnp.sample.tv/pom.xml?rev=569167&r1=569166&r2=569167&view=diff
==============================================================================
--- felix/trunk/upnp.sample.tv/pom.xml (original)
+++ felix/trunk/upnp.sample.tv/pom.xml Thu Aug 23 15:05:21 2007
@@ -7,11 +7,11 @@
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<groupId>org.apache.felix</groupId>
<name>Apache Felix UPnP Sample TV</name>
<artifactId>org.apache.felix.upnp.sample.tv</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
<!-- <url>http://maven.apache.org</url> -->
<dependencies>
<dependency>
@@ -30,29 +30,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>UPnPTV</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleVersion>0.1.0</bundleVersion>
- <bundleDescription>
+ <instructions>
+ <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Author><![CDATA[Matteo Demuru <[EMAIL
PROTECTED]>,Francesco Furfari <[EMAIL PROTECTED]>,Stefano "Kismet" Lenzi
<[EMAIL PROTECTED]>]]></Bundle-Author>
+ <Bundle-Description>
CyberLink Tv clone to test UPnPBase driver
- </bundleDescription>
-
<bundleSymbolicName>org.apache.felix.upnp.sample.tv</bundleSymbolicName>
-
<bundleActivator>org.apache.felix.upnp.sample.tv.Activator</bundleActivator>
- </osgiManifest>
- <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
+ </Bundle-Description>
+
<Bundle-SymbolicName>org.apache.felix.upnp.sample.tv</Bundle-SymbolicName>
+
<Bundle-Activator>org.apache.felix.upnp.sample.tv.Activator</Bundle-Activator>
+
<Private-Package>org.apache.felix.upnp.sample.tv.*</Private-Package>
+ <Import-Package>*</Import-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
</build>
</project>
Modified: felix/trunk/upnp.tester/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/upnp.tester/pom.xml?rev=569167&r1=569166&r2=569167&view=diff
==============================================================================
--- felix/trunk/upnp.tester/pom.xml (original)
+++ felix/trunk/upnp.tester/pom.xml Thu Aug 23 15:05:21 2007
@@ -7,11 +7,11 @@
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<groupId>org.apache.felix</groupId>
<name>Apache Felix UPnP Tester</name>
<artifactId>org.apache.felix.upnp.tester</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
<!-- <url>http://maven.apache.org</url> -->
<dependencies>
<dependency>
@@ -36,29 +36,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>UPnPTester</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleVersion>0.1.0</bundleVersion>
- <bundleDescription>
+ <instructions>
+ <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Author><![CDATA[Matteo Demuru <[EMAIL
PROTECTED]>,Francesco Furfari <[EMAIL PROTECTED]>,Stefano "Kismet" Lenzi
<[EMAIL PROTECTED]>]]></Bundle-Author>
+ <Bundle-Description>
OSGi Generic Control Point to control UPnPDevice
services
- </bundleDescription>
-
<bundleSymbolicName>org.apache.felix.upnp.tester</bundleSymbolicName>
-
<bundleActivator>org.apache.felix.upnp.tester.Activator</bundleActivator>
- </osgiManifest>
- <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
+ </Bundle-Description>
+
<Bundle-SymbolicName>org.apache.felix.upnp.tester</Bundle-SymbolicName>
+
<Bundle-Activator>org.apache.felix.upnp.tester.Activator</Bundle-Activator>
+ <Private-Package>org.apache.felix.upnp.tester.*</Private-Package>
+ <Import-Package>*</Import-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
</build>
</project>
