Return-Path: 
 <commits-return-3313-apmail-felix-commits-archive=felix.apache.org@felix.apache.org>
Delivered-To: apmail-felix-commits-archive@www.apache.org
Received: (qmail 8240 invoked from network); 20 Feb 2008 22:12:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 20 Feb 2008 22:12:46 -0000
Received: (qmail 17596 invoked by uid 500); 20 Feb 2008 22:12:41 -0000
Delivered-To: apmail-felix-commits-archive@felix.apache.org
Received: (qmail 17533 invoked by uid 500); 20 Feb 2008 22:12:41 -0000
Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@felix.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@felix.apache.org>
List-Post: <mailto:commits@felix.apache.org>
List-Id: <commits.felix.apache.org>
Reply-To: dev@felix.apache.org
Delivered-To: mailing list commits@felix.apache.org
Received: (qmail 17522 invoked by uid 99); 20 Feb 2008 22:12:41 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Feb 2008 14:12:41 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Feb 2008 22:12:07 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 02CF51A9832; Wed, 20 Feb 2008 14:12:13 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r629633 - in /felix/trunk/upnp/basedriver: ./
 src/main/java/org/apache/felix/upnp/basedriver/export/
 src/main/java/org/apache/felix/upnp/basedriver/tool/
Date: Wed, 20 Feb 2008 22:12:13 -0000
To: commits@felix.apache.org
From: lenzi@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080220221214.02CF51A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: lenzi
Date: Wed Feb 20 14:12:06 2008
New Revision: 629633

URL: http://svn.apache.org/viewvc?rev=629633&view=rev
Log:
FELIX-495: Applied a slighty modified version of the POM provided by Stuart
FELIX-494: Applied split-package patch but we'll refactor the code in order to avoid its use
FELIX-488: org.osgi.compendium modified so reverting the import for org.osgi.service.upnp package

Modified:
    felix/trunk/upnp/basedriver/pom.xml
    felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java
    felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java
    felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java

Modified: felix/trunk/upnp/basedriver/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/pom.xml?rev=629633&r1=629632&r2=629633&view=diff
==============================================================================
--- felix/trunk/upnp/basedriver/pom.xml (original)
+++ felix/trunk/upnp/basedriver/pom.xml Wed Feb 20 14:12:06 2008
@@ -16,6 +16,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
+
 <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">
@@ -53,134 +54,79 @@
   </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>
-            <extensions>true</extensions>
-            <configuration>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.3.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.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.*;-split-package:=merge-first,
+              org.cybergarage.*,
+              org.apache.xerces.impl.dv.util
+            </Private-Package>
+          </instructions>
+	  <excludeDependencies>upnp-stack-jdk13</excludeDependencies>
+        </configuration>
+	<executions>
+	  <execution>
+	    <id>jdk13</id>
+	    <goals><goal>bundle</goal></goals>
+	    <configuration>
+	      <classifier>jdk13</classifier>
+              <!--manifestLocation>${project.build.outputDirectory}/META-INF-jdk13</manifestLocation-->
+              <excludeDependencies>upnp-stack</excludeDependencies>
               <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.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,
-                  org.osgi.service.upnp;version=1.1.0
-                </Export-Package>
-                <Import-Package>org.osgi.framework, org.osgi.service.log</Import-Package>
-                <Private-Package>
-                  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.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.2.1</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>
+                <!--additionalPrivatePkgs>org.kxml2.io,org.xmlpull.v1</additionalPrivatePkgs-->
                 <Export-Package>
                   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
+                  org.osgi.*
                 </Import-Package>
                 <Private-Package>
-                  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.apache.felix.upnp.basedriver.*;-split-package:=merge-first,
                   org.cybergarage.*,
+		  org.kxml2.io, org.xmlpull.v1,
                   org.apache.xerces.impl.dv.util
                 </Private-Package>
               </instructions>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+	    </configuration>
+	  </execution>
+	</executions>
+      </plugin>      
+    </plugins>
+  </build>
 
 
   <dependencies>
@@ -194,6 +140,18 @@
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
       <version>1.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>it.cnr.isti.domoware.cyberdomo</groupId>
+      <artifactId>upnp-stack</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>it.cnr.isti.domoware.cyberdomo</groupId>
+      <artifactId>upnp-stack-jdk13</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 </project>

Modified: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java?rev=629633&r1=629632&r2=629633&view=diff
==============================================================================
--- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java (original)
+++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java Wed Feb 20 14:12:06 2008
@@ -24,15 +24,12 @@
 import java.util.Dictionary;
 import java.util.Enumeration;
 
+import org.apache.felix.upnp.basedriver.Activator;
+import org.apache.felix.upnp.basedriver.util.Converter;
 import org.cybergarage.upnp.Device;
 import org.cybergarage.upnp.Service;
 import org.cybergarage.upnp.StateVariable;
-
 import org.osgi.service.upnp.UPnPEventListener;
-import org.osgi.service.upnp.UPnPStateVariable;
-
-import org.apache.felix.upnp.basedriver.Activator;
-import org.apache.felix.upnp.basedriver.util.Converter;
 
 /* 
 * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>

Modified: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java?rev=629633&r1=629632&r2=629633&view=diff
==============================================================================
--- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java (original)
+++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java Wed Feb 20 14:12:06 2008
@@ -26,11 +26,10 @@
 import java.util.Properties;
 import java.util.Vector;
 
+import org.apache.felix.upnp.basedriver.Activator;
 import org.cybergarage.upnp.Device;
 import org.cybergarage.upnp.DeviceList;
 import org.cybergarage.upnp.ServiceList;
-import org.cybergarage.upnp.UPnP;
-
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Filter;
@@ -41,8 +40,6 @@
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.upnp.UPnPDevice;
 import org.osgi.service.upnp.UPnPEventListener;
-
-import org.apache.felix.upnp.basedriver.Activator;
 
 /* 
 * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>

Modified: felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java?rev=629633&r1=629632&r2=629633&view=diff
==============================================================================
--- felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java (original)
+++ felix/trunk/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java Wed Feb 20 14:12:06 2008
@@ -21,16 +21,14 @@
 
 import java.io.PrintStream;
 
+import org.apache.felix.upnp.basedriver.Activator;
 import org.cybergarage.util.Debug;
-
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogService;
-
-import org.apache.felix.upnp.basedriver.Activator;
 
 /* 
 * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>