diff options
12 files changed, 32 insertions, 15 deletions
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product index 0fad5cede..6af646686 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product @@ -12,6 +12,7 @@ <vmArgs>-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Decf.discovery.etcd.hostname=127.0.0.1 +-Dorg.eclipse.ecf.core.util.traceBundles=org.eclipse.ecf.provider.etcd </vmArgs> <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts </vmArgsMac> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.readme index facc696ae..d31e8f4a6 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.readme +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.readme @@ -11,3 +11,9 @@ in the product config are currently set to `127.0.0.1 (localhost) and port 2379 These can be changed in the product config or the generated launch config if desired to point at some other etcd server. +There is a public etcd server for the ECF project available inconsistently at: + +-Decf.discovery.etcd.hostname=disco.ecf-project.org +-Decf.discovery.etcd.port=2379 + +Use at your own risk. diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/src/com/mycorp/examples/timeservice/consumer/ds/async/TimeServiceComponentAsync.java b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/src/com/mycorp/examples/timeservice/consumer/ds/async/TimeServiceComponentAsync.java index 333cf0ef5..e1fb9cb5c 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/src/com/mycorp/examples/timeservice/consumer/ds/async/TimeServiceComponentAsync.java +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/src/com/mycorp/examples/timeservice/consumer/ds/async/TimeServiceComponentAsync.java @@ -25,7 +25,7 @@ public class TimeServiceComponentAsync { System.out.println("Discovered ITimeServiceAsync via DS"); // Get the CompletableFuture...no blocking here CompletableFuture<Long> cf = timeService.getCurrentTimeAsync(); - // print out time when done...no blocking anywhere! + // print out time when done...no blocking! cf.whenComplete((time, exception) -> { if (exception != null) exception.printStackTrace(); diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product index b77d8730d..9fb60f4f4 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product @@ -17,6 +17,7 @@ -Decf.exported.async.interfaces=* -Decf.discovery.etcd.hostname=127.0.0.1 -Decf.discovery.etcd.port=2379 +-Dorg.eclipse.ecf.core.util.traceBundles=org.eclipse.ecf.provider.etcd </vmArgs> <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts </vmArgsMac> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.readme b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.readme index e3b9d6c70..a555eba07 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.readme +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.readme @@ -11,3 +11,9 @@ in the product config are currently set to 127.0.0.1 (localhost) and port 2379 v These can be changed in the product config or the generated launch config if desired to point at some other etcd server. +There is a public etcd server for the ECF project available inconsistently at: + +-Decf.discovery.etcd.hostname=disco.ecf-project.org +-Decf.discovery.etcd.port=2379 + +Use at your own risk. diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product index 15380e615..38d5be7d1 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product @@ -93,14 +93,17 @@ <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.apache.felix.scr" autoStart="true" startLevel="0" /> <plugin id="org.apache.httpcomponents.httpclient" autoStart="true" startLevel="0" /> <plugin id="org.apache.httpcomponents.httpcore" 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" /> <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="0" /> <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console" 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/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java index b005c6b11..a91bbf014 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java @@ -228,11 +228,6 @@ public class Activator implements BundleActivator { } } - private void initializeSAXParserFactory() { - ServiceReference<?> ref = Activator.context.getServiceReference(SAXParserFactory.class.getName()); - if (ref == null) - Activator.context.registerService(SAXParserFactory.class.getName(), SAXParserFactory.newInstance(), null); - } /* * (non-Javadoc) * @@ -253,12 +248,6 @@ public class Activator implements BundleActivator { // approach/using the ServiceFactory extender approach for this purpose: // https://mail.osgi.org/pipermail/osgi-dev/2011-February/003000.html initializeProxyServiceFactoryBundle(); - // Start distribution providers if not already started - initializeProviders(context.getBundle(), DistributionNamespace.DISTRIBUTION_NAMESPACE, - "Could not start distribution provider. "); //$NON-NLS-1$ - // Start distribution providers if not already started - initializeProviders(context.getBundle(), DiscoveryNamespace.DISCOVERY_NAMESPACE, - "Could not start discovery provider. "); //$NON-NLS-1$ // make remote service admin available rsaProps = new Properties(); rsaProps.put(RemoteServiceAdmin.SERVICE_PROP, new Boolean(true)); @@ -323,6 +312,9 @@ public class Activator implements BundleActivator { }); ctdTracker.open(); + // Start distribution providers if not already started + initializeProviders(context.getBundle(), DistributionNamespace.DISTRIBUTION_NAMESPACE, + "Could not start distribution provider. "); //$NON-NLS-1$ // create endpoint description locator endpointDescriptionLocator = new EndpointDescriptionLocator(context); // create and register endpoint description advertiser @@ -333,6 +325,11 @@ public class Activator implements BundleActivator { // start endpointDescriptionLocator endpointDescriptionLocator.start(); + + // Start discovery providers if not already started + initializeProviders(context.getBundle(), DiscoveryNamespace.DISCOVERY_NAMESPACE, + "Could not start discovery provider. "); //$NON-NLS-1$ + } /* diff --git a/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml b/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml index c5b012b0d..d99594de1 100644 --- a/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.ecf.osgi.services.feature" label="ECF Remote Services Admin" - version="2.3.0.qualifier" + version="2.3.1.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="0.0.0"> @@ -39,6 +39,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services <requires> <import feature="org.eclipse.ecf.discovery.feature" version="1.0" match="compatible"/> <import feature="org.eclipse.ecf.remoteservice.feature" version="2.1" match="compatible"/> + <import feature="org.eclipse.ecf.console.feature" version="1.1.0.qualifier"/> </requires> <plugin diff --git a/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml b/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml index 9809b60cc..3c18327da 100644 --- a/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.osgi.services.feature</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs index 96fd56e7c..7b0b58970 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF index 3d49b2569..1306ae62d 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF @@ -19,3 +19,4 @@ Require-Bundle: org.eclipse.equinox.common, Export-Package: org.eclipse.ecf.internal.remoteservice.eventadmin;x-internal:=true, org.eclipse.ecf.remoteservice.eventadmin;version="1.1.100", org.eclipse.ecf.remoteservice.eventadmin.serialization +Bundle-ActivationPolicy: lazy diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties index 86249b761..c83f7ee66 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ about.html src.includes = bundle.properties,\ about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-1.5 |