You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/06/30 20:39:29 UTC
[1/3] airavata git commit: WIP
Repository: airavata
Updated Branches:
refs/heads/develop 2a00dd267 -> 324a9f77e
WIP
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a860fd9c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a860fd9c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a860fd9c
Branch: refs/heads/develop
Commit: a860fd9c5c7ad69015999a6758b1cb9461a756b2
Parents: 94508b6
Author: scnakandala <su...@gmail.com>
Authored: Fri Jun 30 16:38:11 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jun 30 16:38:11 2017 -0400
----------------------------------------------------------------------
.../airavata/gfac/impl/HPCRemoteCluster.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a860fd9c/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
index 1e8a2f1..65b4a1b 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
@@ -207,11 +207,20 @@ public class HPCRemoteCluster extends AbstractRemoteCluster{
List<String> fileNames = SSHUtils.listDirectory(parentPath, session);
List<String> matchingNames = new ArrayList<>();
for(String fileName : fileNames){
- if(fileName.matches(fileRegex)){
- log.info("File name matched for " + fileRegex + " : " + fileName);
+ String tempFileName = fileName;
+ String[] splits = fileRegex.split("\\*");
+ boolean matching = true;
+ for(String split : splits){
+ if(!tempFileName.contains(split)){
+ matching = false;
+ break;
+ }else{
+ int idx = tempFileName.indexOf(split);
+ tempFileName = tempFileName.substring(idx + split.length());
+ }
+ }
+ if(matching){
matchingNames.add(fileName);
- }else{
- log.info("File name not matched for " + fileRegex + " : " + fileName);
}
}
log.warn("No matching file found for extension: " + fileRegex + " in the " + parentPath + " directory");
[2/3] airavata git commit: adding user profile client,
which was accidently deleted in last commit
Posted by sc...@apache.org.
adding user profile client, which was accidently deleted in last commit
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/66d98bcf
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/66d98bcf
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/66d98bcf
Branch: refs/heads/develop
Commit: 66d98bcfcb88e7d868adeda527db6bb4bee04171
Parents: a860fd9
Author: Anuj Bhandar <bh...@gmail.com>
Authored: Wed Jan 25 15:10:30 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jun 30 16:38:16 2017 -0400
----------------------------------------------------------------------
.../client/UserProfileServiceClientFactory.java | 43 ++++++++++++++++++++
1 file changed, 43 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/66d98bcf/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/cpi/client/UserProfileServiceClientFactory.java
----------------------------------------------------------------------
diff --git a/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/cpi/client/UserProfileServiceClientFactory.java b/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/cpi/client/UserProfileServiceClientFactory.java
new file mode 100644
index 0000000..dccecce
--- /dev/null
+++ b/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/cpi/client/UserProfileServiceClientFactory.java
@@ -0,0 +1,43 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.airavata.userprofile.cpi.client;
+
+import org.apache.airavata.userprofile.cpi.exception.UserProfileServiceException;
+import org.apache.airavata.userprofile.cpi.UserProfileService;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
+
+
+public class UserProfileServiceClientFactory {
+ public static UserProfileService.Client createRegistryClient(String serverHost, int serverPort) throws UserProfileServiceException {
+ try {
+ TTransport transport = new TSocket(serverHost, serverPort);
+ transport.open();
+ TProtocol protocol = new TBinaryProtocol(transport);
+ return new UserProfileService.Client(protocol);
+ } catch (TTransportException e) {
+ throw new UserProfileServiceException();
+ }
+ }
+}
\ No newline at end of file
[3/3] airavata git commit: merge
Posted by sc...@apache.org.
merge
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/324a9f77
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/324a9f77
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/324a9f77
Branch: refs/heads/develop
Commit: 324a9f77e87c7b8b949cf8dec892a7a59d49c96a
Parents: 66d98bc 2a00dd2
Author: scnakandala <su...@gmail.com>
Authored: Fri Jun 30 16:38:56 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jun 30 16:38:56 2017 -0400
----------------------------------------------------------------------
.../airavata/service/security/KeyCloakSecurityManager.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------