Removed @Inject annotation entirely.

Added support for the upnpcallback servlet to work with both Servlet 2.4 (Synchronously) and Servlet 3.0 (Asynchronously).
Made sure the upnpcallback servlet does not use the default HttpContext which may be secured, but instead always an unsecured one.

Whenever HttpService disappears/appears shutdown is performed
synchronously and startup asynchronously after a delay of 1500 ms in order
to properly reinitialize jupnp.

Signed-off-by: IVAN GEORGIEV ILIEV <ivan.iliev@musala.com>

	modified:   bundles/org.jupnp/OSGI-INF/upnp.xml

bundles/org.jupnp/OSGI-INF/osgiserviceconfiguration.xml

@@ -16,7 +16,6 @@
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" configuration-policy="require" deactivate="deactivate" immediate="false" name="org.jupnp">
    <implementation class="org.jupnp.OSGiUpnpServiceConfiguration"/>
-   <reference bind="setHttpService" cardinality="0..1" interface="org.osgi.service.http.HttpService" name="HttpService" policy="dynamic" unbind="unsetHttpService"/>
    <service>
       <provide interface="org.jupnp.OSGiUpnpServiceConfiguration"/>
    </service>

bundles/org.jupnp/OSGI-INF/upnp.xml

@@ -20,4 +20,5 @@
       <provide interface="org.jupnp.UpnpService"/>
    </service>
    <reference bind="setOSGiUpnpServiceConfiguration" cardinality="1..1" interface="org.jupnp.OSGiUpnpServiceConfiguration" name="OSGiUpnpServiceConfiguration" policy="static" unbind="unsetOSGiUpnpServiceConfiguration"/>
+   <reference bind="setHttpService" cardinality="0..1" interface="org.osgi.service.http.HttpService" name="HttpService" policy="dynamic" unbind="unsetHttpService"/>
 </scr:component>

bundles/org.jupnp/build.properties

@@ -2,5 +2,4 @@ output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/
-source.. = src/main/java/
-jars.extra.classpath = platform:/plugin/javax.inject
+source.. = src/main/java/