Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 44F8F200B0F for ; Fri, 17 Jun 2016 18:40:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 434CC160A61; Fri, 17 Jun 2016 16:40:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8BBD0160A4C for ; Fri, 17 Jun 2016 18:40:28 +0200 (CEST) Received: (qmail 39345 invoked by uid 500); 17 Jun 2016 16:40:27 -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 39334 invoked by uid 99); 17 Jun 2016 16:40:27 -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; Fri, 17 Jun 2016 16:40:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 93AE2E049D; Fri, 17 Jun 2016 16:40:27 +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: [ARIES-1576] Prefix properties of TcpEndpoint Date: Fri, 17 Jun 2016 16:40:27 +0000 (UTC) archived-at: Fri, 17 Jun 2016 16:40:29 -0000 Repository: aries-rsa Updated Branches: refs/heads/master e4b221dfd -> a8d170a85 [ARIES-1576] Prefix properties of TcpEndpoint Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/a8d170a8 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/a8d170a8 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/a8d170a8 Branch: refs/heads/master Commit: a8d170a85e38bcf1975d30e934e5c87380a27d6b Parents: e4b221d Author: Christian Schneider Authored: Fri Jun 17 18:40:20 2016 +0200 Committer: Christian Schneider Committed: Fri Jun 17 18:40:20 2016 +0200 ---------------------------------------------------------------------- .../aries/rsa/examples/echotcp/service/EchoServiceImpl.java | 8 +++++--- .../org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/a8d170a8/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 ee7f3a4..4c86e0f 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,9 +3,11 @@ 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=*", "port=8201" -}) +@Component(// + property = { + "service.exported.interfaces=*", // + "aries.rsa.port=8201" + }) public class EchoServiceImpl implements EchoService { @Override http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/a8d170a8/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java ---------------------------------------------------------------------- diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java index 70ca44e..0f80df2 100644 --- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java +++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java @@ -27,8 +27,6 @@ import javax.inject.Inject; import org.apache.aries.rsa.examples.echotcp.api.EchoService; import org.apache.aries.rsa.itests.felix.RsaTestBase; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration;