Author: samindaw
Date: Fri Nov 30 05:22:24 2012
New Revision: 1415500
URL: http://svn.apache.org/viewvc?rev=1415500&view=rev
Log:
allow reloading jcr component registry when airavata api object set
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1415500&r1=1415499&r2=1415500&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
Fri Nov 30 05:22:24 2012
@@ -37,6 +37,7 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Observable;
import java.util.Properties;
import java.util.UUID;
@@ -92,7 +93,7 @@ import org.apache.axis2.AxisFault;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AiravataClient implements AiravataAPI {
+public class AiravataClient extends Observable implements AiravataAPI {
private static final Logger log = LoggerFactory
.getLogger(AiravataClient.class);
Modified:
airavata/trunk/modules/workflow-model/workflow-model-component/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-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java?rev=1415500&r1=1415499&r2=1415500&view=diff
==============================================================================
---
airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
(original)
+++
airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
Fri Nov 30 05:22:24 2012
@@ -21,24 +21,12 @@
package org.apache.airavata.workflow.model.component.registry;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
-import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistryConnectionDataProvider;
-import org.apache.airavata.registry.api.AiravataRegistryFactory;
-import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.util.RegistryConstants;
import org.apache.airavata.registry.api.util.WebServiceUtil;
import org.apache.airavata.workflow.model.component.ComponentReference;
import org.apache.airavata.workflow.model.component.ComponentRegistry;
@@ -54,7 +42,7 @@ public class JCRComponentRegistry extend
private AiravataAPI airavataAPI;
public JCRComponentRegistry(AiravataAPI airavataAPI) {
- this.airavataAPI = airavataAPI;
+ this.setAiravataAPI(airavataAPI);
}
// public JCRComponentRegistry(String username, String password) throws
RegistryException {
@@ -132,7 +120,7 @@ public class JCRComponentRegistry extend
public List<ComponentReference> getComponentReferenceList() {
List<ComponentReference> tree = new ArrayList<ComponentReference>();
try {
- List<ServiceDescription> services =
this.airavataAPI.getApplicationManager().getAllServiceDescriptions();
+ List<ServiceDescription> services =
this.getAiravataAPI().getApplicationManager().getAllServiceDescriptions();
for (ServiceDescription serviceDescription : services) {
String serviceName = serviceDescription.getType().getName();
JCRComponentReference jcr = new
JCRComponentReference(serviceName,
@@ -167,4 +155,8 @@ public class JCRComponentRegistry extend
public AiravataAPI getAiravataAPI() {
return airavataAPI;
}
+
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
+ }
}
\ No newline at end of file
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1415500&r1=1415499&r2=1415500&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
Fri Nov 30 05:22:24 2012
@@ -770,10 +770,15 @@ public class XBayaConfiguration extends
((Observable) this.airavataAPI).deleteObserver(this);
}
this.airavataAPI = airavataAPI;
- triggerObservers(airavataAPI);
if (airavataAPI != null && airavataAPI instanceof Observable) {
((Observable) airavataAPI).addObserver(this);
}
+ if (getJcrComponentRegistry()==null){
+ setJcrComponentRegistry(new JCRComponentRegistry(airavataAPI));
+ }else{
+ getJcrComponentRegistry().setAiravataAPI(airavataAPI);
+ }
+ triggerObservers(getJcrComponentRegistry());
}
public URI getRegistryURL() {
