airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1399356 [2/3] - in /airavata/trunk/modules: airavata-client/src/main/java/org/apache/airavata/client/ airavata-client/src/main/java/org/apache/airavata/client/impl/ airavata-client/src/test/java/org/apache/airavata/client/airavata/ commons...
Date Wed, 17 Oct 2012 17:27:17 GMT
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentLazyLoadedException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentLazyLoadedException.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentLazyLoadedException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentLazyLoadedException.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception.worker;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 
 public class ExperimentLazyLoadedException extends RegistryException {
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowAlreadyExistsException.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowAlreadyExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowAlreadyExistsException.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception.worker;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 
 public class UserWorkflowAlreadyExistsException extends RegistryException {
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowDoesNotExistsException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowDoesNotExistsException.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowDoesNotExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowDoesNotExistsException.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception.worker;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 
 public class UserWorkflowDoesNotExistsException extends RegistryException {
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceAlreadyExistsException.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceAlreadyExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceAlreadyExistsException.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception.worker;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 
 public class WorkflowInstanceAlreadyExistsException extends RegistryException {
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception.worker;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 
 public class WorkflowInstanceDoesNotExistsException extends RegistryException {
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeAlreadyExistsException.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeAlreadyExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeAlreadyExistsException.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception.worker;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 
 public class WorkflowInstanceNodeAlreadyExistsException extends RegistryException {
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception.worker;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 
 public class WorkflowInstanceNodeDoesNotExistsException extends RegistryException {
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectAlreadyExistsException.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectAlreadyExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectAlreadyExistsException.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception.worker;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 
 public class WorkspaceProjectAlreadyExistsException extends RegistryException {
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectDoesNotExistsException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectDoesNotExistsException.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectDoesNotExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectDoesNotExistsException.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception.worker;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 
 public class WorkspaceProjectDoesNotExistsException extends RegistryException {
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java?rev=1399356&r1=1398941&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java Wed Oct 17 17:27:13 2012
@@ -22,14 +22,12 @@ package org.apache.airavata.registry.api
 
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.airavata.common.exception.AiravataConfigurationException;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.AiravataRegistryFactory;
 import org.apache.airavata.registry.api.AiravataUser;
@@ -38,7 +36,6 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.RegistryAccessorInvalidException;
 import org.apache.airavata.registry.api.exception.RegistryAccessorNotFoundException;
 import org.apache.airavata.registry.api.exception.RegistryAccessorUndefinedException;
-import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,18 +78,18 @@ public class RegistryUtils {
         }
         return  urlString;
     }
-    public static boolean validateRegistryCredentials(String userName,String password,String url)throws RegistryException{
-        HashMap<String, String> map = new HashMap<String, String>();
-        map.put("org.apache.jackrabbit.repository.uri", url);
-        try {
-            AiravataJCRRegistry airavataJCRRegistry = new AiravataJCRRegistry(new URI(url), "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", userName, password, map);
-            airavataJCRRegistry.saveGFacDescriptor("dummy");
-//            airavataJCRRegistry.deleteGFacDescriptor("dummy");
-        } catch (Exception e) {
-            throw new RegistryException("Check the properties file for JCR Registry Configuration",e);
-        }
-        return true;
-    }
+//    public static boolean validateRegistryCredentials(String userName,String password,String url)throws RegistryException{
+//        HashMap<String, String> map = new HashMap<String, String>();
+//        map.put("org.apache.jackrabbit.repository.uri", url);
+//        try {
+//            AiravataJCRRegistry airavataJCRRegistry = new AiravataJCRRegistry(new URI(url), "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", userName, password, map);
+//            airavataJCRRegistry.saveGFacDescriptor("dummy");
+////            airavataJCRRegistry.deleteGFacDescriptor("dummy");
+//        } catch (Exception e) {
+//            throw new RegistryException("Check the properties file for JCR Registry Configuration",e);
+//        }
+//        return true;
+//    }
 
     public static AiravataRegistry2 getRegistryFromConfig(URL url) {
         String username = "";

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java Wed Oct 17 17:27:13 2012
@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.airavata.common.exception.AiravataConfigurationException;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.AiravataRegistryConnectionDataProvider;

Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java Wed Oct 17 17:27:13 2012
@@ -134,7 +134,6 @@ public class WseMsgBrokerClient extends 
     }
 
     public boolean unSubscribe(String subscriptionId) throws MsgBrokerClientException {
-
         OMFactory factory = OMAbstractFactory.getOMFactory();
         OMElement message = WSEProtocolClient.createUnsubscribeMsg();
 

Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Wed Oct 17 17:27:13 2012
@@ -29,11 +29,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.common.registry.api.impl.JCRRegistry;
 import org.apache.airavata.common.utils.ServiceUtils;
 import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
 import org.apache.airavata.registry.api.util.RegistryUtils;
 import org.apache.airavata.wsmg.broker.handler.PublishedMessageHandler;
 import org.apache.airavata.wsmg.broker.subscription.SubscriptionManager;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Wed Oct 17 17:27:13 2012
@@ -43,7 +43,7 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.Pair;
 import org.apache.airavata.common.utils.WSDLUtil;
 import org.apache.airavata.common.utils.XMLUtil;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Wed Oct 17 17:27:13 2012
@@ -131,8 +131,8 @@ public class WorkflowInterpretorEventLis
         try {
             if (this.pullMode) {
                 this.messagePuller.stopPulling();
-            } else {
-                this.wseClient.unSubscribe(this.subscriptionID);
+//            } else {
+//                this.wseClient.unSubscribe(this.subscriptionID);
             }
             this.wseClient.unSubscribe(this.subscriptionID);
         } catch (MsgBrokerClientException e) {

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Wed Oct 17 17:27:13 2012
@@ -40,7 +40,7 @@ import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.ServiceUtils;
 import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
 import org.apache.airavata.commons.gfac.type.HostDescription;
@@ -349,12 +349,12 @@ public class WorkflowInterpretorSkeleton
             /*
              * stop listener no matter what happens
              */
-            try {
-                if(listener != null)
-                listener.stop();
-            } catch (MonitorException e) {
-                e.printStackTrace();
-            }
+//            try {
+//                if(listener != null)
+//                listener.stop();
+//            } catch (MonitorException e) {
+//                e.printStackTrace();
+//            }
         }
     }
 

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Wed Oct 17 17:27:13 2012
@@ -39,7 +39,7 @@ import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.commons.gfac.type.ActualParameter;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.xbaya.model.registrybrowser;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java Wed Oct 17 17:27:13 2012
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.registry.api.AiravataRegistry2;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java Wed Oct 17 17:27:13 2012
@@ -21,12 +21,10 @@
 
 package org.apache.airavata.xbaya.model.registrybrowser;
 
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 
 public class GFacURLs {

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java Wed Oct 17 17:27:13 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.xbaya.model.
 
 import java.util.List;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java Wed Oct 17 17:27:13 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.xbaya.model.
 
 import java.util.List;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java Wed Oct 17 17:27:13 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.model.
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.workflow.WorkflowInstance;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceData;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java Wed Oct 17 17:27:13 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.model.
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.workflow.WorkflowInstance;
 

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java Wed Oct 17 17:27:13 2012
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 
 public class XBayaWorkflowExperiments {

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java Wed Oct 17 17:27:13 2012
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 
 public class XBayaWorkflowTemplates {

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java Wed Oct 17 17:27:13 2012
@@ -24,7 +24,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.workflow.WorkflowInstance;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java Wed Oct 17 17:27:13 2012
@@ -20,7 +20,7 @@
 */
 package org.apache.airavata.xbaya.provenance;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.workflow.WorkflowInstance;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java Wed Oct 17 17:27:13 2012
@@ -22,7 +22,7 @@ package org.apache.airavata.xbaya.proven
 
 import java.sql.Timestamp;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.workflow.WorkflowInstance;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Wed Oct 17 17:27:13 2012
@@ -27,7 +27,7 @@ import java.util.Map;
 import javax.jcr.RepositoryException;
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.registry.api.AiravataRegistry2;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java Wed Oct 17 17:27:13 2012
@@ -28,7 +28,7 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptionWrap;
 import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java Wed Oct 17 17:27:13 2012
@@ -28,7 +28,7 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptionWrap;
 import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptions;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java Wed Oct 17 17:27:13 2012
@@ -28,7 +28,7 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java Wed Oct 17 17:27:13 2012
@@ -28,7 +28,7 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.xbaya.model.registrybrowser.HostDescriptions;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java Wed Oct 17 17:27:13 2012
@@ -29,7 +29,7 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptions;
 import org.apache.airavata.xbaya.model.registrybrowser.InputParameters;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java Wed Oct 17 17:27:13 2012
@@ -28,7 +28,7 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.xbaya.model.registrybrowser.ServiceDescriptions;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java Wed Oct 17 17:27:13 2012
@@ -28,7 +28,7 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
 import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowExperiment;
 import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java Wed Oct 17 17:27:13 2012
@@ -29,7 +29,7 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.exception.ServiceDescriptionRetrieveException;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowTemplate;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java Wed Oct 17 17:27:13 2012
@@ -48,7 +48,7 @@ import javax.swing.WindowConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.workflow.model.component.Component;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java Wed Oct 17 17:27:13 2012
@@ -19,8 +19,8 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.dialogs.descriptors;
-
+package org.apache.airavata.xbaya.ui.dialogs.descriptors;
+
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -48,7 +48,7 @@ import javax.swing.JTextField;
 import javax.swing.ProgressMonitor;
 import javax.swing.SwingConstants;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
@@ -65,64 +65,64 @@ import org.apache.airavata.xbaya.ui.widg
 import org.apache.airavata.xbaya.ui.widgets.XBayaLinkButton;
 import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
 import org.apache.xmlbeans.XmlException;
-
-public class ApplicationDescriptionDialog extends JDialog implements ActionListener {
-    /**
-	 * 
-	 */
-    private static final long serialVersionUID = -2745085755585610025L;
-    private XBayaTextField txtExecPath;
-    private XBayaTextField txtAppName;
-    private XBayaTextField txtTempDir;
-
-    private AiravataRegistry2 registry;
-    private ApplicationDeploymentDescription shellApplicationDescription;
-    private JLabel lblError;
-    private boolean applcationDescCreated = false;
-    private JButton okButton;
-
-    private String serviceName;
-    private String hostName;
-    private JComboBox cmbHostName;
-
+
+public class ApplicationDescriptionDialog extends JDialog implements ActionListener {
+    /**
+	 * 
+	 */
+    private static final long serialVersionUID = -2745085755585610025L;
+    private XBayaTextField txtExecPath;
+    private XBayaTextField txtAppName;
+    private XBayaTextField txtTempDir;
+
+    private AiravataRegistry2 registry;
+    private ApplicationDeploymentDescription shellApplicationDescription;
+    private JLabel lblError;
+    private boolean applcationDescCreated = false;
+    private JButton okButton;
+
+    private String serviceName;
+    private String hostName;
+    private JComboBox cmbHostName;
+
     private XBayaEngine engine;
-	private JButton btnHostAdvanceOptions;
+	private JButton btnHostAdvanceOptions;
 	private boolean newDescritor;
 	private ApplicationDeploymentDescription originalDeploymentDescription;
 	private String originalHost; 
-	private String originalService;
+	private String originalService;
     private ServiceDescription serviceDescription=null;
 	private JButton btnTmpDirBrowse;
 	private JButton btnExecBrowse;
-
-    /**
-     * Launch the application.
-     */
-    public static void main(String[] args) {
-        try {
-            ApplicationDescriptionDialog dialog = new ApplicationDescriptionDialog(null);
-            dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-            dialog.setVisible(true);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+
+    /**
+     * Launch the application.
+     */
+    public static void main(String[] args) {
+        try {
+            ApplicationDescriptionDialog dialog = new ApplicationDescriptionDialog(null);
+            dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+            dialog.setVisible(true);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public ApplicationDescriptionDialog(XBayaEngine engine) {
     	this(engine,true,null,null,null);
-    }
-    /**
-     * Create the dialog.
-     */
+    }
+    /**
+     * Create the dialog.
+     */
     public ApplicationDescriptionDialog(XBayaEngine engine, boolean newDescritor, ApplicationDeploymentDescription originalDeploymentDescription, String originalHost, String originalService) {
     	setNewDescritor(newDescritor);
     	setOriginalDeploymentDescription(originalDeploymentDescription);
     	setOriginalHost(originalHost);
     	setOriginalService(originalService);
         setRegistry(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
-        addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowOpened(WindowEvent arg0) {
+        addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowOpened(WindowEvent arg0) {
                 if (isNewDescritor()) {
 					String baseName = "Application";
 					int i = 1;
@@ -149,10 +149,10 @@ public class ApplicationDescriptionDialo
 					}
 					txtAppName.setText(defaultName);
 					setApplicationName(txtAppName.getText());
-				}
-            }
+				}
+            }
         });
-        this.engine=engine;
+        this.engine=engine;
         iniGUI();
         if (originalService!=null){
     		try {
@@ -164,36 +164,36 @@ public class ApplicationDescriptionDialo
 			} catch (RegistryException e) {
 				e.printStackTrace();
 			}
-    	}
-    }
-
-    public void open() {
-        setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-        setVisible(true);
-    }
-
-    protected ApplicationDescriptionDialog getDialog() {
-        return this;
-    }
-    
-    private void iniGUI() {
+    	}
+    }
+
+    public void open() {
+        setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+        setVisible(true);
+    }
+
+    protected ApplicationDescriptionDialog getDialog() {
+        return this;
+    }
+    
+    private void iniGUI() {
         if (isNewDescritor()) {
 			setTitle("Application Description");
 		}else{
 			setTitle("Update Application Description: "+getOriginalDeploymentDescription().getType().getApplicationName().getStringValue());
 		}
-		setBounds(100, 100, 600, 620);
-        setModal(true);
+		setBounds(100, 100, 600, 620);
+        setModal(true);
         setLocationRelativeTo(null);
-        GridPanel buttonPane = new GridPanel();
-//        getContentPane().setLayout(new BorderLayout());
-        {
-        	
-//            buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-//            getContentPane().add(buttonPane, BorderLayout.SOUTH);
-
-            lblError = new JLabel("");
-            lblError.setForeground(Color.RED);
+        GridPanel buttonPane = new GridPanel();
+//        getContentPane().setLayout(new BorderLayout());
+        {
+        	
+//            buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+//            getContentPane().add(buttonPane, BorderLayout.SOUTH);
+
+            lblError = new JLabel("");
+            lblError.setForeground(Color.RED);
             buttonPane.add(lblError);
             if (!isNewDescritor()){
             	JButton resetButton = new JButton("Reset");
@@ -203,45 +203,45 @@ public class ApplicationDescriptionDialo
                     }
                 });
                 buttonPane.add(resetButton);
-            }
-            {
+            }
+            {
                 okButton = new JButton("Save");
                 if (!isNewDescritor()){
                 	okButton.setText("Update");
-                }
-                okButton.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
-                        saveApplicationDescription();
-                        close();
-                    }
-                });
-                okButton.setEnabled(false);
-                okButton.setActionCommand("OK");
-                buttonPane.add(okButton);
-                getRootPane().setDefaultButton(okButton);
-            }
-            {
-                JButton cancelButton = new JButton("Cancel");
-                cancelButton.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
-                        setApplicationDescCreated(false);
-                        close();
-                    }
-                });
-                cancelButton.setActionCommand("Cancel");
-                buttonPane.add(cancelButton);
-            }
-        }
-        {
-//            JPanel panel = new JPanel();
-//            getContentPane().add(panel, BorderLayout.CENTER);
-        	JPanel execPath=new JPanel();
-            txtExecPath = new XBayaTextField();
-            txtExecPath.getTextField().addKeyListener(new KeyAdapter() {
-                @Override
-                public void keyReleased(KeyEvent e) {
-                    setExecutablePath(txtExecPath.getText());
-                }
+                }
+                okButton.addActionListener(new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        saveApplicationDescription();
+                        close();
+                    }
+                });
+                okButton.setEnabled(false);
+                okButton.setActionCommand("OK");
+                buttonPane.add(okButton);
+                getRootPane().setDefaultButton(okButton);
+            }
+            {
+                JButton cancelButton = new JButton("Cancel");
+                cancelButton.addActionListener(new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        setApplicationDescCreated(false);
+                        close();
+                    }
+                });
+                cancelButton.setActionCommand("Cancel");
+                buttonPane.add(cancelButton);
+            }
+        }
+        {
+//            JPanel panel = new JPanel();
+//            getContentPane().add(panel, BorderLayout.CENTER);
+        	JPanel execPath=new JPanel();
+            txtExecPath = new XBayaTextField();
+            txtExecPath.getTextField().addKeyListener(new KeyAdapter() {
+                @Override
+                public void keyReleased(KeyEvent e) {
+                    setExecutablePath(txtExecPath.getText());
+                }
             });
             txtExecPath.getTextField().addFocusListener(new FocusAdapter() {
             	@Override
@@ -249,7 +249,7 @@ public class ApplicationDescriptionDialo
             		super.focusLost(e);
             		updateTempDirWithExecPath(txtExecPath.getText());
             	}
-			});
+			});
             txtExecPath.setColumns(10);
             btnExecBrowse=new JButton(MenuIcons.OPEN_ICON);
             btnExecBrowse.addActionListener(new ActionListener(){
@@ -287,25 +287,25 @@ public class ApplicationDescriptionDialo
             
             setupLayoutForBrowse(execPath,txtExecPath.getSwingComponent());
 
-            txtAppName = new XBayaTextField();
-            txtAppName.getTextField().addKeyListener(new KeyAdapter() {
-                @Override
-                public void keyReleased(KeyEvent arg0) {
-                    setApplicationName(txtAppName.getText());
-                }
-            });
+            txtAppName = new XBayaTextField();
+            txtAppName.getTextField().addKeyListener(new KeyAdapter() {
+                @Override
+                public void keyReleased(KeyEvent arg0) {
+                    setApplicationName(txtAppName.getText());
+                }
+            });
             txtAppName.setColumns(10);
             XBayaLabel lblApplicationName = new XBayaLabel("Application name",txtAppName);
-            JLabel lblExecutablePath = new JLabel("Executable path");
+            JLabel lblExecutablePath = new JLabel("Executable path");
         	JPanel tmpDirPath=new JPanel();
-
-            txtTempDir = new XBayaTextField();
-            txtTempDir.getTextField().addKeyListener(new KeyAdapter() {
-                @Override
-                public void keyReleased(KeyEvent e) {
-                    setTempDir(txtTempDir.getText());
-                }
-            });
+
+            txtTempDir = new XBayaTextField();
+            txtTempDir.getTextField().addKeyListener(new KeyAdapter() {
+                @Override
+                public void keyReleased(KeyEvent e) {
+                    setTempDir(txtTempDir.getText());
+                }
+            });
             txtTempDir.setColumns(10);
             btnTmpDirBrowse=new JButton(MenuIcons.OPEN_DIR_ICON);
             btnTmpDirBrowse.addActionListener(new ActionListener(){
@@ -329,58 +329,58 @@ public class ApplicationDescriptionDialo
 
 
             JLabel lblTemporaryDirectory = new JLabel("Scratch working directory");
-
-            JButton btnAdvance = new JButton("Advanced application configurations...");
-            btnAdvance.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    try {
-                        ApplicationDescriptionAdvancedOptionDialog serviceDescriptionDialog = new ApplicationDescriptionAdvancedOptionDialog(
-                                getRegistry(), getShellApplicationDescription());
-                        serviceDescriptionDialog.open();
-                    } catch (Exception e1) {
-                        e1.printStackTrace();
-                        JOptionPane.showMessageDialog(null, e1.getLocalizedMessage());
-                    }
-                }
-            });
-
-//            cmbServiceName.setRenderer(new DefaultListCellRenderer());
-            cmbHostName = new JComboBox();
-            cmbHostName.addActionListener(this);
-
-            XBayaLabel lblHostName = new XBayaLabel("Application host",cmbHostName);
-//            lblHostName.getSwingComponent().setFont(new Font("Tahoma", Font.ITALIC, 11));
-            XBayaLinkButton lnkNewHost = new XBayaLinkButton("New button");
-            lnkNewHost.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    try {
+
+            JButton btnAdvance = new JButton("Advanced application configurations...");
+            btnAdvance.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    try {
+                        ApplicationDescriptionAdvancedOptionDialog serviceDescriptionDialog = new ApplicationDescriptionAdvancedOptionDialog(
+                                getRegistry(), getShellApplicationDescription());
+                        serviceDescriptionDialog.open();
+                    } catch (Exception e1) {
+                        e1.printStackTrace();
+                        JOptionPane.showMessageDialog(null, e1.getLocalizedMessage());
+                    }
+                }
+            });
+
+//            cmbServiceName.setRenderer(new DefaultListCellRenderer());
+            cmbHostName = new JComboBox();
+            cmbHostName.addActionListener(this);
+
+            XBayaLabel lblHostName = new XBayaLabel("Application host",cmbHostName);
+//            lblHostName.getSwingComponent().setFont(new Font("Tahoma", Font.ITALIC, 11));
+            XBayaLinkButton lnkNewHost = new XBayaLinkButton("New button");
+            lnkNewHost.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    try {
                         HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
-                        hostDescriptionDialog.setLocationRelativeTo(getContentPane());
-                        hostDescriptionDialog.open();
-
+                        hostDescriptionDialog.setLocationRelativeTo(getContentPane());
+                        hostDescriptionDialog.open();
+
                         if (hostDescriptionDialog.isHostCreated()) {
                         	ProgressMonitor progressMonitor = new ProgressMonitor(getContentPane(), "Host Descriptions", "Refreshing host list..", 0, 200);
                         	int progress=1;
                         	progressMonitor.setProgress(progress++);
-                        	while(cmbHostName.getSelectedIndex()==-1 || !cmbHostName.getSelectedItem().toString().equals(hostDescriptionDialog.getHostLocation())){
+                        	while(cmbHostName.getSelectedIndex()==-1 || !cmbHostName.getSelectedItem().toString().equals(hostDescriptionDialog.getHostLocation())){
 	                            loadHostDescriptions();
 	                            cmbHostName.setSelectedItem(hostDescriptionDialog.getHostLocation());
 	                            progressMonitor.setProgress(progress++);
 	                            Thread.sleep(50);
                         	}
-                        	progressMonitor.setProgress(200);
-                        }
-                    } catch (Exception e1) {
-                        e1.printStackTrace();
-                        JOptionPane.showMessageDialog(null, e1.getLocalizedMessage());
-                    }
-                }
-            });
-            lnkNewHost.setText("Create new host...");
-            lnkNewHost.setHorizontalAlignment(SwingConstants.TRAILING);
-
-//            JLabel lblBindThisDeployment = new JLabel("Bind this deployment description to:");
-//            lblBindThisDeployment.setFont(new Font("Tahoma", Font.BOLD, 11));
+                        	progressMonitor.setProgress(200);
+                        }
+                    } catch (Exception e1) {
+                        e1.printStackTrace();
+                        JOptionPane.showMessageDialog(null, e1.getLocalizedMessage());
+                    }
+                }
+            });
+            lnkNewHost.setText("Create new host...");
+            lnkNewHost.setHorizontalAlignment(SwingConstants.TRAILING);
+
+//            JLabel lblBindThisDeployment = new JLabel("Bind this deployment description to:");
+//            lblBindThisDeployment.setFont(new Font("Tahoma", Font.BOLD, 11));
 
             btnHostAdvanceOptions=new JButton("HPC Configuration...");
             btnHostAdvanceOptions.addActionListener(new ActionListener() {
@@ -460,12 +460,12 @@ public class ApplicationDescriptionDialo
             buttonPane.getSwingComponent().setBorder(BorderFactory.createEtchedBorder());
             infoPanel.getSwingComponent().setBorder(BorderFactory.createEtchedBorder());
 
-            SwingUtil.layoutToGrid(getContentPane(), 2, 1, -1, 0);
-//            loadServiceDescriptions();
-            loadHostDescriptions();
-        }
-        setResizable(true);
-        getRootPane().setDefaultButton(okButton);
+            SwingUtil.layoutToGrid(getContentPane(), 2, 1, -1, 0);
+//            loadServiceDescriptions();
+            loadHostDescriptions();
+        }
+        setResizable(true);
+        getRootPane().setDefaultButton(okButton);
         if (!isNewDescritor()){
         	loadData();
         }
@@ -484,21 +484,21 @@ public class ApplicationDescriptionDialo
 		constraints.weightx = 1;
 		layout.setConstraints(component, constraints);
 		tmpDirPath.setLayout(layout);
-	}
-
-//    private void loadServiceDescriptions() {
-//        cmbServiceName.removeAllItems();
-//        setServiceName(null);
-//        try {
-//            List<ServiceDescription> serviceDescriptions = getRegistry().searchServiceDescription("");
-//            for (ServiceDescription serviceDescription : serviceDescriptions) {
-//                cmbServiceName.addItem(serviceDescription.getType().getName());
-//            }
-//        } catch (Exception e) {
-//            setError(e.getLocalizedMessage());
+	}
+
+//    private void loadServiceDescriptions() {
+//        cmbServiceName.removeAllItems();
+//        setServiceName(null);
+//        try {
+//            List<ServiceDescription> serviceDescriptions = getRegistry().searchServiceDescription("");
+//            for (ServiceDescription serviceDescription : serviceDescriptions) {
+//                cmbServiceName.addItem(serviceDescription.getType().getName());
+//            }
+//        } catch (Exception e) {
+//            setError(e.getLocalizedMessage());
 //        }
-//        updateServiceName();
-//    }
+//        updateServiceName();
+//    }
 
     private void loadData(){
     	txtAppName.setText(getOriginalDeploymentDescription().getType().getApplicationName().getStringValue());
@@ -514,27 +514,27 @@ public class ApplicationDescriptionDialo
     	setServiceName(null);
     	txtAppName.setEditable(isNewDescritor());
     }
-    
-    private void loadHostDescriptions() {
-        cmbHostName.removeAllItems();
-        setHostName(null);
-        try {
-            List<HostDescription> hostDescriptions = getRegistry().getHostDescriptors();
-            for (HostDescription hostDescription : hostDescriptions) {
-                if (hostDescription.getType().getHostName() == null) {
-                    cmbHostName.addItem(hostDescription.getType().getHostName());
-                } else {
-                    cmbHostName.addItem(hostDescription.getType().getHostName());
-                }
-            }
-        } catch (Exception e) {
-            setError(e.getLocalizedMessage());
-        }
-        updateHostName();
-    }
-
-    public ApplicationDeploymentDescription getShellApplicationDescription() {
-        if(shellApplicationDescription == null){
+    
+    private void loadHostDescriptions() {
+        cmbHostName.removeAllItems();
+        setHostName(null);
+        try {
+            List<HostDescription> hostDescriptions = getRegistry().getHostDescriptors();
+            for (HostDescription hostDescription : hostDescriptions) {
+                if (hostDescription.getType().getHostName() == null) {
+                    cmbHostName.addItem(hostDescription.getType().getHostName());
+                } else {
+                    cmbHostName.addItem(hostDescription.getType().getHostName());
+                }
+            }
+        } catch (Exception e) {
+            setError(e.getLocalizedMessage());
+        }
+        updateHostName();
+    }
+
+    public ApplicationDeploymentDescription getShellApplicationDescription() {
+        if(shellApplicationDescription == null){
             if (isNewDescritor()) {
 				shellApplicationDescription = new ApplicationDeploymentDescription();
 			}else{
@@ -543,37 +543,37 @@ public class ApplicationDescriptionDialo
 				} catch (XmlException e) {
 					//shouldn't happen (hopefully)
 				}
-			}
-        }
-        return shellApplicationDescription;
-    }
-
-    public ApplicationDeploymentDescriptionType getApplicationDescriptionType() {
-    	return getShellApplicationDescription().getType();
-    }
-    
-    public String getApplicationName() {
-        return getApplicationDescriptionType().getApplicationName().getStringValue();
-    }
-
-    public void setApplicationName(String applicationName) {
-//        ApplicationDeploymentDescriptionType.ApplicationName applicationName1 = getApplicationDescriptionType().addNewApplicationName();
+			}
+        }
+        return shellApplicationDescription;
+    }
+
+    public ApplicationDeploymentDescriptionType getApplicationDescriptionType() {
+    	return getShellApplicationDescription().getType();
+    }
+    
+    public String getApplicationName() {
+        return getApplicationDescriptionType().getApplicationName().getStringValue();
+    }
+
+    public void setApplicationName(String applicationName) {
+//        ApplicationDeploymentDescriptionType.ApplicationName applicationName1 = getApplicationDescriptionType().addNewApplicationName();
 //        applicationName1.setStringValue(applicationName);
     	if (getApplicationDescriptionType().getApplicationName()==null){
     		getApplicationDescriptionType().addNewApplicationName();
     	}
-    	getApplicationDescriptionType().getApplicationName().setStringValue(applicationName);
-        updateDialogStatus();
-    }
-
-    public String getExecutablePath() {
-        return getApplicationDescriptionType().getExecutableLocation();
-    }
-
-    public void setExecutablePath(String executablePath) {
+    	getApplicationDescriptionType().getApplicationName().setStringValue(applicationName);
+        updateDialogStatus();
+    }
+
+    public String getExecutablePath() {
+        return getApplicationDescriptionType().getExecutableLocation();
+    }
+
+    public void setExecutablePath(String executablePath) {
     	getApplicationDescriptionType().setExecutableLocation(executablePath);
-    	updateTempDirWithExecPath(executablePath);
-        updateDialogStatus();
+    	updateTempDirWithExecPath(executablePath);
+        updateDialogStatus();
     }
 
 	private void updateTempDirWithExecPath(String executablePath) {
@@ -587,22 +587,22 @@ public class ApplicationDescriptionDialo
     		setTempDir(txtTempDir.getText());
     		txtTempDir.getSwingComponent().requestFocus();
     	}
-	}
-
-    public String getTempDir() {
-        return getApplicationDescriptionType().getScratchWorkingDirectory();
-    }
-
-    public void setTempDir(String tempDir) {
-    	getApplicationDescriptionType().setScratchWorkingDirectory(tempDir);
-        updateDialogStatus();
-    }
-
-    public void close() {
-        getDialog().setVisible(false);
-    }
-
-    public void saveApplicationDescription() {
+	}
+
+    public String getTempDir() {
+        return getApplicationDescriptionType().getScratchWorkingDirectory();
+    }
+
+    public void setTempDir(String tempDir) {
+    	getApplicationDescriptionType().setScratchWorkingDirectory(tempDir);
+        updateDialogStatus();
+    }
+
+    public void close() {
+        getDialog().setVisible(false);
+    }
+
+    public void saveApplicationDescription() {
         try {
 			try {
 				getRegistry().addApplicationDescriptor(getServiceName(), getHostName(), getShellApplicationDescription());
@@ -621,84 +621,84 @@ public class ApplicationDescriptionDialo
 			setApplicationDescCreated(true);
 		} catch (RegistryException e) {
 			engine.getGUI().getErrorWindow().error(e);
-		}
-    }
-
-    public boolean isApplicationDescCreated() {
-        return applcationDescCreated;
-    }
-
-    public void setApplicationDescCreated(boolean applicationDescCreated) {
-        this.applcationDescCreated = applicationDescCreated;
-    }
-
-    private void setError(String errorMessage) {
-        if (errorMessage == null || errorMessage.trim().equals("")) {
-            lblError.setText("");
-        } else {
-            lblError.setText(errorMessage.trim());
-        }
-    }
-
-    private void updateDialogStatus() {
-        String message = null;
-        try {
-            validateDialog();
-        } catch (Exception e) {
-            message = e.getLocalizedMessage();
-        }
-        okButton.setEnabled(message == null);
-        setError(message);
-    }
-
-    private void validateDialog() throws Exception {
-        if (getApplicationName() == null || getApplicationName().trim().equals("")) {
-            throw new Exception("Name of the application cannot be empty!!!");
-        }
-
-        ApplicationDeploymentDescription deploymentDescriptions = null;
-        try {
-            deploymentDescriptions = getRegistry().getApplicationDescriptor(getServiceName(), getHostName(),
-                    getApplicationName());
-        } catch (RegistryException e) {
-            throw e;
-        }
+		}
+    }
+
+    public boolean isApplicationDescCreated() {
+        return applcationDescCreated;
+    }
+
+    public void setApplicationDescCreated(boolean applicationDescCreated) {
+        this.applcationDescCreated = applicationDescCreated;
+    }
+
+    private void setError(String errorMessage) {
+        if (errorMessage == null || errorMessage.trim().equals("")) {
+            lblError.setText("");
+        } else {
+            lblError.setText(errorMessage.trim());
+        }
+    }
+
+    private void updateDialogStatus() {
+        String message = null;
+        try {
+            validateDialog();
+        } catch (Exception e) {
+            message = e.getLocalizedMessage();
+        }
+        okButton.setEnabled(message == null);
+        setError(message);
+    }
+
+    private void validateDialog() throws Exception {
+        if (getApplicationName() == null || getApplicationName().trim().equals("")) {
+            throw new Exception("Name of the application cannot be empty!!!");
+        }
+
+        ApplicationDeploymentDescription deploymentDescriptions = null;
+        try {
+            deploymentDescriptions = getRegistry().getApplicationDescriptor(getServiceName(), getHostName(),
+                    getApplicationName());
+        } catch (RegistryException e) {
+            throw e;
+        }
         if (deploymentDescriptions!=null && (isNewDescritor() || (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost())))) {
-            throw new Exception("Application name already exists for the selected service & host!!!");
-        }
-
-        if (getExecutablePath() == null || getExecutablePath().trim().equals("")) {
-            throw new Exception("Executable path cannot be empty!!!");
-        }
-
-        if (getTempDir() == null || getTempDir().trim().equals("")) {
-            throw new Exception("Temporary directory location cannot be empty!!!");
-        }
-
-        if (getServiceName() == null || getServiceName().trim().equals("")) {
-            throw new Exception("Click on IO Parameters...  to define parameters for the application");
-        }
-
-        if (getHostName() == null || getHostName().trim().equals("")) {
-            throw new Exception("Please select/create host to bind to this deployment description");
-        }
-
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-        updateDialogStatus();
-    }
-
-    public String getHostName() {
-        return hostName;
-    }
-
-    public void setHostName(String hostName) {
+            throw new Exception("Application name already exists for the selected service & host!!!");
+        }
+
+        if (getExecutablePath() == null || getExecutablePath().trim().equals("")) {
+            throw new Exception("Executable path cannot be empty!!!");
+        }
+
+        if (getTempDir() == null || getTempDir().trim().equals("")) {
+            throw new Exception("Temporary directory location cannot be empty!!!");
+        }
+
+        if (getServiceName() == null || getServiceName().trim().equals("")) {
+            throw new Exception("Click on IO Parameters...  to define parameters for the application");
+        }
+
+        if (getHostName() == null || getHostName().trim().equals("")) {
+            throw new Exception("Please select/create host to bind to this deployment description");
+        }
+
+    }
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+        updateDialogStatus();
+    }
+
+    public String getHostName() {
+        return hostName;
+    }
+
+    public void setHostName(String hostName) {
         this.hostName = hostName;
         if (hostName!=null) {
 			HostDescription hostDescription;
@@ -721,52 +721,52 @@ public class ApplicationDescriptionDialo
 				//not there - ouch
 			}
 		}
-		updateDialogStatus();
+		updateDialogStatus();
     }
 
 	private boolean isLocalAddress(String hostAddress) {
 		return hostAddress.equalsIgnoreCase("localhost") || hostAddress.equalsIgnoreCase("127.0.0.1");
-	}
-
-    private void updateServiceName() {
+	}
+
+    private void updateServiceName() {
         if (getServiceDescription() == null) {
         	setServiceName(null);
-        }else{
-            setServiceName(getServiceDescription().getType().getName());
-        }
-    }
-
-    private void updateHostName() {
-        if (cmbHostName.getSelectedItem() != null) {
-            setHostName(cmbHostName.getSelectedItem().toString());
-        }
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-//        if (e.getSource() == cmbServiceName) {
-//            updateServiceName();
-//        }
-        if (e.getSource() == cmbHostName) {
-            updateHostName();
-        }
-        if (e.getSource() == txtAppName) {
-            setApplicationName(txtAppName.getText());
-        }
-        if (e.getSource() == txtExecPath) {
-            setExecutablePath(txtExecPath.getText());
-        }
-        if (e.getSource() == txtTempDir) {
-            setTempDir(txtTempDir.getText());
-        }
-    }
-
-    public AiravataRegistry2 getRegistry() {
-        return registry;
-    }
-
-    public void setRegistry(AiravataRegistry2 registry) {
-        this.registry = registry;
+        }else{
+            setServiceName(getServiceDescription().getType().getName());
+        }
+    }
+
+    private void updateHostName() {
+        if (cmbHostName.getSelectedItem() != null) {
+            setHostName(cmbHostName.getSelectedItem().toString());
+        }
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+//        if (e.getSource() == cmbServiceName) {
+//            updateServiceName();
+//        }
+        if (e.getSource() == cmbHostName) {
+            updateHostName();
+        }
+        if (e.getSource() == txtAppName) {
+            setApplicationName(txtAppName.getText());
+        }
+        if (e.getSource() == txtExecPath) {
+            setExecutablePath(txtExecPath.getText());
+        }
+        if (e.getSource() == txtTempDir) {
+            setTempDir(txtTempDir.getText());
+        }
+    }
+
+    public AiravataRegistry2 getRegistry() {
+        return registry;
+    }
+
+    public void setRegistry(AiravataRegistry2 registry) {
+        this.registry = registry;
     }
 
 	public boolean isNewDescritor() {
@@ -809,6 +809,6 @@ public class ApplicationDescriptionDialo
 	private void setServiceDescription(ServiceDescription serviceDescription) {
 		this.serviceDescription = serviceDescription;
 		updateServiceName();
-	}
-
-}
+	}
+
+}

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java Wed Oct 17 17:27:13 2012
@@ -62,7 +62,7 @@ import javax.swing.table.DefaultTableMod
 import javax.swing.table.TableColumn;
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java Wed Oct 17 17:27:13 2012
@@ -43,7 +43,7 @@ import javax.swing.JScrollPane;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java Wed Oct 17 17:27:13 2012
@@ -42,7 +42,7 @@ import javax.swing.JScrollPane;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java Wed Oct 17 17:27:13 2012
@@ -45,7 +45,7 @@ import javax.swing.JTextField;
 import javax.swing.ProgressMonitor;
 import javax.swing.SwingConstants;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java Wed Oct 17 17:27:13 2012
@@ -37,7 +37,7 @@ import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.registry.api.AiravataRegistry2;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java Wed Oct 17 17:27:13 2012
@@ -61,7 +61,7 @@ import javax.swing.table.DefaultTableMod
 import javax.swing.table.TableColumn;
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.registry.api.AiravataRegistry2;



Mime
View raw message