Created a new patch for Cyberlink library in order to handle UPnP Invalid_Args Exception (Felix-67).
The method setArgumentValues() in Action class should be deprecated. The new methods setInArgumentValues and setOutArgumentValues have been added.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@425375 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.upnp.basedriver/pom.xml b/org.apache.felix.upnp.basedriver/pom.xml
index b50771d..dc236a5 100644
--- a/org.apache.felix.upnp.basedriver/pom.xml
+++ b/org.apache.felix.upnp.basedriver/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org-cybergarage</groupId>
<artifactId>cyberlink-upnp-patched</artifactId>
- <version>1.7.0</version>
+ <version>1.7.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -61,7 +61,6 @@
A Bundle implementation of the UPnP Service Specification R4 (not yet)
</bundleDescription>
<bundleSymbolicName>org.apache.felix.upnp.basedriver</bundleSymbolicName>
- <!-- <bundleClassPath>.,lib/cyberlink-1.7-patched-release.jar</bundleClassPath> -->
<bundleActivator>org.apache.felix.upnp.basedriver.Activator</bundleActivator>
<importPackage>
org.w3c.dom,javax.xml.parsers,org.xml.sax,org.osgi.framework;specification-version=1.3,org.osgi.service.device;specification-version=1.1,org.osgi.service.upnp;specification-version=1.1,org.osgi.service.log;specification-version=1.3,org.apache.felix.upnp.extra.util;specification-version=1.0,org.apache.felix.upnp.extra.controller;specification-version=1.0
diff --git a/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java b/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java
index d912068..da6702a 100644
--- a/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java
+++ b/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java
@@ -143,7 +143,7 @@
//setting the value related to the input argument
argument.setValue(Converter.toString(args.get(argumentName),upnpType));
}
- act.setArgumentValues(argsList);
+ act.setInArgumentValues(argsList);
if(act.postControlAction()==true){
//TODO check what happen if I don't have any output argument
Properties outDic=new Properties();
diff --git a/org.apache.felix.upnp.basedriver/src/main/resources/debug/META-INF/Manifest.mf b/org.apache.felix.upnp.basedriver/src/main/resources/debug/META-INF/Manifest.mf
index 431b030..c8f5d4e 100644
--- a/org.apache.felix.upnp.basedriver/src/main/resources/debug/META-INF/Manifest.mf
+++ b/org.apache.felix.upnp.basedriver/src/main/resources/debug/META-INF/Manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Bundle-ClassPath: .,lib/cyberlink-1.7-patched-debug.jar
+Bundle-ClassPath: .,lib/cyberlink-1.7.1-patched-debug.jar
Bundle-Author: Matteo Demuru <matte-d@users.sourceforge.net>,Stefano "
Kismet" Lenzi <kismet-sl@users.sourceforge.net>,Francesco Furfari <fr
ancesco.furfari@isti.cnr.it>,Satoshi Konno
diff --git a/org.apache.felix.upnp.basedriver/src/main/resources/debug/lib/cyberlink-1.7.1-patched-debug.jar b/org.apache.felix.upnp.basedriver/src/main/resources/debug/lib/cyberlink-1.7.1-patched-debug.jar
new file mode 100644
index 0000000..ea2b5c0
--- /dev/null
+++ b/org.apache.felix.upnp.basedriver/src/main/resources/debug/lib/cyberlink-1.7.1-patched-debug.jar
Binary files differ
diff --git a/org.apache.felix.upnp.basedriver/src/main/resources/release/META-INF/Manifest.mf b/org.apache.felix.upnp.basedriver/src/main/resources/release/META-INF/Manifest.mf
index b037441..5ea2cd9 100644
--- a/org.apache.felix.upnp.basedriver/src/main/resources/release/META-INF/Manifest.mf
+++ b/org.apache.felix.upnp.basedriver/src/main/resources/release/META-INF/Manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Bundle-ClassPath: .,lib/cyberlink-1.7-patched-release.jar
+Bundle-ClassPath: .,lib/cyberlink-1.7.1-patched-release.jar
Bundle-Author: Matteo Demuru <matte-d@users.sourceforge.net>,Stefano "
Kismet" Lenzi <kismet-sl@users.sourceforge.net>,Francesco Furfari <fr
ancesco.furfari@isti.cnr.it>,Satoshi Konno
diff --git a/org.apache.felix.upnp.basedriver/src/main/resources/release/lib/cyberlink-1.7.1-patched-release.jar b/org.apache.felix.upnp.basedriver/src/main/resources/release/lib/cyberlink-1.7.1-patched-release.jar
new file mode 100644
index 0000000..3dc55ea
--- /dev/null
+++ b/org.apache.felix.upnp.basedriver/src/main/resources/release/lib/cyberlink-1.7.1-patched-release.jar
Binary files differ