Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 05C5219C73 for ; Wed, 30 Mar 2016 11:43:50 +0000 (UTC) Received: (qmail 98441 invoked by uid 500); 30 Mar 2016 11:43:49 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 98377 invoked by uid 500); 30 Mar 2016 11:43:49 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 98366 invoked by uid 99); 30 Mar 2016 11:43:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Mar 2016 11:43:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AFCCCDFD43; Wed, 30 Mar 2016 11:43:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@aries.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: aries-rsa git commit: Add signing, fix javadoc issues Date: Wed, 30 Mar 2016 11:43:49 +0000 (UTC) Repository: aries-rsa Updated Branches: refs/heads/master 4d409dea0 -> 50274e591 Add signing, fix javadoc issues Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/50274e59 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/50274e59 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/50274e59 Branch: refs/heads/master Commit: 50274e591fa69234bbae132564446d79eae1192b Parents: 4d409de Author: Christian Schneider Authored: Wed Mar 30 13:43:41 2016 +0200 Committer: Christian Schneider Committed: Wed Mar 30 13:43:41 2016 +0200 ---------------------------------------------------------------------- discovery/local/pom.xml | 7 +++++ .../zookeeper/publish/DiscoveryPlugin.java | 4 +-- .../PublishingEndpointListenerFactory.java | 2 ++ parent/pom.xml | 29 ++++++++++++++++++++ pom.xml | 11 +++----- .../aries/rsa/spi/DistributionProvider.java | 4 +-- .../org/apache/aries/rsa/spi/ExportPolicy.java | 2 +- .../exporter/TopologyManagerExport.java | 3 +- 8 files changed, 48 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/50274e59/discovery/local/pom.xml ---------------------------------------------------------------------- diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index 05bd581..9da464e 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -65,6 +65,13 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + org.osgi.* + + http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/50274e59/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/DiscoveryPlugin.java ---------------------------------------------------------------------- diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/DiscoveryPlugin.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/DiscoveryPlugin.java index 033bee2..41afbf2 100644 --- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/DiscoveryPlugin.java +++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/DiscoveryPlugin.java @@ -26,11 +26,11 @@ import java.util.Map; * It can be useful for situations where a host name or port number needs to be changed in cases where the host running * the service is known differently from the outside to what the local Java process thinks it is. * Extra service properties can also be added to the registration which can be useful to refine the remote service - * lookup process.

+ * lookup process.

* * DiscoveryPlugins use the OSGi WhiteBoard pattern. To add one to the system, register an instance under this interface * with the OSGi Service Registry. All registered DiscoveryPlugin instances are visited and given a chance to - * process the information before it is pushed into ZooKeeper.

+ * process the information before it is pushed into ZooKeeper.

* * Note that the changes made using this plugin do not modify the local service registration. * http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/50274e59/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/PublishingEndpointListenerFactory.java ---------------------------------------------------------------------- diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/PublishingEndpointListenerFactory.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/PublishingEndpointListenerFactory.java index 1eabec3..e4ce7b6 100644 --- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/PublishingEndpointListenerFactory.java +++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/publish/PublishingEndpointListenerFactory.java @@ -96,6 +96,8 @@ public class PublishingEndpointListenerFactory implements ServiceFactory getListeners() { synchronized (listeners) { http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/50274e59/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 75bb1c3..bf68785 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -255,4 +255,33 @@ + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/50274e59/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9982341..3ad6895 100644 --- a/pom.xml +++ b/pom.xml @@ -21,16 +21,13 @@ 4.0.0 - org.apache - apache - 14 - + org.apache.aries.rsa + org.apache.aries.rsa.parent + 1.8-SNAPSHOT + parent/pom.xml - org.apache.aries.rsa org.apache.aries.rsa.main - 1.8-SNAPSHOT - pom Aries Remote Service Admin Main http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/50274e59/spi/src/main/java/org/apache/aries/rsa/spi/DistributionProvider.java ---------------------------------------------------------------------- diff --git a/spi/src/main/java/org/apache/aries/rsa/spi/DistributionProvider.java b/spi/src/main/java/org/apache/aries/rsa/spi/DistributionProvider.java index 8f78f14..31d61bd 100644 --- a/spi/src/main/java/org/apache/aries/rsa/spi/DistributionProvider.java +++ b/spi/src/main/java/org/apache/aries/rsa/spi/DistributionProvider.java @@ -46,11 +46,9 @@ public interface DistributionProvider { * @param interfaces interfaces of the service to proxy * @param endpoint description of the remote endpoint * @return service proxy to be given to the requesting bundle - * @throws IntentUnsatisfiedException */ Object importEndpoint(ClassLoader cl, BundleContext consumerContext, Class[] interfaces, - EndpointDescription endpoint) - throws IntentUnsatisfiedException; + EndpointDescription endpoint); } http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/50274e59/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java ---------------------------------------------------------------------- diff --git a/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java b/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java index ace717f..b143500 100644 --- a/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java +++ b/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java @@ -39,7 +39,7 @@ public interface ExportPolicy { * if the original service or the additional properties contain the * non empty property service.exported.interfaces. * - * @param service to export + * @param sref service to export * @return additional properties for exported Service (must not be null) */ Map additionalParameters(ServiceReference sref); http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/50274e59/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 645802c..430bed7 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 @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; /** * Manages exported endpoints of DOSGi services and notifies EndpointListeners of changes. - * + *

Tracks local RemoteServiceAdmin instances by using a ServiceTracker *
Uses a ServiceListener to track local OSGi services *
When a service is published that is supported by DOSGi the @@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory; * the EndpointListeners are notified *
When a service is unpublished the EndpointListeners are notified. * The endpoints are not closed as the ExportRegistration takes care of this + *

*/ public class TopologyManagerExport implements ServiceListener { private static final Logger LOG = LoggerFactory.getLogger(TopologyManagerExport.class);