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 2016/03/22 11:06:56 UTC
[2/2] aries-rsa git commit: Some fixes
Some fixes
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/55809ab2
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/55809ab2
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/55809ab2
Branch: refs/heads/master
Commit: 55809ab28f455a6eb4c3a950b4550077c7a331b5
Parents: bb50834
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Mar 22 11:06:47 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Mar 22 11:06:47 2016 +0100
----------------------------------------------------------------------
repository/pom.xml | 11 +++++++++++
.../aries/rsa/core/DistributionProviderTracker.java | 6 ++++++
.../topologymanager/exporter/TopologyManagerExport.java | 4 ++--
3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/55809ab2/repository/pom.xml
----------------------------------------------------------------------
diff --git a/repository/pom.xml b/repository/pom.xml
index 8c07064..e6f5cd7 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -84,6 +84,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries.rsa.examples.echotcp</groupId>
@@ -95,5 +101,10 @@
<artifactId>org.apache.aries.rsa.examples.echotcp.consumer</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>1.8.5</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/55809ab2/rsa/src/main/java/org/apache/aries/rsa/core/DistributionProviderTracker.java
----------------------------------------------------------------------
diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/DistributionProviderTracker.java b/rsa/src/main/java/org/apache/aries/rsa/core/DistributionProviderTracker.java
index 4c3d36c..d33f402 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/DistributionProviderTracker.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/DistributionProviderTracker.java
@@ -24,6 +24,7 @@ import java.util.Hashtable;
import org.apache.aries.rsa.spi.DistributionProvider;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -58,6 +59,11 @@ public class DistributionProviderTracker extends ServiceTracker<DistributionProv
protected BundleContext getAPIContext() {
Bundle apiBundle = FrameworkUtil.getBundle(DistributionProvider.class);
+ try {
+ apiBundle.start();
+ } catch (BundleException e) {
+ LOG.error(e.getMessage(), e);
+ }
BundleContext apiContext = apiBundle.getBundleContext();
return apiContext;
}
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/55809ab2/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 0557116..645802c 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
@@ -115,7 +115,7 @@ public class TopologyManagerExport implements ServiceListener {
}
for (RemoteServiceAdmin remoteServiceAdmin : rsaSet) {
- LOG.info("TopologyManager: handling remoteServiceAdmin " + remoteServiceAdmin);
+ LOG.debug("TopologyManager: handling remoteServiceAdmin " + remoteServiceAdmin);
if (endpointRepo.isAlreadyExportedForRsa(sref, remoteServiceAdmin)) {
// already handled by this remoteServiceAdmin
LOG.debug("already handled by this remoteServiceAdmin -> skipping");
@@ -156,7 +156,7 @@ public class TopologyManagerExport implements ServiceListener {
for (ExportRegistration reg : exportRegs) {
if (reg.getException() == null) {
EndpointDescription endpoint = getExportedEndpoint(reg);
- LOG.info("TopologyManager: export succeeded for {}, endpoint ", sref, endpoint);
+ LOG.debug("TopologyManager: export succeeded for {}, endpoint {}", sref, endpoint);
endpoints.add(endpoint);
} else {
LOG.error("TopologyManager: export failed for {}", sref);