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=1550760&r1=1550759&r2=1550760&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 Fri Dec 13 16:19:35 2013 @@ -51,11 +51,7 @@ import org.apache.airavata.commons.gfac. import org.apache.airavata.common.utils.SwingUtil; import org.apache.airavata.commons.gfac.type.HostDescription; //import org.apache.airavata.registry.api.AiravataRegistry2; -import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType; -import org.apache.airavata.schemas.gfac.GlobusHostType; -import org.apache.airavata.schemas.gfac.GsisshHostType; -import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType; -import org.apache.airavata.schemas.gfac.SSHHostType; +import org.apache.airavata.schemas.gfac.*; import org.apache.airavata.xbaya.ui.menues.MenuIcons; import org.apache.airavata.xbaya.ui.widgets.GridPanel; import org.apache.airavata.xbaya.ui.widgets.XBayaLabel; @@ -502,10 +498,8 @@ public class HostDeploymentDialog extend HostDescription hostDescription; try { hostDescription = registry.getApplicationManager().getHostDescription(hostName); - if (hostDescription.getType() instanceof GlobusHostType) { + if (hostDescription.getType() instanceof GlobusHostType || hostDescription.getType() instanceof UnicoreHostType || hostDescription.getType() instanceof GsisshHostType) { getShellApplicationDescription().getType().changeType(HpcApplicationDeploymentType.type); - }else if (hostDescription.getType() instanceof GsisshHostType) { - getShellApplicationDescription().getType().changeType(HpcApplicationDeploymentType.type); }else if (hostDescription.getType() instanceof SSHHostType && ((SSHHostType)hostDescription.getType()).getHpcResource()) { getShellApplicationDescription().getType().changeType(HpcApplicationDeploymentType.type); } else {
Modified: airavata/trunk/pom.xml URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1550760&r1=1550759&r2=1550760&view=diff ============================================================================== --- airavata/trunk/pom.xml (original) +++ airavata/trunk/pom.xml Fri Dec 13 16:19:35 2013 @@ -87,8 +87,8 @@ <cargo.version>1.3.1</cargo.version> <oa4mp.version>1.0.6</oa4mp.version> <antrun.version>1.6</antrun.version> - <bouncy.castle.version>1.45</bouncy.castle.version> - <jglobus.version>2.0.6</jglobus.version> + <bouncy.castle.version>1.49</bouncy.castle.version> + <jglobus.version>2.1-rc</jglobus.version> <ebay.cors.filter>1.0.0</ebay.cors.filter> <skipTests>false</skipTests> </properties> @@ -335,7 +335,7 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk16</artifactId> + <artifactId>bcprov-jdk15on</artifactId> <version>${bouncy.castle.version}</version> </dependency> </dependencies> Modified: airavata/trunk/tools/gsissh/pom.xml URL: http://svn.apache.org/viewvc/airavata/trunk/tools/gsissh/pom.xml?rev=1550760&r1=1550759&r2=1550760&view=diff ============================================================================== --- airavata/trunk/tools/gsissh/pom.xml (original) +++ airavata/trunk/tools/gsissh/pom.xml Fri Dec 13 16:19:35 2013 @@ -150,7 +150,7 @@ <properties> - <jglobus.version>2.0.6</jglobus.version> + <jglobus.version>2.1-rc</jglobus.version> <surefire.version>2.12</surefire.version> <junit.version>4.7</junit.version> <log4j.version>1.2.17</log4j.version>
