Merge pull request #103 from scottslewis/master

Removed deprecated bundles and features from top-level build

Author: scottslewis

examples/bundles/com.mycorp.examples.osgi.async.consumer/launch/ExampleOSGIAsyncConsumer.generic.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="OSGI Async Example Consumer" uid="com.mycorp.examples.osgi.async.consumer.generic.exampleosgiasync" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="OSGI Async Example Consumer" uid="com.mycorp.examples.osgi.async.consumer.generic.exampleosgiasync" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -46,16 +46,13 @@
       <plugin id="org.eclipse.ecf.provider"/>
       <plugin id="org.eclipse.ecf.provider.jmdns"/>
       <plugin id="org.eclipse.ecf.provider.remoteservice"/>
-      <plugin id="org.eclipse.ecf.provider.xmlrpc"/>
       <plugin id="org.eclipse.ecf.remoteservice"/>
       <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
       <plugin id="org.eclipse.ecf.sharedobject"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.concurrent"/>
       <plugin id="org.eclipse.equinox.console"/>
-      <plugin id="org.eclipse.equinox.ds"/>
       <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.util"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
@@ -78,16 +75,13 @@
       <plugin id="org.eclipse.ecf.provider" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.ecf.provider.remoteservice" autoStart="false" startLevel="0" />
-      <plugin id="org.eclipse.ecf.provider.xmlrpc" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.ecf.remoteservice" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.ecf.sharedobject" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.concurrent" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.equinox.console" autoStart="false" startLevel="0" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.event" autoStart="false" startLevel="0" />
-      <plugin id="org.eclipse.equinox.util" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
       <plugin id="org.eclipse.osgi.services" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="false" startLevel="0" />

examples/bundles/com.mycorp.examples.osgi.async.impl/OSGI-INF/com.mycorp.examples.osgi.async.impl.DescriptiveStatsServiceImpl.xml

@@ -2,6 +2,7 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="com.mycorp.examples.osgi.async.impl.DescriptiveStatsServiceImpl">
    <property name="service.exported.interfaces" value="*"/>
    <property name="service.intents" value="osgi.async"/>
+   <property name="service.exported.configs" value="ecf.generic.server"/>
    <service>
       <provide interface="com.mycorp.examples.osgi.async.DescriptiveStatsService"/>
    </service>

examples/bundles/com.mycorp.examples.osgi.async.impl/launch/ExampleOSGiAsync.generic.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="OSGI Async Example" uid="com.mycorp.examples.osgi.async.impl.generic.exampleosgiasync" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="OSGI Async Example" uid="com.mycorp.examples.osgi.async.impl.generic.exampleosgiasync" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -28,7 +28,6 @@
    <plugins>
       <plugin id="com.mycorp.examples.osgi.async"/>
       <plugin id="com.mycorp.examples.osgi.async.impl"/>
-      <plugin id="jakarta.servlet.jsp-api"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
@@ -49,16 +48,32 @@
       <plugin id="org.eclipse.ecf.remoteservice"/>
       <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
       <plugin id="org.eclipse.ecf.sharedobject"/>
+      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.concurrent"/>
       <plugin id="org.eclipse.equinox.console"/>
-      <plugin id="org.eclipse.equinox.ds"/>
       <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.util"/>
+      <plugin id="org.eclipse.equinox.http.service.api"/>
+      <plugin id="org.eclipse.jetty.servlet-api"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
       <plugin id="org.eclipse.osgi.util"/>
+      <plugin id="org.osgi.service.cm"/>
+      <plugin id="org.osgi.service.component"/>
+      <plugin id="org.osgi.service.device"/>
+      <plugin id="org.osgi.service.event"/>
+      <plugin id="org.osgi.service.http.whiteboard"/>
+      <plugin id="org.osgi.service.metatype"/>
+      <plugin id="org.osgi.service.provisioning"/>
+      <plugin id="org.osgi.service.upnp"/>
+      <plugin id="org.osgi.service.useradmin"/>
+      <plugin id="org.osgi.service.wireadmin"/>
+      <plugin id="org.osgi.util.function"/>
+      <plugin id="org.osgi.util.measurement"/>
+      <plugin id="org.osgi.util.position"/>
+      <plugin id="org.osgi.util.promise"/>
+      <plugin id="org.osgi.util.xml"/>
    </plugins>
 
    <configurations>
@@ -83,9 +98,7 @@
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.concurrent" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.equinox.console" autoStart="false" startLevel="0" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.event" autoStart="false" startLevel="0" />
-      <plugin id="org.eclipse.equinox.util" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
       <plugin id="org.eclipse.osgi.services" autoStart="false" startLevel="0" />
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="false" startLevel="0" />

examples/bundles/com.mycorp.examples.osgi.async.impl/src/com/mycorp/examples/osgi/async/impl/DescriptiveStatsServiceImpl.java

@@ -20,7 +20,7 @@
 import org.osgi.util.promise.Promise;
 import com.mycorp.examples.osgi.async.DescriptiveStatsService;
 
-@Component(property = { "service.exported.interfaces=*", "service.intents=osgi.async" })
+@Component(property = { "service.exported.interfaces=*", "service.intents=osgi.async", "service.exported.configs=ecf.generic.server" })
 public class DescriptiveStatsServiceImpl implements DescriptiveStatsService {
 
 	@Override

examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/TimeServiceConsumer.generic.zeroconf.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="TimeServiceConsumer Generic Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="TimeServiceConsumer Generic Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -53,9 +53,7 @@
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.concurrent"/>
       <plugin id="org.eclipse.equinox.console"/>
-      <plugin id="org.eclipse.equinox.ds"/>
       <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.util"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
@@ -84,9 +82,7 @@
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />

examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="TimeServiceConsumer Generic Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="TimeServiceConsumer Generic Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -53,9 +53,7 @@
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.concurrent"/>
       <plugin id="org.eclipse.equinox.console"/>
-      <plugin id="org.eclipse.equinox.ds"/>
       <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.util"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
@@ -84,9 +82,7 @@
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />

examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="MyCorp Remote TimeService Generic Consumer" uid="com.mycorp.examples.timeservice.consumer.generic.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="MyCorp Remote TimeService Generic Consumer" uid="com.mycorp.examples.timeservice.consumer.generic.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -52,9 +52,7 @@
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.concurrent"/>
       <plugin id="org.eclipse.equinox.console"/>
-      <plugin id="org.eclipse.equinox.ds"/>
       <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.util"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
@@ -82,9 +80,7 @@
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />