Repository: aries-rsa Updated Branches: refs/heads/master c3389e01a -> 6bc766bc7
[ARIES-1509] Adding repository and fixing some 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/6bc766bc Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/6bc766bc Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/6bc766bc Branch: refs/heads/master Commit: 6bc766bc790991658c662784ccaa742d75bb3231 Parents: c3389e0 Author: Christian Schneider <[email protected]> Authored: Mon Mar 21 13:21:33 2016 +0100 Committer: Christian Schneider <[email protected]> Committed: Mon Mar 21 13:21:33 2016 +0100 ---------------------------------------------------------------------- discovery/zookeeper/pom.xml | 1 - examples/echotcp/service/bnd.bnd | 1 - .../echotcp/service/EchoServiceImpl.java | 2 +- pom.xml | 1 + repository/pom.xml | 34 ++++++++++++++------ topology-manager/pom.xml | 1 + 6 files changed, 28 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/6bc766bc/discovery/zookeeper/pom.xml ---------------------------------------------------------------------- diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index b259ee1..389704c 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -45,7 +45,6 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/6bc766bc/examples/echotcp/service/bnd.bnd ---------------------------------------------------------------------- diff --git a/examples/echotcp/service/bnd.bnd b/examples/echotcp/service/bnd.bnd index 73d19a4..e69de29 100644 --- a/examples/echotcp/service/bnd.bnd +++ b/examples/echotcp/service/bnd.bnd @@ -1 +0,0 @@ -Export-Package: org.apache.aries.rsa.examples.echotcp.api \ No newline at end of file http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/6bc766bc/examples/echotcp/service/src/main/java/org/apache/aries/rsa/examples/echotcp/service/EchoServiceImpl.java ---------------------------------------------------------------------- diff --git a/examples/echotcp/service/src/main/java/org/apache/aries/rsa/examples/echotcp/service/EchoServiceImpl.java b/examples/echotcp/service/src/main/java/org/apache/aries/rsa/examples/echotcp/service/EchoServiceImpl.java index 8b31e03..44f877f 100644 --- a/examples/echotcp/service/src/main/java/org/apache/aries/rsa/examples/echotcp/service/EchoServiceImpl.java +++ b/examples/echotcp/service/src/main/java/org/apache/aries/rsa/examples/echotcp/service/EchoServiceImpl.java @@ -3,7 +3,7 @@ package org.apache.aries.rsa.examples.echotcp.service; import org.apache.aries.rsa.examples.echotcp.api.EchoService; import org.osgi.service.component.annotations.Component; -@Component(property={"service.exported.interfaces=*"}) +@Component(property={"service.exported.interfaces=*", "port=8201"}) public class EchoServiceImpl implements EchoService { @Override http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/6bc766bc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6543dec..254a676 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,7 @@ <module>provider</module> <module>discovery</module> <module>examples</module> + <module>repository</module> <module>features</module> <module>itests</module> </modules> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/6bc766bc/repository/pom.xml ---------------------------------------------------------------------- diff --git a/repository/pom.xml b/repository/pom.xml index 06c85aa..25b0278 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.aries.rsa</groupId> - <artifactId>parent</artifactId> + <artifactId>org.apache.aries.rsa.parent</artifactId> <version>1.8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -37,10 +37,13 @@ <plugin> <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-indexer-maven-plugin</artifactId> - <version>${bnd.version}</version> + <version>3.1.0</version> <configuration> <localURLs>${local.index.policy}</localURLs> <includeTransitive>true</includeTransitive> + <scopes> + <scope>runtime</scope> + </scopes> </configuration> <executions> <execution> @@ -56,27 +59,40 @@ <dependencies> <dependency> <groupId>org.apache.aries.rsa</groupId> - <artifactId>rsa</artifactId> + <artifactId>org.apache.aries.rsa.core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.aries.rsa</groupId> + <artifactId>org.apache.aries.rsa.spi</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.rsa</groupId> + <artifactId>org.apache.aries.rsa.topology-manager</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.rsa.provider</groupId> - <artifactId>tcp</artifactId> + <artifactId>org.apache.aries.rsa.provider.tcp</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.rsa.discovery</groupId> - <artifactId>zookeeper</artifactId> + <artifactId>org.apache.aries.rsa.discovery.zookeeper</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.rsa.discovery</groupId> - <artifactId>zookeeper-server</artifactId> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.rsa.examples.echotcp</groupId> + <artifactId>org.apache.aries.rsa.examples.echotcp.service</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.rsa.discovery</groupId> - <artifactId>zookeeper-server-config</artifactId> + <groupId>org.apache.aries.rsa.examples.echotcp</groupId> + <artifactId>org.apache.aries.rsa.examples.echotcp.consumer</artifactId> <version>${project.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/6bc766bc/topology-manager/pom.xml ---------------------------------------------------------------------- diff --git a/topology-manager/pom.xml b/topology-manager/pom.xml index 04ba817..cd32e75 100644 --- a/topology-manager/pom.xml +++ b/topology-manager/pom.xml @@ -46,6 +46,7 @@ <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> <version>1.3</version> + <scope>test</scope> </dependency> </dependencies>
