You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2011/10/26 01:32:36 UTC
svn commit: r1188970 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
component/registry/ registrybrowser/model/ registrybrowser/nodes/
Author: patanachai
Date: Tue Oct 25 23:32:36 2011
New Revision: 1188970
URL: http://svn.apache.org/viewvc?rev=1188970&view=rev
Log:
AIRAVATA-171 Xbaya updated to XMLBeans
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/InputParameters.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/OutputParameters.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
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=1188970&r1=1188969&r2=1188970&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 Tue Oct 25 23:32:36 2011
@@ -80,7 +80,7 @@ public class JCRComponentRegistry extend
try {
List<ServiceDescription> services = this.registry.searchServiceDescription("");
for (ServiceDescription serviceDescription : services) {
- String serviceName = serviceDescription.getId();
+ String serviceName = serviceDescription.getType().getName();
JCRComponentReference jcr = new JCRComponentReference(serviceName, registry.getWSDL(serviceName));
tree.add(new ComponentTreeNode(jcr));
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/InputParameters.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/InputParameters.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/InputParameters.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/InputParameters.java Tue Oct 25 23:32:36 2011
@@ -1,6 +1,6 @@
package org.apache.airavata.xbaya.registrybrowser.model;
-import org.apache.airavata.commons.gfac.type.Parameter;
+import org.apache.airavata.schemas.gfac.Parameter;
public class InputParameters extends ServiceParameters {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/OutputParameters.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/OutputParameters.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/OutputParameters.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/OutputParameters.java Tue Oct 25 23:32:36 2011
@@ -1,6 +1,6 @@
package org.apache.airavata.xbaya.registrybrowser.model;
-import org.apache.airavata.commons.gfac.type.Parameter;
+import org.apache.airavata.schemas.gfac.Parameter;
public class OutputParameters extends ServiceParameters {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameter.java Tue Oct 25 23:32:36 2011
@@ -1,6 +1,6 @@
package org.apache.airavata.xbaya.registrybrowser.model;
-import org.apache.airavata.commons.gfac.type.Parameter;
+import org.apache.airavata.schemas.gfac.Parameter;
import org.apache.airavata.schemas.gfac.ParameterType;
@@ -38,7 +38,7 @@ public class ServiceParameter {
}
public ParameterType getType(){
- return getParameter().getParameterType().getType();
+ return getParameter().getType();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java Tue Oct 25 23:32:36 2011
@@ -3,7 +3,7 @@ package org.apache.airavata.xbaya.regist
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.commons.gfac.type.Parameter;
+import org.apache.airavata.schemas.gfac.Parameter;
public class ServiceParameters {
private ServiceParameter[] parameters;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java Tue Oct 25 23:32:36 2011
@@ -31,7 +31,7 @@ public class ApplicationDeploymentDescri
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return getApplicationDeploymentDescriptionWrap().getDescription().getId();
+ return getApplicationDeploymentDescriptionWrap().getDescription().getType().getName();
}
@Override
@@ -67,10 +67,10 @@ public class ApplicationDeploymentDescri
private void deleteApplicationDescription(JTree tree) throws RegistryException {
if (askQuestion("Application description",
"Are you sure that you want to remove the application description \""
- + getApplicationDeploymentDescriptionWrap().getDescription().getId() + "\"?")) {
+ + getApplicationDeploymentDescriptionWrap().getDescription().getType().getName() + "\"?")) {
getRegistry().deleteDeploymentDescription(getApplicationDeploymentDescriptionWrap().getService(),
getApplicationDeploymentDescriptionWrap().getHost(),
- getApplicationDeploymentDescriptionWrap().getDescription().getId());
+ getApplicationDeploymentDescriptionWrap().getDescription().getType().getName());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java Tue Oct 25 23:32:36 2011
@@ -84,7 +84,7 @@ public class ApplicationDeploymentDescri
.getDescriptions();
for (ApplicationDeploymentDescriptionWrap descriptionWrap : descriptions) {
registry.deleteDeploymentDescription(descriptionWrap.getService(), descriptionWrap.getHost(),
- descriptionWrap.getDescription().getId());
+ descriptionWrap.getDescription().getType().getName());
}
refresh();
reloadTreeNode(tree, this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java Tue Oct 25 23:32:36 2011
@@ -30,7 +30,7 @@ public class HostDescriptionNode extends
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return getHostDescription().getId();
+ return getHostDescription().getType().getName();
}
@Override
@@ -64,8 +64,8 @@ public class HostDescriptionNode extends
private void deleteHostDescription(JTree tree) throws RegistryException {
if (askQuestion("Host description", "Are you sure that you want to remove the host description \""
- + getHostDescription().getId() + "\"?")) {
- getRegistry().deleteHostDescription(getHostDescription().getId());
+ + getHostDescription().getType().getName() + "\"?")) {
+ getRegistry().deleteHostDescription(getHostDescription().getType().getName());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java Tue Oct 25 23:32:36 2011
@@ -81,7 +81,7 @@ public class HostDescriptionsNode extend
Registry registry = getRegistry();
List<HostDescription> descriptions = getHostDescriptions().getDescriptions();
for (HostDescription descriptionWrap : descriptions) {
- registry.deleteHostDescription(descriptionWrap.getId());
+ registry.deleteHostDescription(descriptionWrap.getType().getName());
}
refresh();
reloadTreeNode(tree, this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java Tue Oct 25 23:32:36 2011
@@ -30,18 +30,18 @@ public class ServiceDescriptionNode exte
@Override
protected List<TreeNode> getChildren() {
List<ServiceParameters> parameterTypeList=new ArrayList<ServiceParameters>();
- if (getServiceDescription().getInputParameters().length>0){
- parameterTypeList.add(new InputParameters(getServiceDescription().getInputParameters()));
+ if (getServiceDescription().getType().getInputParametersArray().length>0){
+ parameterTypeList.add(new InputParameters(getServiceDescription().getType().getInputParametersArray()));
}
- if (getServiceDescription().getOutputParameters().length>0){
- parameterTypeList.add(new OutputParameters(getServiceDescription().getOutputParameters()));
+ if (getServiceDescription().getType().getOutputParametersArray().length>0){
+ parameterTypeList.add(new OutputParameters(getServiceDescription().getType().getInputParametersArray()));
}
return getTreeNodeList(parameterTypeList.toArray(), this);
}
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return getServiceDescription().getId();
+ return getServiceDescription().getType().getName();
}
@Override
@@ -75,8 +75,8 @@ public class ServiceDescriptionNode exte
private void deleteHostDescription(JTree tree) throws RegistryException {
if (askQuestion("Service description", "Are you sure that you want to remove the service description \""
- + getServiceDescription().getId() + "\"?")) {
- getRegistry().deleteServiceDescription(getServiceDescription().getId());
+ + getServiceDescription().getType().getName() + "\"?")) {
+ getRegistry().deleteServiceDescription(getServiceDescription().getType().getName());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java?rev=1188970&r1=1188969&r2=1188970&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java Tue Oct 25 23:32:36 2011
@@ -81,7 +81,7 @@ public class ServiceDescriptionsNode ext
Registry registry = getRegistry();
List<ServiceDescription> descriptions = getServiceDescriptions().getDescriptions();
for (ServiceDescription descriptionWrap : descriptions) {
- registry.deleteServiceDescription(descriptionWrap.getId());
+ registry.deleteServiceDescription(descriptionWrap.getType().getName());
}
refresh();
reloadTreeNode(tree, this);