airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject svn commit: r1476716 - in /airavata/trunk/modules: commons/gfac-schema/src/main/resources/schemas/ gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/ gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/ xbaya-gui/src/main/j...
Date Sun, 28 Apr 2013 03:29:01 GMT
Author: smarru
Date: Sun Apr 28 03:29:01 2013
New Revision: 1476716

URL: http://svn.apache.org/r1476716
Log:
Changing the name to UnicoreBESEPR to remove ambiguity with native unicore port configuration

Modified:
    airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java
    airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/AbstractBESTest.java
    airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/JSDLGeneratorTest.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java

Modified: airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd?rev=1476716&r1=1476715&r2=1476716&view=diff
==============================================================================
--- airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
(original)
+++ airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
Sun Apr 28 03:29:01 2013
@@ -67,7 +67,7 @@
                    <sequence>
 					<element name="gridFTPEndPoint" type="xsd:string"
 						minOccurs="0" maxOccurs="unbounded" />
-					<element name="unicoreHostAddress" type="xsd:string"
+					<element name="unicoreBESEndPoint" type="xsd:string"
 						minOccurs="1" maxOccurs="unbounded" />
 				</sequence>
                 </sequence>

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java?rev=1476716&r1=1476715&r2=1476716&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java
(original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java
Sun Apr 28 03:29:01 2013
@@ -79,7 +79,7 @@ public class BESProvider implements GFac
 			throws GFacProviderException {
 		UnicoreHostType host = (UnicoreHostType) jobExecutionContext.getApplicationContext().getHostDescription().getType();
         
-        String factoryUrl = host.getUnicoreHostAddressArray()[0];
+        String factoryUrl = host.getUnicoreBESEndPointArray()[0];
 
         EndpointReferenceType eprt = EndpointReferenceType.Factory.newInstance();
         eprt.addNewAddress().setStringValue(factoryUrl);

Modified: airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/AbstractBESTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/AbstractBESTest.java?rev=1476716&r1=1476715&r2=1476716&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/AbstractBESTest.java
(original)
+++ airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/AbstractBESTest.java
Sun Apr 28 03:29:01 2013
@@ -105,7 +105,7 @@ public abstract class AbstractBESTest {
 		host.getType().setHostAddress("zam1161v01.zam.kfa-juelich.de");
 		host.getType().setHostName("DEMO-INTEROP-SITE");
 		((UnicoreHostType) host.getType())
-				.setUnicoreHostAddressArray(hostArray);
+				.setUnicoreBESEndPointArray(hostArray);
 		((UnicoreHostType) host.getType())
 				.setGridFTPEndPointArray(new String[] { gridftpAddress });
 		return host;

Modified: airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/JSDLGeneratorTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/JSDLGeneratorTest.java?rev=1476716&r1=1476715&r2=1476716&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/JSDLGeneratorTest.java
(original)
+++ airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/JSDLGeneratorTest.java
Sun Apr 28 03:29:01 2013
@@ -188,7 +188,7 @@ public class JSDLGeneratorTest {
         HostDescription host = new HostDescription(UnicoreHostType.type);
         host.getType().setHostAddress(hostAddress);
         host.getType().setHostName(hostName);
-        ((UnicoreHostType) host.getType()).setUnicoreHostAddressArray(hostArray);
+        ((UnicoreHostType) host.getType()).setUnicoreBESEndPointArray(hostArray);
         ((UnicoreHostType) host.getType()).setGridFTPEndPointArray(new String[] { gridftpAddress
});
         return host;
     }

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=1476716&r1=1476715&r2=1476716&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
Sun Apr 28 03:29:01 2013
@@ -159,7 +159,7 @@ public class HostDescriptionDialog exten
         	((GlobusHostType)hostDescription.getType()).addGlobusGateKeeperEndPoint(this.gateKeeperTextField.getText());
             ((GlobusHostType)hostDescription.getType()).addGridFTPEndPoint(this.gridFTPTextField.getText());
         }else if (host instanceof UnicoreHostType){
-        	((UnicoreHostType)hostDescription.getType()).addUnicoreHostAddress(this.gateKeeperTextField.getText());
+        	((UnicoreHostType)hostDescription.getType()).addUnicoreBESEndPoint(this.gateKeeperTextField.getText());
             ((UnicoreHostType)hostDescription.getType()).addGridFTPEndPoint(this.gridFTPTextField.getText());
         }
         saveHostDescription();
@@ -333,7 +333,7 @@ public class HostDescriptionDialog exten
 			cmbResourceProtocol.setSelectedItem(REMOTE_PROTOCOL_STR_SSH);
 		}else if (t instanceof UnicoreHostType){
 			cmbResourceProtocol.setSelectedItem(REMOTE_PROTOCOL_STR_UNICORE);
-			gateKeeperTextField.setText(arrayToString(((UnicoreHostType) t).getUnicoreHostAddressArray()));
+			gateKeeperTextField.setText(arrayToString(((UnicoreHostType) t).getUnicoreBESEndPointArray()));
 			gridFTPTextField.setText(arrayToString(((UnicoreHostType) t).getGridFTPEndPointArray()));
 		}else if (t instanceof Ec2HostType){
 			cmbResourceProtocol.setSelectedItem(REMOTE_PROTOCOL_STR_AMAZON_EC2);



Mime
View raw message