Removed bundle dependencies between basedriver and extra
Created a profile two profile:
default for JDK1.4 and above
platform=jdk13 for JDK1.3
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@605617 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/upnp/basedriver/pom.xml b/upnp/basedriver/pom.xml
index 2358800..c7a5fd5 100644
--- a/upnp/basedriver/pom.xml
+++ b/upnp/basedriver/pom.xml
@@ -1,83 +1,150 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <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>bundle</packaging>
- <groupId>org.apache.felix</groupId>
- <name>Apache Felix UPnP Base Driver</name>
- <artifactId>org.apache.felix.upnp.basedriver</artifactId>
- <version>0.2.0-SNAPSHOT</version>
- <repositories>
- <!-- For snapshots (no release jars or non-apache jars) -->
- <repository>
- <id>snapshot.cgupnpjava.sourceforge.net</id>
- <name>CyberLink for Java repository</name>
- <url>http://cgupnpjava.sourceforge.net/snapshots-repository/</url>
- <releases><enabled>false</enabled></releases>
- </repository>
- <repository>
- <id>cgupnpjava.sourceforge.net</id>
- <name>CyberLink for Java repository</name>
- <url>http://cgupnpjava.sourceforge.net/repository/</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- </repositories> <!-- <url>http://maven.apache.org</url> -->
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.upnp.extra</artifactId>
- <version>0.2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.cybergarage.cyberlink</groupId>
- <artifactId>upnp-stack</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <configuration>
- <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-Author><![CDATA[Matteo Demuru <demuru@apache.org>,Francesco Furfari <furfari@apache.org>,Stefano "Kismet" Lenzi <lenzi@apache.org>]]></Bundle-Author>
- <Bundle-Description>
- A Bundle implementation of the UPnP Service Specification R4
- </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>
- </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <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>bundle</packaging>
+ <groupId>org.apache.felix</groupId>
+ <name>Apache Felix UPnP Base Driver</name>
+ <artifactId>org.apache.felix.upnp.basedriver</artifactId>
+ <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</name>
+ <url>http://domoware.isti.cnr.it/maven2</url>
+ <releases><enabled>false</enabled></releases>
+ </repository>
+ <repository>
+ <id>domoware.isti.cnr.it</id>
+ <name>Domoware Snapshot Repository</name>
+ <url>http://domoware.isti.cnr.it/maven2-snap</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ </repository>
+ </repositories> <!-- <url>http://maven.apache.org</url> -->
+
+ <profiles>
+
+ <profile>
+ <id>jdk13</id>
+ <activation>
+ <property>
+ <name>platform</name>
+ <value>jdk13</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>it.cnr.isti.domoware.cyberdomo</groupId>
+ <artifactId>upnp-stack-jdk13</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <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-Author><![CDATA[Matteo Demuru <demuru@apache.org>,Francesco Furfari <furfari@apache.org>,Stefano "Kismet" Lenzi <lenzi@apache.org>]]></Bundle-Author>
+ <Bundle-Description>
+ A Bundle implementation of the UPnP Service Specification R4
+ </Bundle-Description>
+ <Bundle-SymbolicName>org.apache.felix.upnp.basedriver</Bundle-SymbolicName>
+ <!--Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive-->
+ <Export-Package>
+ org.apache.felix.upnp.extra.*
+ </Export-Package>
+ <Import-Package>
+ org.osgi.*
+ </Import-Package>
+ <Private-Package>
+ org.apache.felix.upnp.basedriver.*, org.kxml2.io, org.xmlpull.v1, org.cybergarage.*, org.apache.xerces.impl.dv.util
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jdk14-or-above</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>it.cnr.isti.domoware.cyberdomo</groupId>
+ <artifactId>upnp-stack</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <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-Author><![CDATA[Matteo Demuru <demuru@apache.org>,Francesco Furfari <furfari@apache.org>,Stefano "Kismet" Lenzi <lenzi@apache.org>]]></Bundle-Author>
+ <Bundle-Description>
+ A Bundle implementation of the UPnP Service Specification R4
+ </Bundle-Description>
+ <Bundle-SymbolicName>org.apache.felix.upnp.basedriver</Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.felix.upnp.extra.*
+ </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.xerces.impl.dv.util
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ </profiles>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.upnp.extra</artifactId>
+ <version>0.2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
index e37d516..2d1685e 100644
--- a/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
+++ b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
@@ -75,7 +75,6 @@
String cyberLog = (String) Util.getPropertyDefault(context,"felix.upnpbase.cyberlink.log","false");
Activator.logger.setCyberDebug(cyberLog);
- UPnP.setXMLParser(new JaxpParser());
UPnP.setEnable(UPnP.USE_ONLY_IPV4_ADDR);
UPnP.setDisable(UPnP.USE_LOOPBACK_ADDR);