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 2017/05/03 10:19:36 UTC
[1/2] aries-rsa git commit: Document two container usage
Repository: aries-rsa
Updated Branches:
refs/heads/master b4a95725d -> 5de5bf0b6
Document two container usage
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/9380890a
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/9380890a
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/9380890a
Branch: refs/heads/master
Commit: 9380890ad9e75e3db8704cbb29bc14bc40ba37d1
Parents: b4a9572
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed May 3 12:19:14 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed May 3 12:19:14 2017 +0200
----------------------------------------------------------------------
.../org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/9380890a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java
index f839dea..db941fc 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java
@@ -29,6 +29,12 @@ import org.ops4j.pax.exam.TestContainer;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.PaxExamRuntime;
+/**
+ * Can be used instead of the PaxExam runner to start a second
+ * OSGi container that typically hosts the server side for the test.
+ *
+ * Use the @ServerConfiguration annotation to mark the config of your server side
+ */
public class TwoContainerPaxExam extends PaxExam {
private Class<?> testClass;
[2/2] aries-rsa git commit: Fix itest by using different ports
Posted by cs...@apache.org.
Fix itest by using different ports
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/5de5bf0b
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/5de5bf0b
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/5de5bf0b
Branch: refs/heads/master
Commit: 5de5bf0b6c73c86e6a168af4423b5dc2675065b5
Parents: 9380890
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed May 3 12:19:31 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed May 3 12:19:31 2017 +0200
----------------------------------------------------------------------
.../aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/5de5bf0b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
index 95bcae0..afd8cf9 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
@@ -35,6 +35,8 @@ import org.ops4j.pax.exam.Option;
@RunWith(TwoContainerPaxExam.class)
public class TestFastbinRoundTrip extends RsaTestBase {
+ private static final String FASTBIN_PORT_SERVER = "2544";
+ private static final String FASTBIN_PORT_CLIENT = "2545";
@Inject
EchoService echoService;
@@ -48,7 +50,7 @@ public class TestFastbinRoundTrip extends RsaTestBase {
echoTcpService(), //
configZKServer(), //
configZKDiscovery(), //
- configFastBinPort("2544"),
+ configFastBinPort(FASTBIN_PORT_SERVER),
};
}
@@ -61,7 +63,7 @@ public class TestFastbinRoundTrip extends RsaTestBase {
rsaProviderFastBin(), //
echoTcpConsumer(), //
configZKDiscovery(), //
- configFastBinPort("2545")
+ configFastBinPort(FASTBIN_PORT_CLIENT)
};
}