You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/10/29 17:43:53 UTC
svn commit: r1194908 - in /incubator/airavata/trunk/modules:
commons/registry-api/src/main/java/org/apache/airavata/registry/api/
commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/
xbaya-gui/src/main/java/org/apache/airavata/xbay...
Author: lahiru
Date: Sat Oct 29 15:43:53 2011
New Revision: 1194908
URL: http://svn.apache.org/viewvc?rev=1194908&view=rev
Log:
https://issues.apache.org/jira/browse/AIRAVATA-174
Modified:
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Registry.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/WSDLDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Registry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Registry.java?rev=1194908&r1=1194907&r2=1194908&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Registry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Registry.java Sat Oct 29 15:43:53 2011
@@ -125,12 +125,12 @@ public interface Registry {
/**
* Search service description with name
*
- * @param name
+ * @param nameRegEx
* @return the service descriptions with matched name
* @throws PathNotFoundException
* @throws ServiceDescriptionRetrieveException
*/
- public List<ServiceDescription> searchServiceDescription(String name) throws RegistryException;
+ public List<ServiceDescription> searchServiceDescription(String nameRegEx) throws RegistryException;
/**
* Search deployment description from a service and/or a hostname
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java?rev=1194908&r1=1194907&r2=1194908&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java Sat Oct 29 15:43:53 2011
@@ -239,6 +239,7 @@ public class JCRRegistry extends Observa
Node app = nodes.nextNode();
Property prop = app.getProperty(XML_PROPERTY_NAME);
result = ApplicationDeploymentDescription.fromXML(prop.getString());
+ break;
}
} catch (PathNotFoundException e){
return null;
@@ -414,7 +415,7 @@ public class JCRRegistry extends Observa
return false;
}
- public List<ServiceDescription> searchServiceDescription(String name)
+ public List<ServiceDescription> searchServiceDescription(String nameRegEx)
throws RegistryException {
Session session = null;
ArrayList<ServiceDescription> result = new ArrayList<ServiceDescription>();
@@ -424,8 +425,10 @@ public class JCRRegistry extends Observa
NodeIterator nodes = node.getNodes();
for (; nodes.hasNext();) {
Node service = nodes.nextNode();
- Property prop = service.getProperty(XML_PROPERTY_NAME);
- result.add(ServiceDescription.fromXML(prop.getString()));
+ if (service.getName().matches(nameRegEx)) {
+ Property prop = service.getProperty(XML_PROPERTY_NAME);
+ result.add(ServiceDescription.fromXML(prop.getString()));
+ }
}
} catch (Exception e) {
new ServiceDescriptionRetrieveException(e);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/WSDLDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/WSDLDialog.java?rev=1194908&r1=1194907&r2=1194908&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/WSDLDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/WSDLDialog.java Sat Oct 29 15:43:53 2011
@@ -27,7 +27,8 @@ import org.apache.airavata.xbaya.XBayaEn
public class WSDLDialog extends JDialog {
- private final JPanel contentPanel = new JPanel();
+ private static final long serialVersionUID = -8250430517289749776L;
+ private final JPanel contentPanel = new JPanel();
private String wsdl;
private boolean wsdlChanged = false;
private JTextPane txtWSDL;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java?rev=1194908&r1=1194907&r2=1194908&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java Sat Oct 29 15:43:53 2011
@@ -115,40 +115,6 @@ public class JCRComponentRegistry extend
return registry.saveDeploymentDescription(service, host, app);
}
- public String saveHostDescription(String name, HostDescription host) {
- return registry.saveHostDescription(host);
- }
-
- public List<HostDescription> searchHostDescription(String nameRegEx) throws RegistryException {
- return registry.searchHostDescription(nameRegEx);
- }
-
- public HostDescription getHostDescription(String nameRegEx) throws RegistryException {
- return registry.getHostDescription(nameRegEx);
- }
-
- public List<ApplicationDeploymentDescription> searchApplicationDescription(String serviceName, String host)
- throws RegistryException {
- return registry.searchDeploymentDescription(serviceName, host);
- }
-
- public ApplicationDeploymentDescription getApplicationDescription(String serviceName, String host)
- throws RegistryException {
- return registry.getDeploymentDescription(serviceName, host);
- }
-
- public String saveServiceDescription(String name, ServiceDescription service) {
- return registry.saveServiceDescription(service);
- }
-
- public ServiceDescription getServiceDescription(String serviceName) throws RegistryException {
- return registry.getServiceDescription(serviceName);
- }
-
- public List<ServiceDescription> searchServiceDescription(String serviceName) throws RegistryException {
- return registry.searchServiceDescription(serviceName);
- }
-
public Registry getRegistry() {
return registry;
}