You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/03/21 23:45:09 UTC
[1/2] incubator-quarks git commit: [QUARKS-52] fix test keystore path
formation on windows
Repository: incubator-quarks
Updated Branches:
refs/heads/master 873aba0e7 -> eb9153184
[QUARKS-52] fix test keystore path formation on windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/a6fb9109
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/a6fb9109
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/a6fb9109
Branch: refs/heads/master
Commit: a6fb910926cc78de102d1742789f8a8d3d627e63
Parents: cf1c70d
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Mar 21 18:28:07 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Mar 21 18:28:07 2016 -0400
----------------------------------------------------------------------
.../wsclient/javax/websocket/KeystorePath.java | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/a6fb9109/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/KeystorePath.java
----------------------------------------------------------------------
diff --git a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/KeystorePath.java b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/KeystorePath.java
index f75b64a..600a993 100644
--- a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/KeystorePath.java
+++ b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/KeystorePath.java
@@ -5,22 +5,25 @@
package quarks.tests.connectors.wsclient.javax.websocket;
import java.io.File;
+import java.nio.file.Path;
public class KeystorePath {
public static String getStorePath(String storeLeaf) {
- String path = System.getProperty("user.dir");
+ String pathStr = System.getProperty("user.dir");
// Under eclipse/junit: path to project in repo: <repo>/connectors
// Under ant/junit: <repo>/connectors/<project>/unittests/testrunxxxxxxx
- if (!path.endsWith("/connectors")) {
- int indx = path.indexOf("/connectors/");
- indx += "/connectors/".length() - 1;
- path = path.substring(0, indx);
- }
- path += "/wsclient-javax.websocket/src/test/keystores/" + storeLeaf;
- if (!new File(path).exists())
+ // Get the path to the <repo>/connectors
+ Path path = new File(pathStr).toPath();
+ do {
+ if (path.endsWith("connectors"))
+ break;
+ path = path.getParent();
+ } while (path.getNameCount() > 0);
+ path = path.resolve("wsclient-javax.websocket/src/test/keystores/" + storeLeaf);
+ if (!path.toFile().exists())
throw new IllegalArgumentException("File does not exist: "+path);
- return path;
+ return path.toString();
}
}
[2/2] incubator-quarks git commit: Merge pull request #33
Posted by dl...@apache.org.
Merge pull request #33
This closes #33
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/eb915318
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/eb915318
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/eb915318
Branch: refs/heads/master
Commit: eb91531847b45b760fadba449187c52400415d24
Parents: 873aba0 a6fb910
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Mar 21 18:44:57 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Mar 21 18:44:57 2016 -0400
----------------------------------------------------------------------
.../wsclient/javax/websocket/KeystorePath.java | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------