You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/11/27 14:06:48 UTC
[1/3] aries-rsa git commit: [ARIES-1757] Add async intent to provider
Repository: aries-rsa
Updated Branches:
refs/heads/master 84d31c7db -> 8a0b96e00
[ARIES-1757] Add async intent to provider
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/b6969f20
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/b6969f20
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/b6969f20
Branch: refs/heads/master
Commit: b6969f20c916e1c4abc0bd18a411e402e3e3df4f
Parents: 84d31c7
Author: Christian Schneider <cs...@adobe.com>
Authored: Thu Nov 23 15:38:55 2017 +0100
Committer: Christian Schneider <cs...@adobe.com>
Committed: Thu Nov 23 15:38:55 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/b6969f20/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java
----------------------------------------------------------------------
diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java
index c26292a..82ebd3e 100644
--- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java
+++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java
@@ -32,7 +32,7 @@ public class Activator implements BundleActivator {
public void start(BundleContext context) throws Exception {
DistributionProvider provider = new TCPProvider();
Dictionary<String, Object> props = new Hashtable<>();
- props.put(RemoteConstants.REMOTE_INTENTS_SUPPORTED, new String[]{});
+ props.put(RemoteConstants.REMOTE_INTENTS_SUPPORTED, new String[]{ "osgi.async" });
props.put(RemoteConstants.REMOTE_CONFIGS_SUPPORTED, provider.getSupportedTypes());
context.registerService(DistributionProvider.class, provider, props);
}
[2/3] aries-rsa git commit: [ARIES-1758] Add basic intent to tcp
provider
Posted by cs...@apache.org.
[ARIES-1758] Add basic intent to tcp provider
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/9c746356
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/9c746356
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/9c746356
Branch: refs/heads/master
Commit: 9c746356ed46155351ec0620a425ad33aff1bb53
Parents: b6969f2
Author: Christian Schneider <cs...@adobe.com>
Authored: Thu Nov 23 15:39:50 2017 +0100
Committer: Christian Schneider <cs...@adobe.com>
Committed: Thu Nov 23 15:39:50 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/9c746356/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java
----------------------------------------------------------------------
diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java
index 82ebd3e..1ec4f33 100644
--- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java
+++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/Activator.java
@@ -32,7 +32,7 @@ public class Activator implements BundleActivator {
public void start(BundleContext context) throws Exception {
DistributionProvider provider = new TCPProvider();
Dictionary<String, Object> props = new Hashtable<>();
- props.put(RemoteConstants.REMOTE_INTENTS_SUPPORTED, new String[]{ "osgi.async" });
+ props.put(RemoteConstants.REMOTE_INTENTS_SUPPORTED, new String[]{ "osgi.basic", "osgi.async" });
props.put(RemoteConstants.REMOTE_CONFIGS_SUPPORTED, provider.getSupportedTypes());
context.registerService(DistributionProvider.class, provider, props);
}
[3/3] aries-rsa git commit: Small refactoring
Posted by cs...@apache.org.
Small refactoring
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/8a0b96e0
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/8a0b96e0
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/8a0b96e0
Branch: refs/heads/master
Commit: 8a0b96e004186cf8e19176139c864a33c4e5bc13
Parents: 9c74635
Author: Christian Schneider <cs...@adobe.com>
Authored: Mon Nov 27 14:58:35 2017 +0100
Committer: Christian Schneider <cs...@adobe.com>
Committed: Mon Nov 27 14:58:35 2017 +0100
----------------------------------------------------------------------
.../topologymanager/exporter/TopologyManagerExport.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/8a0b96e0/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java
----------------------------------------------------------------------
diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java
index 0be28a4..e11801c 100644
--- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java
+++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java
@@ -120,10 +120,8 @@ public class TopologyManagerExport implements ServiceListener {
for (RemoteServiceAdmin remoteServiceAdmin : rsaSetCopy) {
LOG.debug("TopologyManager: handling remoteServiceAdmin " + remoteServiceAdmin);
if (endpointRepo.isAlreadyExportedForRsa(sref, remoteServiceAdmin)) {
- // already handled by this remoteServiceAdmin
LOG.debug("already handled by this remoteServiceAdmin -> skipping");
} else {
-
exportServiceUsingRemoteServiceAdmin(sref, remoteServiceAdmin, addProps);
}
}
@@ -132,9 +130,11 @@ public class TopologyManagerExport implements ServiceListener {
private boolean shouldExport(ServiceReference<?> sref, Map<String, ?> addProps) {
List<String> exported= StringPlus.normalize(sref.getProperty(RemoteConstants.SERVICE_EXPORTED_INTERFACES));
List<String> addExported = StringPlus.normalize(addProps.get(RemoteConstants.SERVICE_EXPORTED_INTERFACES));
- int length = exported == null ? 0 : exported.size();
- length += addExported == null ? 0 : addExported.size();
- return length>0;
+ return sizeOf(exported) + sizeOf(addExported) > 0;
+ }
+
+ private int sizeOf(List<String> list) {
+ return list == null ? 0 : list.size();
}
private Object getSymbolicName(Bundle bundle) {
@@ -151,7 +151,7 @@ public class TopologyManagerExport implements ServiceListener {
endpointRepo.removeService(sref);
return;
}
- // do the export
+
LOG.debug("exporting {}...", sref);
// TODO: additional parameter Map?
Collection<ExportRegistration> exportRegs = remoteServiceAdmin.exportService(sref, addProps);