Author: lahiru
Date: Thu Feb 7 17:19:58 2013
New Revision: 1443608
URL: http://svn.apache.org/viewvc?rev=1443608&view=rev
Log:
removing gfac-url dependency.
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java?rev=1443608&r1=1443607&r2=1443608&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java
Thu Feb 7 17:19:58 2013
@@ -34,27 +34,27 @@ import java.util.List;
*/
public interface AiravataManager {
- /**
- * Return a list of GFaC service urls registered in the system
- * @return 0 or more urls
- * @throws AiravataAPIInvocationException
- */
- public List<URI> getGFaCURLs() throws AiravataAPIInvocationException;
-
- /**
- * Return a the first GFaC service url registered in the system
- * @return url or null if a url is not registered
- * @throws AiravataAPIInvocationException
- */
- public URI getGFaCURL() throws AiravataAPIInvocationException;
-
- /**
- * Return a the first GFaC service url registered in the system orelse
return the <code>defaultURL</code>
- * @param defaultURL
- * @return url
- * @throws AiravataAPIInvocationException
- */
- public URI getGFaCURL(URI defaultURL) throws
AiravataAPIInvocationException;
+// /**
+// * Return a list of GFaC service urls registered in the system
+// * @return 0 or more urls
+// * @throws AiravataAPIInvocationException
+// */
+// public List<URI> getGFaCURLs() throws AiravataAPIInvocationException;
+//
+// /**
+// * Return a the first GFaC service url registered in the system
+// * @return url or null if a url is not registered
+// * @throws AiravataAPIInvocationException
+// */
+// public URI getGFaCURL() throws AiravataAPIInvocationException;
+//
+// /**
+// * Return a the first GFaC service url registered in the system orelse
return the <code>defaultURL</code>
+// * @param defaultURL
+// * @return url
+// * @throws AiravataAPIInvocationException
+// */
+// public URI getGFaCURL(URI defaultURL) throws
AiravataAPIInvocationException;
/**
* Return a list of Workflow Interpreter service urls registered in the
system
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java?rev=1443608&r1=1443607&r2=1443608&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
Thu Feb 7 17:19:58 2013
@@ -39,37 +39,6 @@ public class AiravataManagerImpl impleme
public AiravataManagerImpl(AiravataClient client) {
setClient(client);
}
-
- @Override
- public List<URI> getGFaCURLs() throws AiravataAPIInvocationException{
- List<URI> list=new ArrayList<URI>();
- try {
- List<URI> gFacDescriptorList =
getClient().getRegistryClient().getGFacURIs();
- for (URI url : gFacDescriptorList) {
- list.add(url);
- }
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- return list;
- }
-
- @Override
- public URI getGFaCURL() throws AiravataAPIInvocationException{
- try {
- return
getClient().getClientConfiguration().getGfacURL().toURI();
- } catch (URISyntaxException e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
-
- @Override
- public URI getGFaCURL(URI defaultURL) throws
AiravataAPIInvocationException{
- if (getGFaCURL()==null){
- return defaultURL;
- }
- return getGFaCURL();
- }
@Override
public List<URI> getWorkflowInterpreterServiceURLs() throws
AiravataAPIInvocationException{
