airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1444208 - in /airavata/trunk: ./ modules/airavata-client/src/main/java/org/apache/airavata/client/api/ modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ modules/distribution/airavata-server/ modules/distribution/airava...
Date Fri, 08 Feb 2013 19:59:03 GMT
Author: samindaw
Date: Fri Feb  8 19:59:02 2013
New Revision: 1444208

URL: http://svn.apache.org/r1444208
Log:
removing GFacService, updating API & removing gfac service

Removed:
    airavata/trunk/modules/gfac-axis2/
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
    airavata/trunk/modules/distribution/airavata-server/pom.xml
    airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
    airavata/trunk/pom.xml

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=1444208&r1=1444207&r2=1444208&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
Fri Feb  8 19:59:02 2013
@@ -34,27 +34,30 @@ 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;
+    /**
+     * @deprecated - The GFaC service is deprecated from 0.7 version onwards
+     * Return a list of GFaC service urls registered in the system
+     * @return 0 or more urls
+     * @throws AiravataAPIInvocationException
+     */
+	public List<URI> getGFaCURLs() throws AiravataAPIInvocationException;
+
+    /**
+     * @deprecated - The GFaC service is deprecated from 0.7 version onwards
+     * 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;
+
+    /**
+     * @deprecated - The GFaC service is deprecated from 0.7 version onwards
+     * 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
@@ -145,7 +148,12 @@ public interface AiravataManager {
     public void removeAllConfiguration(String key) throws AiravataAPIInvocationException;
 
     public void removeConfiguration(String key, String value) throws AiravataAPIInvocationException;
-
+    
+    /**
+     * @deprecated - The GFaC service is deprecated from 0.7 version onwards
+     * @param uri
+     * @throws AiravataAPIInvocationException
+     */
     public void addGFacURI(URI uri) throws AiravataAPIInvocationException;
 
     public void addWorkflowInterpreterURI(URI uri) throws AiravataAPIInvocationException;
@@ -153,7 +161,13 @@ public interface AiravataManager {
     public void setEventingURI(URI uri) throws AiravataAPIInvocationException;
 
     public void setMessageBoxURI(URI uri) throws AiravataAPIInvocationException;
-
+    
+    /**
+     * @deprecated - The GFaC service is deprecated from 0.7 version onwards
+     * @param uri
+     * @param expire
+     * @throws AiravataAPIInvocationException
+     */
     public void addGFacURI(URI uri, Date expire) throws AiravataAPIInvocationException;
 
     public void addWorkflowInterpreterURI(URI uri, Date expire) throws AiravataAPIInvocationException;
@@ -162,8 +176,17 @@ public interface AiravataManager {
 
     public void setMessageBoxURI(URI uri, Date expire) throws AiravataAPIInvocationException;
 
+    /**
+     * @deprecated - The GFaC service is deprecated from 0.7 version onwards
+     * @param uri
+     * @throws AiravataAPIInvocationException
+     */
     public void removeGFacURI(URI uri) throws AiravataAPIInvocationException ;
 
+    /**
+     * @deprecated - The GFaC service is deprecated from 0.7 version onwards
+     * @throws AiravataAPIInvocationException
+     */
     public void removeAllGFacURI() throws AiravataAPIInvocationException;
 
     public void removeWorkflowInterpreterURI(URI uri) throws AiravataAPIInvocationException;

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=1444208&r1=1444207&r2=1444208&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
Fri Feb  8 19:59:02 2013
@@ -41,6 +41,36 @@ public class AiravataManagerImpl impleme
 	}
 
 	@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{
 		try {
 			return getClient().getRegistryClient().getWorkflowInterpreterURIs();

Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1444208&r1=1444207&r2=1444208&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Fri Feb  8 19:59:02 2013
@@ -451,11 +451,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-gfac-axis2-interface</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15</artifactId>
             <version>1.45</version>

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1444208&r1=1444207&r2=1444208&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
(original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
Fri Feb  8 19:59:02 2013
@@ -293,7 +293,6 @@
                 <include>org.apache.airavata:airavata-message-box:jar</include>
                 <include>org.apache.airavata:airavata-message-broker:jar</include>
                 <include>org.apache.airavata:airavata-xbaya-gui:jar</include>
-                <include>org.apache.airavata:airavata-gfac-axis2-interface:jar</include>
                 <include>org.apache.airavata:airavata-registry-service:jar</include>
             </includes>
         </dependencySet>

Modified: airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java?rev=1444208&r1=1444207&r2=1444208&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
(original)
+++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
Fri Feb  8 19:59:02 2013
@@ -193,13 +193,11 @@ public class BaseCaseIT {
 
             URI eventingServiceURL = airavataAPI.getAiravataManager().getEventingServiceURL();
 
-            URI gFaCURL = airavataAPI.getAiravataManager().getGFaCURL();
-
             URI messageBoxServiceURL = airavataAPI.getAiravataManager().getMessageBoxServiceURL();
 
             URI workflowInterpreterServiceURL = airavataAPI.getAiravataManager().getWorkflowInterpreterServiceURL();
 
-            if (eventingServiceURL == null || gFaCURL == null || messageBoxServiceURL ==
null
+            if (eventingServiceURL == null || messageBoxServiceURL == null
                     || workflowInterpreterServiceURL == null) {
 
                 log.info("Waiting till server initializes ........");
@@ -237,9 +235,6 @@ public class BaseCaseIT {
         URI eventingServiceURL = this.airavataAPI.getAiravataManager().getEventingServiceURL();
         Assert.assertNotNull(eventingServiceURL);
 
-        URI gFaCURL = this.airavataAPI.getAiravataManager().getGFaCURL();
-        Assert.assertNotNull(gFaCURL);
-
         URI messageBoxServiceURL = this.airavataAPI.getAiravataManager().getMessageBoxServiceURL();
         Assert.assertNotNull(messageBoxServiceURL);
     }

Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1444208&r1=1444207&r2=1444208&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Fri Feb  8 19:59:02 2013
@@ -436,7 +436,6 @@
 			</activation>
 			<modules>
 				<module>modules/gfac-core</module>
-				<module>modules/gfac-axis2</module>
 				<module>modules/ws-messenger</module>
 				<module>modules/workflow-model</module>
 				<module>modules/xbaya-gui</module>



Mime
View raw message