diff options
Diffstat (limited to 'examples/bundles')
16 files changed, 35 insertions, 38 deletions
diff --git a/examples/bundles/com.mycorp.examples.timeservice.async/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.async/META-INF/MANIFEST.MF index 0508ac59c..50340dd18 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.async/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.async/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice Async API Bundle-SymbolicName: com.mycorp.examples.timeservice.async -Bundle-Version: 2.0.0.qualifier +Automatic-Module-Name: com.mycorp.examples.timeservice.async +Bundle-Version: 2.0.100.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.mycorp.examples.timeservice;version="2.0.0" diff --git a/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml index 3bd3322d7..b3515c516 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>com.mycorp.examples.timeservice.async</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF index f97e2c149..ccb638834 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice Consumer DS Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer.ds -Bundle-Version: 1.0.100.qualifier +Automatic-Module-Name: com.mycorp.examples.timeservice.consumer.ds +Bundle-Version: 1.0.200.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.mycorp.examples.timeservice;version="[2.0.0,3.0.0)", diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product index 0c33faa0f..34c732738 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product @@ -24,7 +24,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -40,6 +39,7 @@ <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.console"/> @@ -63,6 +63,7 @@ <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> </plugins> <configurations> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product index b999eb858..e2a664a12 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product @@ -23,7 +23,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -36,7 +35,6 @@ <plugin id="com.mycorp.examples.timeservice.async"/> <plugin id="com.mycorp.examples.timeservice.consumer.ds"/> <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery"/> - <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rest"/> <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> @@ -67,7 +65,6 @@ <configurations> <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" /> <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery" autoStart="false" startLevel="0" /> - <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rest" autoStart="false" startLevel="0" /> <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" /> <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" /> <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml index 498181028..f18272603 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>com.mycorp.examples.timeservice.consumer.ds</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer/META-INF/MANIFEST.MF index cc5d9239d..de5b68f71 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/META-INF/MANIFEST.MF @@ -2,13 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice Consumer Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer -Bundle-Version: 1.1.0.qualifier +Automatic-Module-Name: com.mycorp.examples.timeservice.consumer +Bundle-Version: 1.1.100.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Activator: com.mycorp.examples.timeservice.consumer.Activator -Import-Package: com.mycorp.examples.timeservice;version="1.0.0", - org.eclipse.ecf.osgi.services.remoteserviceadmin;version="1.2.0", - org.osgi.framework, - org.osgi.service.remoteserviceadmin;version="1.0.0", - org.osgi.util.tracker +Import-Package: com.mycorp.examples.timeservice;version="[1.0.0,2.0.0)", + org.eclipse.ecf.osgi.services.remoteserviceadmin;version="[1.2.0,2.0.0)", + org.osgi.framework;version="[1.0.0,2.0.0)", + org.osgi.service.remoteserviceadmin;version="[1.0.0,2.0.0)", + org.osgi.util.tracker;version="[1.3.2,2.0.0)" diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product index d7fbafa38..f21bb2bfa 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product +++ b/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.0.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"> <configIni use="default"> </configIni> @@ -23,7 +23,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -33,13 +32,12 @@ </vm> <plugins> - <plugin id="com.mycorp.examples.timeservice.async"/> + <plugin id="com.mycorp.examples.timeservice"/> <plugin id="com.mycorp.examples.timeservice.consumer"/> - <plugin id="javax.xml"/> <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> - <plugin id="org.eclipse.core.contenttype"/> + <plugin id="org.apache.felix.scr"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.console"/> @@ -59,21 +57,18 @@ <plugin id="org.eclipse.equinox.console"/> <plugin id="org.eclipse.equinox.ds"/> <plugin id="org.eclipse.equinox.event"/> - <plugin id="org.eclipse.equinox.preferences"/> - <plugin id="org.eclipse.equinox.registry"/> <plugin id="org.eclipse.equinox.util"/> <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> </plugins> <configurations> - <plugin id="com.mycorp.examples.timeservice.consumer" autoStart="true" startLevel="5" /> - <plugin id="javax.xml" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.consumer" autoStart="true" startLevel="0" /> <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" /> <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" /> <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" /> - <plugin id="org.eclipse.core.contenttype" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.core.jobs" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf.console" autoStart="true" startLevel="0" /> @@ -93,8 +88,6 @@ <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.preferences" autoStart="true" startLevel="0" /> - <plugin id="org.eclipse.equinox.registry" 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" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml index 0e5f0ce9c..def88dc97 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>com.mycorp.examples.timeservice.consumer</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/META-INF/MANIFEST.MF index 1084c7631..b2232a4b3 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Remote Service Example Host using Authentication Bundle-SymbolicName: com.mycorp.examples.timeservice.host.generic.auth -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.mycorp.examples.timeservice;version="1.0.0", diff --git a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/launch/TimeServiceHost.generic.auth.product b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/launch/TimeServiceHost.generic.auth.product index 82c79d8ca..126ec3df1 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/launch/TimeServiceHost.generic.auth.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host.generic.auth/launch/TimeServiceHost.generic.auth.product @@ -16,7 +16,6 @@ </launcherArgs> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -35,7 +34,6 @@ <plugin id="org.apache.felix.gogo.shell"/> <plugin id="org.eclipse.core.contenttype"/> <plugin id="org.eclipse.core.jobs"/> - <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.console"/> <plugin id="org.eclipse.ecf.discovery"/> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF index 08a03c681..d13a03adc 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice Host Bundle-SymbolicName: com.mycorp.examples.timeservice.host -Bundle-Version: 1.1.100.qualifier +Automatic-Module-Name: com.mycorp.examples.timeservice.host +Bundle-Version: 1.1.200.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product index 87c3b9c93..231bd54cd 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product @@ -24,7 +24,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -40,6 +39,7 @@ <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.console"/> @@ -57,15 +57,18 @@ <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"/> + <plugin id="org.eclipse.osgi.util"/> </plugins> <configurations> <plugin id="com.mycorp.examples.timeservice.async" autoStart="true" startLevel="0" /> - <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="6" /> + <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="0" /> <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" /> <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" /> <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" /> @@ -74,8 +77,8 @@ <plugin id="org.eclipse.ecf.console" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf.discovery" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf.identity" autoStart="true" startLevel="0" /> - <plugin id="org.eclipse.ecf.osgi.services.distribution" autoStart="true" startLevel="5" /> - <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="5" /> + <plugin id="org.eclipse.ecf.osgi.services.distribution" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml index 0571a5fdd..76c6563a0 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.host/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>com.mycorp.examples.timeservice.host</artifactId> - <version>1.1.100-SNAPSHOT</version> + <version>1.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/examples/bundles/com.mycorp.examples.timeservice/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice/META-INF/MANIFEST.MF index 404197a35..89471760d 100644 --- a/examples/bundles/com.mycorp.examples.timeservice/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice API Bundle-SymbolicName: com.mycorp.examples.timeservice -Bundle-Version: 1.1.0.qualifier +Automatic-Module-Name: com.mycorp.examples.timeservice +Bundle-Version: 1.1.100.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/examples/bundles/com.mycorp.examples.timeservice/pom.xml b/examples/bundles/com.mycorp.examples.timeservice/pom.xml index ab9255d35..567764446 100644 --- a/examples/bundles/com.mycorp.examples.timeservice/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>com.mycorp.examples.timeservice</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |