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 2013/05/23 20:42:34 UTC
svn commit: r1485818 - in /airavata/trunk/modules:
server/src/main/java/org/apache/airavata/server/ServerMain.java
xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
Author: lahiru
Date: Thu May 23 18:42:34 2013
New Revision: 1485818
URL: http://svn.apache.org/r1485818
Log:
fixing compiliation error.
Modified:
airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
Modified: airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java?rev=1485818&r1=1485817&r2=1485818&view=diff
==============================================================================
--- airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java (original)
+++ airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java Thu May 23 18:42:34 2013
@@ -45,7 +45,8 @@ public class ServerMain {
*/
public void startTomcat() throws Exception {
AiravataUtils.setExecutionAsServer();
- BetterTomcat tomcat = new BetterTomcat(Integer.parseInt(ServerSettings.getTomcatPort()));
+ String protocol = ServerSettings.isEnableHttps() ? "https" : "http";
+ BetterTomcat tomcat = new BetterTomcat(Integer.parseInt(ServerSettings.getTomcatPort(protocol)));
tomcat.addContext("/axis2", System.getenv("AIRAVATA_HOME"));
Wrapper axis2Servlet = tomcat.addServlet("/axis2", "AxisServlet", "org.apache.axis2.transport.http.AxisServlet");
axis2Servlet.addMapping("/servlet/AxisServlet");
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1485818&r1=1485817&r2=1485818&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Thu May 23 18:42:34 2013
@@ -571,21 +571,6 @@ public class EmbeddedGFacInvoker impleme
return invoke_inputParams;
}
- private HostDescription getRegisteredHost(AiravataAPI regService, String serviceName) {
- HostDescription result = null;
- try {
- Map<String, ApplicationDescription> applicationDescriptors = regService.getApplicationManager().getApplicationDescriptors(serviceName);
- for (String hostDescName : applicationDescriptors.keySet()) {
- HostDescription hostDescriptor = regService.getApplicationManager().getHostDescription(hostDescName);
- result = hostDescriptor;
- logger.info("Found service on: " + result.getType().getHostAddress());
- }
- } catch (AiravataAPIInvocationException e) {
- e.printStackTrace();
- }
- return result;
- }
-
private MessageContext getOutParameters(ServiceDescription serviceDescription) {
MessageContext outContext = new MessageContext();
for (OutputParameterType parameter : serviceDescription.getType().getOutputParametersArray()) {