Improved loading of properties in Activator.doInitProperties, now it loads properties from BundleContext
Fixed compilation and run-time issue with JDK13 profile
Almost resolved split-package issue: moved README and upnp.properties
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@609743 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/upnp/basedriver/pom.xml b/upnp/basedriver/pom.xml
index 8233e71..d7ed87d 100644
--- a/upnp/basedriver/pom.xml
+++ b/upnp/basedriver/pom.xml
@@ -99,15 +99,15 @@
<!--Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive-->
<Export-Package>
- org.apache.felix.upnp.basedriver.controller.*,
- org.apache.felix.upnp.basedriver.util.*,
- org.apache.xerces.impl.dv.util.*
+ org.apache.felix.upnp.basedriver.controller;version=0.1,
+ org.apache.felix.upnp.basedriver.util;version=0.3
</Export-Package>
<Import-Package>org.osgi.*</Import-Package>
<Private-Package>
org.apache.felix.upnp.basedriver.*, org.kxml2.io,
- org.xmlpull.v1, org.cybergarage.*
+ org.xmlpull.v1, org.cybergarage.*,
+ org.apache.xerces.impl.dv.util
</Private-Package>
</instructions>
</configuration>
@@ -155,17 +155,22 @@
org.apache.felix.upnp.basedriver
</Bundle-SymbolicName>
<Export-Package>
- org.apache.felix.upnp.basedriver.controller.*,
- org.apache.felix.upnp.basedriver.util.*,
- org.apache.xerces.impl.dv.util.*
+ org.apache.felix.upnp.basedriver.controller;version=0.1.0,
+ org.apache.felix.upnp.basedriver.util;version=0.3.0
+ org.apache.felix.upnp.basedriver.resources;version=0.3.0
</Export-Package>
<Import-Package>
org.osgi.*, javax.xml.parsers, org.w3c.dom,
org.xml.sax
</Import-Package>
<Private-Package>
- org.apache.felix.upnp.basedriver.*,
- org.cybergarage.*
+ org.apache.felix.upnp.basedriver.controller.impl,
+ org.apache.felix.upnp.basedriver.importer.*,
+ org.apache.felix.upnp.basedriver.export.*,
+ org.apache.felix.upnp.basedriver.tool,
+ org.apache.felix.upnp.basedriver,
+ org.cybergarage.*,
+ org.apache.xerces.impl.dv.util
</Private-Package>
</instructions>
</configuration>