You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/07/07 01:39:25 UTC
svn commit: r1358470 - in
/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client:
./ airavata/ impl/
Author: samindaw
Date: Fri Jul 6 23:39:25 2012
New Revision: 1358470
URL: http://svn.apache.org/viewvc?rev=1358470&view=rev
Log:
AiravataAPI object retrieving location change + disallowing creating airavataclient object by 3rd party
Added:
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
- copied, changed from r1358386, incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java
- copied, changed from r1358386, incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClientConfiguration.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java
Removed:
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/
Modified:
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/UserManagerImpl.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java
Copied: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java (from r1358386, incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?p2=incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java&p1=incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java&r1=1358386&r2=1358470&rev=1358470&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java Fri Jul 6 23:39:25 2012
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.airavata.client.airavata;
+package org.apache.airavata.client;
import java.io.File;
import java.io.FileInputStream;
@@ -126,13 +126,13 @@ public class AiravataClient implements A
private static final Version API_VERSION=new Version("Airavata",0,1,null,"INCUBATING",null);
- public AiravataClient(Map<String,String> configuration)
+ protected AiravataClient(Map<String,String> configuration)
throws MalformedURLException {
this.configuration = configuration;
initialize();
}
- public AiravataClient(String fileName) throws RegistryException,
+ protected AiravataClient(String fileName) throws RegistryException,
MalformedURLException, IOException {
URL url = this. getClass().getClassLoader().getResource(fileName);
if (url == null) {
@@ -160,7 +160,7 @@ public class AiravataClient implements A
initialize();
}
- public AiravataClient(URI registryUrl, String username, String password) throws MalformedURLException, RepositoryException, RegistryException {
+ protected AiravataClient(URI registryUrl, String username, String password) throws MalformedURLException, RepositoryException, RegistryException {
this(createConfig(registryUrl, username, password));
}
@@ -191,7 +191,7 @@ public class AiravataClient implements A
//TODO: At some point this should contain the current user the airavata client is
//logged in to the Airavata system
- currentUser=getClientConfiguration().getJcrUsername();
+ setCurrentUser(getClientConfiguration().getJcrUsername());
}
private void updateClientConfiguration(Map<String,String> configuration)
@@ -805,4 +805,8 @@ public class AiravataClient implements A
return API_VERSION;
}
+ public void setCurrentUser(String currentUser) {
+ this.currentUser = currentUser;
+ }
+
}
Copied: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java (from r1358386, incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClientConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java?p2=incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java&p1=incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClientConfiguration.java&r1=1358386&r2=1358470&rev=1358470&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClientConfiguration.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java Fri Jul 6 23:39:25 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.client.airavata;
+package org.apache.airavata.client;
import java.net.URL;
Added: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java?rev=1358470&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java (added)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java Fri Jul 6 23:39:25 2012
@@ -0,0 +1,42 @@
+/*
+ *
+ * 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.client;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.common.registry.api.exception.RegistryException;
+
+public class AiravataClientUtils {
+ public static AiravataAPI getAPI(URI registryURL, String username, String password) throws MalformedURLException, RepositoryException, RegistryException{
+ return getAPI(registryURL, username, password, username);
+ }
+
+ public static AiravataAPI getAPI(URI registryURL, String username, String password, String alternateUsername) throws MalformedURLException, RepositoryException, RegistryException{
+ AiravataClient apiObj = new AiravataClient(registryURL, username, password);
+ apiObj.setCurrentUser(alternateUsername);
+ return apiObj;
+ }
+}
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java?rev=1358470&r1=1358469&r2=1358470&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java Fri Jul 6 23:39:25 2012
@@ -26,7 +26,7 @@ import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.client.airavata.AiravataClient;
+import org.apache.airavata.client.AiravataClient;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.AiravataManager;
import org.apache.airavata.common.registry.api.exception.RegistryException;
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java?rev=1358470&r1=1358469&r2=1358470&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java Fri Jul 6 23:39:25 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.client.impl;
import java.util.List;
import java.util.Map;
-import org.apache.airavata.client.airavata.AiravataClient;
+import org.apache.airavata.client.AiravataClient;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.ApplicationManager;
import org.apache.airavata.common.registry.api.exception.RegistryException;
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java?rev=1358470&r1=1358469&r2=1358470&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java Fri Jul 6 23:39:25 2012
@@ -24,8 +24,8 @@ package org.apache.airavata.client.impl;
import java.util.Calendar;
import java.util.List;
-import org.apache.airavata.client.airavata.AiravataClient;
-import org.apache.airavata.client.airavata.AiravataClientConfiguration;
+import org.apache.airavata.client.AiravataClient;
+import org.apache.airavata.client.AiravataClientConfiguration;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.ExecutionManager;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java?rev=1358470&r1=1358469&r2=1358470&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java Fri Jul 6 23:39:25 2012
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.airavata.client.airavata.AiravataClient;
+import org.apache.airavata.client.AiravataClient;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.ProvenanceManager;
import org.apache.airavata.common.registry.api.exception.RegistryException;
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/UserManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/UserManagerImpl.java?rev=1358470&r1=1358469&r2=1358470&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/UserManagerImpl.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/UserManagerImpl.java Fri Jul 6 23:39:25 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.client.impl;
-import org.apache.airavata.client.airavata.AiravataClient;
+import org.apache.airavata.client.AiravataClient;
import org.apache.airavata.client.api.UserManager;
public class UserManagerImpl implements UserManager {
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java?rev=1358470&r1=1358469&r2=1358470&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java Fri Jul 6 23:39:25 2012
@@ -31,7 +31,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.ValueFormatException;
import javax.xml.namespace.QName;
-import org.apache.airavata.client.airavata.AiravataClient;
+import org.apache.airavata.client.AiravataClient;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.WorkflowManager;
import org.apache.airavata.common.registry.api.exception.RegistryException;