commit 7830f6dd92cb2cd64f146796a80f4b2eb216273c
author Stefano Lenzi <lenzi@apache.org> Sat Aug 25 23:50:23 2007 +0000
committer Stefano Lenzi <lenzi@apache.org> Sat Aug 25 23:50:23 2007 +0000
tree 73bbc2c60a697e826d86fbf5d5a37e9a4433af3e
parent 1e50466be85cfd0065738ca9d2675aac7e9e336e

Removed useless prefix from all the project related to UPnP


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@569746 13f79535-47bb-0310-9956-ffa450edef68

pom/pom.xml

diff --git a/pom/pom.xml b/pom/pom.xml
index 6972d67..7c88fd0 100644
--- a/pom/pom.xml
+++ b/pom/pom.xml
@@ -127,12 +127,12 @@
         </property>
       </activation>
       <modules>
-        <module>../upnp/upnp.extra</module>
-        <module>../upnp/upnp.basedriver</module>
-        <module>../upnp/upnp.tester</module>
-        <module>../upnp/samples/upnp.sample.tv</module>
-        <module>../upnp/samples/upnp.sample.clock</module>
-        <module>../upnp/samples/upnp.sample.binaryLight</module>
+        <module>../upnp/extra</module>
+        <module>../upnp/basedriver</module>
+        <module>../upnp/tester</module>
+        <module>../upnp/samples/tv</module>
+        <module>../upnp/samples/clock</module>
+        <module>../upnp/samples/binarylight</module>
         <module>../org.osgi.foundation</module>
         <module>../javax.servlet</module>
         <module>../org.osgi.core</module>

upnp/basedriver/pom.xml

diff --git a/upnp/upnp.basedriver/pom.xml b/upnp/basedriver/pom.xml
similarity index 100%
rename from upnp/upnp.basedriver/pom.xml
rename to upnp/basedriver/pom.xml

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java

diff --git a/upnp/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
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/controller/impl/DriverControllerImpl.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ActionDispatcher.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ActionDispatcher.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ActionDispatcher.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ActionDispatcher.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ActionDispatcher.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/BuildDevice.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/DeviceNode.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/DeviceNode.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/DeviceNode.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/DeviceNode.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/DeviceNode.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ExporterUPnPEventListener.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceExportingQueue.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceExportingQueue.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceExportingQueue.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceExportingQueue.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceExportingQueue.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceListener.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceListener.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceListener.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceListener.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/RootDeviceListener.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/ThreadExporter.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/MyCtrlPoint.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/OSGiDeviceInfo.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/OSGiDeviceInfo.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/OSGiDeviceInfo.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/OSGiDeviceInfo.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/OSGiDeviceInfo.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/FirstMessage.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/FirstMessage.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/FirstMessage.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/FirstMessage.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/FirstMessage.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerModified.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerModified.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerModified.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerModified.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerModified.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerUnRegistration.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerUnRegistration.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerUnRegistration.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerUnRegistration.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/ListenerUnRegistration.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/SidExipired.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/SidExipired.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/SidExipired.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/SidExipired.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/SidExipired.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/StateChanged.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/StateChanged.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/StateChanged.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/StateChanged.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/message/StateChanged.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Listener2Sids.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Listener2Sids.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Listener2Sids.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Listener2Sids.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Listener2Sids.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Monitor.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Monitor.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Monitor.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Monitor.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Monitor.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/NotifierQueue.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/NotifierQueue.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/NotifierQueue.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/NotifierQueue.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/NotifierQueue.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Sid2Listeners.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Sid2Listeners.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Sid2Listeners.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Sid2Listeners.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/Sid2Listeners.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidRenewer.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidRenewer.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidRenewer.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidRenewer.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidRenewer.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidsListenersMaps.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidsListenersMaps.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidsListenersMaps.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidsListenersMaps.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SidsListenersMaps.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/StateVarsToNotify.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/StateVarsToNotify.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/StateVarsToNotify.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/StateVarsToNotify.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/StateVarsToNotify.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SubscriptionQueue.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SubscriptionQueue.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SubscriptionQueue.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SubscriptionQueue.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/structs/SubscriptionQueue.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Notifier.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Notifier.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Notifier.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Notifier.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Notifier.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Renewer.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Renewer.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Renewer.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Renewer.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/Renewer.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/SubScriber.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/SubScriber.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/SubScriber.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/SubScriber.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/event/thread/SubScriber.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPDeviceImpl.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPDeviceImpl.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPDeviceImpl.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPDeviceImpl.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPDeviceImpl.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPIconImpl.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPIconImpl.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPIconImpl.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPIconImpl.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPIconImpl.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPServiceImpl.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPServiceImpl.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPServiceImpl.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPServiceImpl.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPServiceImpl.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPStateVariableImpl.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPStateVariableImpl.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPStateVariableImpl.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPStateVariableImpl.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPStateVariableImpl.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/DeviceSetup.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/DeviceSetup.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/DeviceSetup.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/DeviceSetup.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/DeviceSetup.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/HTTPRequestForIcon.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/HTTPRequestForIcon.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/HTTPRequestForIcon.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/HTTPRequestForIcon.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/HTTPRequestForIcon.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseLocation.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseLocation.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseLocation.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseLocation.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseLocation.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseUSN.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseUSN.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseUSN.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseUSN.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/util/ParseUSN.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Logger.java

upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Util.java

diff --git a/upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Util.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Util.java
similarity index 100%
rename from upnp/upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Util.java
rename to upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/tool/Util.java

upnp/doc/Readme.txt

diff --git a/upnp/upnp.doc/Readme.txt b/upnp/doc/Readme.txt
similarity index 100%
rename from upnp/upnp.doc/Readme.txt
rename to upnp/doc/Readme.txt

upnp/doc/config.properties.core

diff --git a/upnp/upnp.doc/config.properties.core b/upnp/doc/config.properties.core
similarity index 100%
rename from upnp/upnp.doc/config.properties.core
rename to upnp/doc/config.properties.core

upnp/doc/config.properties.jmxconsole

diff --git a/upnp/upnp.doc/config.properties.jmxconsole b/upnp/doc/config.properties.jmxconsole
similarity index 100%
rename from upnp/upnp.doc/config.properties.jmxconsole
rename to upnp/doc/config.properties.jmxconsole

upnp/doc/core.sh

diff --git a/upnp/upnp.doc/core.sh b/upnp/doc/core.sh
similarity index 100%
rename from upnp/upnp.doc/core.sh
rename to upnp/doc/core.sh

upnp/doc/core.sh.bat

diff --git a/upnp/doc/core.sh.bat b/upnp/doc/core.sh.bat
new file mode 100644
index 0000000..8ecd90c
--- /dev/null
+++ b/upnp/doc/core.sh.bat
@@ -0,0 +1,9 @@
+#!/bin/sh

+

+

+echo "cd into felix directory"

+cd ../../main

+

+echo "lauching felix with core gateway properties"

+java -Dfelix.config.properties=file:../upnp/doc/config.properties.core -jar bin/felix.jar

+

upnp/doc/jmxconsole.sh

diff --git a/upnp/upnp.doc/jmxconsole.sh b/upnp/doc/jmxconsole.sh
similarity index 100%
rename from upnp/upnp.doc/jmxconsole.sh
rename to upnp/doc/jmxconsole.sh

upnp/doc/jmxconsole.sh.bat

diff --git a/upnp/upnp.doc/jmxconsole.sh.bat b/upnp/doc/jmxconsole.sh.bat
similarity index 68%
rename from upnp/upnp.doc/jmxconsole.sh.bat
rename to upnp/doc/jmxconsole.sh.bat
index 8f8e2b7..44a2287 100644
--- a/upnp/upnp.doc/jmxconsole.sh.bat
+++ b/upnp/doc/jmxconsole.sh.bat
@@ -3,4 +3,4 @@
 cd ../../main

 

 echo "lauching felix with jmxconsole properties"

-java -Dfelix.config.properties=file:../upnp.doc/config.properties.jmxconsole -jar bin/felix.jar

+java -Dfelix.config.properties=file:../upnp/doc/config.properties.jmxconsole -jar bin/felix.jar

upnp/extra/pom.xml

diff --git a/upnp/upnp.extra/pom.xml b/upnp/extra/pom.xml
similarity index 100%
rename from upnp/upnp.extra/pom.xml
rename to upnp/extra/pom.xml

upnp/extra/src/main/java/org/apache/felix/upnp/extra/controller/DevicesInfo.java

diff --git a/upnp/upnp.extra/src/main/java/org/apache/felix/upnp/extra/controller/DevicesInfo.java b/upnp/extra/src/main/java/org/apache/felix/upnp/extra/controller/DevicesInfo.java
similarity index 100%
rename from upnp/upnp.extra/src/main/java/org/apache/felix/upnp/extra/controller/DevicesInfo.java
rename to upnp/extra/src/main/java/org/apache/felix/upnp/extra/controller/DevicesInfo.java

upnp/extra/src/main/java/org/apache/felix/upnp/extra/controller/DriverController.java

diff --git a/upnp/upnp.extra/src/main/java/org/apache/felix/upnp/extra/controller/DriverController.java b/upnp/extra/src/main/java/org/apache/felix/upnp/extra/controller/DriverController.java
similarity index 100%
rename from upnp/upnp.extra/src/main/java/org/apache/felix/upnp/extra/controller/DriverController.java
rename to upnp/extra/src/main/java/org/apache/felix/upnp/extra/controller/DriverController.java

upnp/extra/src/main/java/org/apache/felix/upnp/extra/util/Constants.java

diff --git a/upnp/upnp.extra/src/main/java/org/apache/felix/upnp/extra/util/Constants.java b/upnp/extra/src/main/java/org/apache/felix/upnp/extra/util/Constants.java
similarity index 100%
rename from upnp/upnp.extra/src/main/java/org/apache/felix/upnp/extra/util/Constants.java
rename to upnp/extra/src/main/java/org/apache/felix/upnp/extra/util/Constants.java

upnp/extra/src/main/java/org/apache/felix/upnp/extra/util/Converter.java

diff --git a/upnp/upnp.extra/src/main/java/org/apache/felix/upnp/extra/util/Converter.java b/upnp/extra/src/main/java/org/apache/felix/upnp/extra/util/Converter.java
similarity index 100%
rename from upnp/upnp.extra/src/main/java/org/apache/felix/upnp/extra/util/Converter.java
rename to upnp/extra/src/main/java/org/apache/felix/upnp/extra/util/Converter.java

upnp/extra/src/main/java/org/apache/xerces/impl/dv/util/Base64.java

diff --git a/upnp/upnp.extra/src/main/java/org/apache/xerces/impl/dv/util/Base64.java b/upnp/extra/src/main/java/org/apache/xerces/impl/dv/util/Base64.java
similarity index 100%
rename from upnp/upnp.extra/src/main/java/org/apache/xerces/impl/dv/util/Base64.java
rename to upnp/extra/src/main/java/org/apache/xerces/impl/dv/util/Base64.java

upnp/extra/src/main/java/org/apache/xerces/impl/dv/util/HexBin.java

diff --git a/upnp/upnp.extra/src/main/java/org/apache/xerces/impl/dv/util/HexBin.java b/upnp/extra/src/main/java/org/apache/xerces/impl/dv/util/HexBin.java
similarity index 100%
rename from upnp/upnp.extra/src/main/java/org/apache/xerces/impl/dv/util/HexBin.java
rename to upnp/extra/src/main/java/org/apache/xerces/impl/dv/util/HexBin.java

upnp/samples/binarylight/pom.xml

diff --git a/upnp/samples/upnp.sample.binaryLight/pom.xml b/upnp/samples/binarylight/pom.xml
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/pom.xml
rename to upnp/samples/binarylight/pom.xml

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/Activator.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/Activator.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/Activator.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/Activator.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/Activator.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/EventSource.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/EventSource.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/EventSource.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/EventSource.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/EventSource.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetStatusAction.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetStatusAction.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetStatusAction.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetStatusAction.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetStatusAction.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetTargetAction.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetTargetAction.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetTargetAction.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetTargetAction.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/GetTargetAction.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightDevice.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightDevice.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightDevice.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightDevice.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightDevice.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightIcon.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightIcon.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightIcon.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightIcon.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightIcon.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightModel.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightModel.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightModel.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightModel.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightModel.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightUI.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightUI.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightUI.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightUI.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/LightUI.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PowerSwitchService.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PowerSwitchService.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PowerSwitchService.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PowerSwitchService.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PowerSwitchService.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PresentationServlet.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PresentationServlet.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PresentationServlet.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PresentationServlet.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/PresentationServlet.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/SetTargetAction.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/SetTargetAction.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/SetTargetAction.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/SetTargetAction.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/SetTargetAction.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/StatusStateVariable.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/StatusStateVariable.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/StatusStateVariable.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/StatusStateVariable.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/StatusStateVariable.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/TargetStateVariable.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/TargetStateVariable.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/TargetStateVariable.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/TargetStateVariable.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/TargetStateVariable.java

upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/UPnPEventNotifier.java

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/UPnPEventNotifier.java b/upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/UPnPEventNotifier.java
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/java/org/apache/felix/upnp/sample/binaryLight/UPnPEventNotifier.java
rename to upnp/samples/binarylight/src/main/java/org/apache/felix/upnp/sample/binaryLight/UPnPEventNotifier.java

upnp/samples/binarylight/src/main/resources/META-INF/Manifest.mf

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/resources/META-INF/Manifest.mf b/upnp/samples/binarylight/src/main/resources/META-INF/Manifest.mf
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/resources/META-INF/Manifest.mf
rename to upnp/samples/binarylight/src/main/resources/META-INF/Manifest.mf

upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightFail.gif

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightFail.gif b/upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightFail.gif
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightFail.gif
rename to upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightFail.gif
Binary files differ

upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOff.gif

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOff.gif b/upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOff.gif
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOff.gif
rename to upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOff.gif
Binary files differ

upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOn.gif

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOn.gif b/upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOn.gif
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOn.gif
rename to upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/LightOn.gif
Binary files differ

upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/logo.gif

diff --git a/upnp/samples/upnp.sample.binaryLight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/logo.gif b/upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/logo.gif
similarity index 100%
rename from upnp/samples/upnp.sample.binaryLight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/logo.gif
rename to upnp/samples/binarylight/src/main/resources/org/apache/felix/upnp/sample/binaryLight/images/logo.gif
Binary files differ

upnp/samples/clock/pom.xml

diff --git a/upnp/samples/upnp.sample.clock/pom.xml b/upnp/samples/clock/pom.xml
similarity index 100%
rename from upnp/samples/upnp.sample.clock/pom.xml
rename to upnp/samples/clock/pom.xml

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/Activator.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Activator.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/Activator.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Activator.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/Activator.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/Clock.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Clock.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/Clock.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Clock.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/Clock.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockIcon.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockIcon.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockIcon.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockIcon.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockIcon.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockPane.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockPane.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockPane.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockPane.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockPane.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/EventSource.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/EventSource.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/EventSource.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/EventSource.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/EventSource.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/GetTimeAction.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/GetTimeAction.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/GetTimeAction.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/GetTimeAction.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/GetTimeAction.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ResultStateVariable.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ResultStateVariable.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ResultStateVariable.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ResultStateVariable.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ResultStateVariable.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/SetTimeAction.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/SetTimeAction.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/SetTimeAction.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/SetTimeAction.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/SetTimeAction.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimerService.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimerService.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimerService.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimerService.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimerService.java

upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/UPnPEventNotifier.java

diff --git a/upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/UPnPEventNotifier.java b/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/UPnPEventNotifier.java
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/UPnPEventNotifier.java
rename to upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/UPnPEventNotifier.java

upnp/samples/clock/src/main/resources/META-INF/Manifest.mf

diff --git a/upnp/samples/upnp.sample.clock/src/main/resources/META-INF/Manifest.mf b/upnp/samples/clock/src/main/resources/META-INF/Manifest.mf
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/resources/META-INF/Manifest.mf
rename to upnp/samples/clock/src/main/resources/META-INF/Manifest.mf

upnp/samples/clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.gif

diff --git a/upnp/samples/upnp.sample.clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.gif b/upnp/samples/clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.gif
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.gif
rename to upnp/samples/clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.gif
Binary files differ

upnp/samples/clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.jpg

diff --git a/upnp/samples/upnp.sample.clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.jpg b/upnp/samples/clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.jpg
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.jpg
rename to upnp/samples/clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/clock.jpg
Binary files differ

upnp/samples/clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/logo.gif

diff --git a/upnp/samples/upnp.sample.clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/logo.gif b/upnp/samples/clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/logo.gif
similarity index 100%
rename from upnp/samples/upnp.sample.clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/logo.gif
rename to upnp/samples/clock/src/main/resources/org/apache/felix/upnp/sample/clock/images/logo.gif
Binary files differ

upnp/samples/tv/pom.xml

diff --git a/upnp/samples/upnp.sample.tv/pom.xml b/upnp/samples/tv/pom.xml
similarity index 100%
rename from upnp/samples/upnp.sample.tv/pom.xml
rename to upnp/samples/tv/pom.xml

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/Activator.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/Activator.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/Activator.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/Activator.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/Activator.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/EventSource.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/EventSource.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/EventSource.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/EventSource.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/EventSource.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/GetPowerAction.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/GetPowerAction.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/GetPowerAction.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/GetPowerAction.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/GetPowerAction.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerService.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerService.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerService.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerService.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerService.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerStateVariable.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerStateVariable.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerStateVariable.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerStateVariable.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/PowerStateVariable.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/ResultStateVariable.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/ResultStateVariable.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/ResultStateVariable.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/ResultStateVariable.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/ResultStateVariable.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/SetPowerAction.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/SetPowerAction.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/SetPowerAction.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/SetPowerAction.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/SetPowerAction.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvFrame.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/TvFrame.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvFrame.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/TvFrame.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvFrame.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvIcon.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/TvIcon.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvIcon.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/TvIcon.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvIcon.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvPane.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/TvPane.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvPane.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/TvPane.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvPane.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPEventNotifier.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPEventNotifier.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPEventNotifier.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPEventNotifier.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPEventNotifier.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPStateVariableDescriptor.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPStateVariableDescriptor.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPStateVariableDescriptor.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPStateVariableDescriptor.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPStateVariableDescriptor.java

upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPSubscriber.java

diff --git a/upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPSubscriber.java b/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPSubscriber.java
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPSubscriber.java
rename to upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/UPnPSubscriber.java

upnp/samples/tv/src/main/resources/META-INF/Manifest.mf

diff --git a/upnp/samples/upnp.sample.tv/src/main/resources/META-INF/Manifest.mf b/upnp/samples/tv/src/main/resources/META-INF/Manifest.mf
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/resources/META-INF/Manifest.mf
rename to upnp/samples/tv/src/main/resources/META-INF/Manifest.mf

upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/logo.gif

diff --git a/upnp/samples/upnp.sample.tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/logo.gif b/upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/logo.gif
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/logo.gif
rename to upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/logo.gif
Binary files differ

upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.gif

diff --git a/upnp/samples/upnp.sample.tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.gif b/upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.gif
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.gif
rename to upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.gif
Binary files differ

upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.jpg

diff --git a/upnp/samples/upnp.sample.tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.jpg b/upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.jpg
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.jpg
rename to upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tv.jpg
Binary files differ

upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tvon.jpg

diff --git a/upnp/samples/upnp.sample.tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tvon.jpg b/upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tvon.jpg
similarity index 100%
rename from upnp/samples/upnp.sample.tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tvon.jpg
rename to upnp/samples/tv/src/main/resources/org/apache/felix/upnp/sample/tv/images/tvon.jpg
Binary files differ

upnp/tester/pom.xml

diff --git a/upnp/upnp.tester/pom.xml b/upnp/tester/pom.xml
similarity index 100%
rename from upnp/upnp.tester/pom.xml
rename to upnp/tester/pom.xml

upnp/tester/src/main/java/org/apache/felix/upnp/tester/Activator.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/Activator.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/Activator.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/Activator.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/Activator.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/ControlPoint.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/ControlPoint.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/ControlPoint.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/ControlPoint.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/ControlPoint.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/Mediator.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/Mediator.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/Mediator.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/Mediator.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/Mediator.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/UPnPSubscriber.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/UPnPSubscriber.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/UPnPSubscriber.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/UPnPSubscriber.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/UPnPSubscriber.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceChangeListener.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceChangeListener.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceChangeListener.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceChangeListener.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceChangeListener.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNode.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNode.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNode.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNode.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNode.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNodeListener.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNodeListener.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNodeListener.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNodeListener.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DeviceNodeListener.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DevicesList.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DevicesList.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DevicesList.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DevicesList.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DevicesList.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DriverProxy.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DriverProxy.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DriverProxy.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/DriverProxy.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/DriverProxy.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/RootDeviceListener.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/RootDeviceListener.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/RootDeviceListener.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/discovery/RootDeviceListener.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/discovery/RootDeviceListener.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/LogPanel.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/LogPanel.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/LogPanel.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/LogPanel.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/LogPanel.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/PropertiesViewer.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/PropertiesViewer.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/PropertiesViewer.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/PropertiesViewer.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/PropertiesViewer.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/SubscriptionPanel.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/SubscriptionPanel.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/SubscriptionPanel.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/SubscriptionPanel.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/SubscriptionPanel.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/TreeViewer.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/TreeViewer.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/TreeViewer.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/TreeViewer.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/TreeViewer.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/UPnPDeviceTreeNode.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/UPnPDeviceTreeNode.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/UPnPDeviceTreeNode.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/UPnPDeviceTreeNode.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/UPnPDeviceTreeNode.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/Util.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/Util.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/Util.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/Util.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/gui/Util.java

upnp/tester/src/main/java/org/apache/felix/upnp/tester/test.java

diff --git a/upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/test.java b/upnp/tester/src/main/java/org/apache/felix/upnp/tester/test.java
similarity index 100%
rename from upnp/upnp.tester/src/main/java/org/apache/felix/upnp/tester/test.java
rename to upnp/tester/src/main/java/org/apache/felix/upnp/tester/test.java

upnp/tester/src/main/resources/META-INF/Manifest.mf

diff --git a/upnp/upnp.tester/src/main/resources/META-INF/Manifest.mf b/upnp/tester/src/main/resources/META-INF/Manifest.mf
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/META-INF/Manifest.mf
rename to upnp/tester/src/main/resources/META-INF/Manifest.mf

upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/AnimatedStateVariable.gif

diff --git a/upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/AnimatedStateVariable.gif b/upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/AnimatedStateVariable.gif
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/AnimatedStateVariable.gif
rename to upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/AnimatedStateVariable.gif
Binary files differ

upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/DeviceNode.gif

diff --git a/upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/DeviceNode.gif b/upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/DeviceNode.gif
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/DeviceNode.gif
rename to upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/DeviceNode.gif
Binary files differ

upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/EventedStateVariable.gif

diff --git a/upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/EventedStateVariable.gif b/upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/EventedStateVariable.gif
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/EventedStateVariable.gif
rename to upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/EventedStateVariable.gif
Binary files differ

upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/RootDeviceNode.gif

diff --git a/upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/RootDeviceNode.gif b/upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/RootDeviceNode.gif
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/RootDeviceNode.gif
rename to upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/RootDeviceNode.gif
Binary files differ

upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/SubscribedStateVariable.gif

diff --git a/upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/SubscribedStateVariable.gif b/upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/SubscribedStateVariable.gif
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/SubscribedStateVariable.gif
rename to upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/SubscribedStateVariable.gif
Binary files differ

upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPAction.gif

diff --git a/upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPAction.gif b/upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPAction.gif
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPAction.gif
rename to upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPAction.gif
Binary files differ

upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPService.gif

diff --git a/upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPService.gif b/upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPService.gif
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPService.gif
rename to upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPService.gif
Binary files differ

upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPStateVariable.gif

diff --git a/upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPStateVariable.gif b/upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPStateVariable.gif
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPStateVariable.gif
rename to upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/UPnPStateVariable.gif
Binary files differ

upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/logo.gif

diff --git a/upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/logo.gif b/upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/logo.gif
similarity index 100%
rename from upnp/upnp.tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/logo.gif
rename to upnp/tester/src/main/resources/org/apache/felix/upnp/tester/gui/IMAGES/logo.gif
Binary files differ

upnp/upnp.doc/core.sh.bat

diff --git a/upnp/upnp.doc/core.sh.bat b/upnp/upnp.doc/core.sh.bat
deleted file mode 100644
index 59f26f6..0000000
--- a/upnp/upnp.doc/core.sh.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh

-

-

-echo "cd into felix directory"

-cd ../../main

-

-echo "lauching felix with core gateway properties"

-java -Dfelix.config.properties=file:../upnp/upnp.doc/config.properties.core -jar bin/felix.jar

-