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 <[email protected]> Authored: Wed Mar 30 13:43:41 2016 +0200 Committer: Christian Schneider <[email protected]> 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 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <excludePackageNames>org.osgi.*</excludePackageNames> + </configuration> + </plugin> </plugins> </build> </project> 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. <p/> + * lookup process. <p> * * 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. <p/> + * process the information before it is pushed into ZooKeeper. <p> * * 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<Publish /** * Only for the test case! + * + * @return */ protected List<PublishingEndpointListener> 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 @@ </pluginRepository> </pluginRepositories> + <profiles> + <profile> + <id>release-sign-artifacts</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>14</version> - <relativePath /> + <groupId>org.apache.aries.rsa</groupId> + <artifactId>org.apache.aries.rsa.parent</artifactId> + <version>1.8-SNAPSHOT</version> + <relativePath>parent/pom.xml</relativePath> </parent> - <groupId>org.apache.aries.rsa</groupId> <artifactId>org.apache.aries.rsa.main</artifactId> - <version>1.8-SNAPSHOT</version> - <packaging>pom</packaging> <name>Aries Remote Service Admin Main</name> 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<String, ?> 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. - * + * <ul> * <li> Tracks local RemoteServiceAdmin instances by using a ServiceTracker * <li> Uses a ServiceListener to track local OSGi services * <li> When a service is published that is supported by DOSGi the @@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory; * the EndpointListeners are notified * <li> When a service is unpublished the EndpointListeners are notified. * The endpoints are not closed as the ExportRegistration takes care of this + * </ul> */ public class TopologyManagerExport implements ServiceListener { private static final Logger LOG = LoggerFactory.getLogger(TopologyManagerExport.class);
