Cleanup airavata server property, removed unused files and other property cleanup. AIRAVATA-1472
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9aeed4d3 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9aeed4d3 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9aeed4d3 Branch: refs/heads/master Commit: 9aeed4d321f84beea8c84d7f0b657597e6c2bf58 Parents: 1e520bc Author: raminder <[email protected]> Authored: Thu Oct 16 10:23:24 2014 -0400 Committer: raminder <[email protected]> Committed: Thu Oct 16 10:23:24 2014 -0400 ---------------------------------------------------------------------- .../api/server/util/RegistryInitUtil.java | 4 +- .../client/tools/DocumentCreatorNew.java | 2 +- .../apache/airavata/common/utils/Constants.java | 2 +- .../airavata/common/utils/ServerSettings.java | 87 +-- .../airavata/common/utils/ServiceUtils.java | 186 +++---- .../common/utils/ApplicationSettingsTest.java | 11 +- .../main/resources/airavata-client.properties | 2 +- .../main/resources/airavata-server.properties | 202 +++---- .../server/src/main/resources/axis2.xml | 533 ------------------- .../server/src/main/resources/host.xml | 86 --- .../basic/BasicAccessAuthenticator.java | 15 +- .../session/ServletRequestHelper.java | 19 +- .../main/resources/airavata-server.properties | 286 ++++------ .../airavata/gfac/server/GfacServerHandler.java | 15 +- .../airavata/gfac/core/utils/GFacUtils.java | 7 +- .../security/TokenizedMyProxyAuthInfo.java | 5 +- .../gfac/ssh/security/TokenizedSSHAuthInfo.java | 3 + .../integration/tools/DocumentCreatorNew.java | 2 +- .../server/OrchestratorServerHandler.java | 4 +- .../core/impl/GFACEmbeddedJobSubmitter.java | 2 +- .../core/impl/GFACServiceJobSubmitter.java | 2 +- .../registry/jpa/impl/GatewayRegistry.java | 2 +- .../registry/jpa/impl/RegistryImpl.java | 12 +- .../persistance/registry/jpa/impl/UserReg.java | 2 +- 24 files changed, 337 insertions(+), 1154 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java index 91e43c8..6de38f4 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java @@ -84,9 +84,9 @@ public class RegistryInitUtil { logger.info("Database already created for Registry!"); } try{ - GatewayResource gateway = (GatewayResource)ResourceUtils.createGateway(ServerSettings.getSystemUserGateway()); + GatewayResource gateway = (GatewayResource)ResourceUtils.createGateway(ServerSettings.getDefaultUserGateway()); gateway.save(); - UserResource user = ResourceUtils.createUser(ServerSettings.getSystemUser(), ServerSettings.getSystemUserPassword()); + UserResource user = ResourceUtils.createUser(ServerSettings.getDefaultUser(), ServerSettings.getDefaultUserPassword()); user.save(); WorkerResource workerResource = (WorkerResource)gateway.create(ResourceType.GATEWAY_WORKER); workerResource.setUser(user.getUserName()); http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java ---------------------------------------------------------------------- diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java index d4604f1..bf1a08e 100644 --- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java +++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java @@ -110,7 +110,7 @@ public class DocumentCreatorNew { null, null); gatewayResourceProfile = new GatewayResourceProfile(); // gatewayResourceProfile.setGatewayID("default"); - gatewayResourceProfile.setGatewayName(ClientSettings.getSetting("gateway_id", "php_reference_gateway")); + gatewayResourceProfile.setGatewayName(ClientSettings.getSetting("default.registry.gateway", "php_reference_gateway")); gatewayResourceProfile.addToComputeResourcePreferences(computeResourcePreference); String gatewayId = client.registerGatewayResourceProfile(gatewayResourceProfile); gatewayResourceProfile.setGatewayID(gatewayId); http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java ---------------------------------------------------------------------- diff --git a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java index 8335e0c..3a5fd4c 100644 --- a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java +++ b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java @@ -27,7 +27,7 @@ package org.apache.airavata.common.utils; public final class Constants { public static final String USER_IN_SESSION = "userName"; - public static final String GATEWAY_NAME = "gateway_id"; +// public static final String GATEWAY_NAME = "gateway_id"; public static final String GFAC_CONFIG_XML = "gfac-config.xml"; public static final String PUSH = "push"; public static final String PULL = "pull"; http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java ---------------------------------------------------------------------- diff --git a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java index e1b93ed..75c65cc 100644 --- a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java +++ b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java @@ -23,36 +23,18 @@ package org.apache.airavata.common.utils; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.ArrayList; - -import javax.management.InstanceNotFoundException; -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.ObjectName; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.catalina.Server; -import org.apache.catalina.Service; -import org.apache.catalina.connector.Connector; -import org.apache.coyote.ProtocolHandler; -import org.apache.coyote.http11.Http11AprProtocol; -import org.apache.coyote.http11.Http11NioProtocol; -import org.apache.coyote.http11.Http11Protocol; public class ServerSettings extends ApplicationSettings { - private static final String SYSTEM_USER = "system.user"; - private static final String SYSTEM_USER_PASSWORD = "system.password"; - private static final String SYSTEM_USER_GATEWAY = "system.gateway"; - private static final String DEFAULT_USER = "default.registry.user"; + private static final String DEFAULT_USER = "default.registry.user"; private static final String DEFAULT_USER_PASSWORD = "default.registry.password"; private static final String DEFAULT_USER_GATEWAY = "default.registry.gateway"; - private static final String TOMCAT_PORT = "port"; private static final String SERVER_CONTEXT_ROOT = "server.context-root"; public static final String EMBEDDED_ZK = "embedded.zk"; public static final String IP = "ip"; - private static String tomcatPort = null; private static final String CREDENTIAL_STORE_DB_URL = "credential.store.jdbc.url"; private static final String CREDENTIAL_STORE_DB_USER = "credential.store.jdbc.user"; @@ -87,19 +69,7 @@ public class ServerSettings extends ApplicationSettings { return getSetting(DEFAULT_USER_GATEWAY); } - public static String getSystemUser() throws ApplicationSettingsException { - return getSetting(SYSTEM_USER); - } - - public static String getSystemUserPassword() throws ApplicationSettingsException { - return getSetting(SYSTEM_USER_PASSWORD); - } - - public static String getSystemUserGateway() throws ApplicationSettingsException { - return getSetting(SYSTEM_USER_GATEWAY); - } - - public static String getServerContextRoot() { + public static String getServerContextRoot() { return getSetting(SERVER_CONTEXT_ROOT, "axis2"); } @@ -144,59 +114,6 @@ public class ServerSettings extends ApplicationSettings { } } - public static String getTomcatPort(String protocol) throws ApplicationSettingsException { - if (tomcatPort == null) { - try { - //First try to get the port from a tomcat if it is already running - ArrayList<MBeanServer> mBeanServers = MBeanServerFactory - .findMBeanServer(null); - if (mBeanServers.size() > 0) { - MBeanServer mBeanServer = mBeanServers.get(0); - Server server = null; - String[] domains = mBeanServer.getDomains(); - for (String domain : domains) { - try { - server = (Server) mBeanServer.getAttribute( - new ObjectName(domain, "type", "Server"), - "managedResource"); - break; - } catch (InstanceNotFoundException e) { - //ignore - } - } - if (server != null) { - Service[] findServices = server.findServices(); - for (Service service : findServices) { - for (Connector connector : service.findConnectors()) { - ProtocolHandler protocolHandler = connector.getProtocolHandler(); - if (protocol != null && protocol.equals(connector.getScheme())) { - if (protocolHandler instanceof Http11Protocol - || protocolHandler instanceof Http11AprProtocol - || protocolHandler instanceof Http11NioProtocol) { - Http11Protocol p = (Http11Protocol) protocolHandler; - if (p.getSslImplementationName() == null - || p.getSslImplementationName() - .equals("")) { - tomcatPort = String.valueOf(connector - .getPort()); - } - } - } - } - } - } - } - } catch (Exception e) { - e.printStackTrace(); - } - //if unable to determine the server port from a running tomcat server, get it from - //the server settings file - if (tomcatPort == null) { - tomcatPort = getSetting(TOMCAT_PORT); - } - } - return tomcatPort; - } public static String getHostScheduler() throws ApplicationSettingsException { return getSetting(HOST_SCHEDULER); http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java index 91048db..0c54053 100644 --- a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java +++ b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java @@ -1,93 +1,93 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.apache.airavata.common.utils; - -import java.io.IOException; -import java.net.SocketException; - -import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.axis2.context.ConfigurationContext; -import org.apache.axis2.description.TransportInDescription; -import org.apache.axis2.util.Utils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ServiceUtils { - private static final Logger log = LoggerFactory.getLogger(ServiceUtils.class); -// private static final String REPOSITORY_PROPERTIES = "airavata-server.properties"; - public static final String IP = "ip"; - public static final String PORT = "port"; - - public static String generateServiceURLFromConfigurationContext( - ConfigurationContext context, String serviceName) throws IOException, ApplicationSettingsException { -// URL url = ServiceUtils.class.getClassLoader() -// .getResource(REPOSITORY_PROPERTIES); - String localAddress = null; - String port = null; -// Properties properties = new Properties(); - try { - localAddress = ServerSettings.getSetting(IP); - } catch (ApplicationSettingsException e) { - //we will ignore this exception since the properties file will not contain the values - //when it is ok to retrieve them from the axis2 context - } - if(localAddress == null){ - try { - localAddress = Utils.getIpAddress(context - .getAxisConfiguration()); - } catch (SocketException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } - } - String protocol="http"; - if(ServerSettings.isEnableHttps()){ - protocol="https"; - } - - try { - port = ServerSettings.getTomcatPort(protocol); - } catch (ApplicationSettingsException e) { - //we will ignore this exception since the properties file will not contain the values - //when it is ok to retrieve them from the axis2 context - } - if (port == null) { - TransportInDescription transportInDescription = context - .getAxisConfiguration().getTransportsIn() - .get(protocol); - if (transportInDescription != null - && transportInDescription.getParameter(PORT) != null) { - port = (String) transportInDescription - .getParameter(PORT).getValue(); - } - } - localAddress = protocol+"://" + localAddress + ":" + port; - localAddress = localAddress + "/" - //We are not using axis2 config context to get the context root because it is invalid - //+ context.getContextRoot() + "/" - //FIXME: the context root will be correct after updating the web.xml - + ServerSettings.getServerContextRoot() + "/" - + context.getServicePath() + "/" - + serviceName; - log.debug("Service Address Configured:" + localAddress); - return localAddress; - } -} +///* +// * +// * Licensed to the Apache Software Foundation (ASF) under one +// * or more contributor license agreements. See the NOTICE file +// * distributed with this work for additional information +// * regarding copyright ownership. The ASF licenses this file +// * to you under the Apache License, Version 2.0 (the +// * "License"); you may not use this file except in compliance +// * with the License. You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, +// * software distributed under the License is distributed on an +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// * KIND, either express or implied. See the License for the +// * specific language governing permissions and limitations +// * under the License. +// * +// */ +// +//package org.apache.airavata.common.utils; +// +//import java.io.IOException; +//import java.net.SocketException; +// +//import org.apache.airavata.common.exception.ApplicationSettingsException; +//import org.apache.axis2.context.ConfigurationContext; +//import org.apache.axis2.description.TransportInDescription; +//import org.apache.axis2.util.Utils; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +// +//public class ServiceUtils { +// private static final Logger log = LoggerFactory.getLogger(ServiceUtils.class); +//// private static final String REPOSITORY_PROPERTIES = "airavata-server.properties"; +// public static final String IP = "ip"; +// public static final String PORT = "port"; +// +// public static String generateServiceURLFromConfigurationContext( +// ConfigurationContext context, String serviceName) throws IOException, ApplicationSettingsException { +//// URL url = ServiceUtils.class.getClassLoader() +//// .getResource(REPOSITORY_PROPERTIES); +// String localAddress = null; +// String port = null; +//// Properties properties = new Properties(); +// try { +// localAddress = ServerSettings.getSetting(IP); +// } catch (ApplicationSettingsException e) { +// //we will ignore this exception since the properties file will not contain the values +// //when it is ok to retrieve them from the axis2 context +// } +// if(localAddress == null){ +// try { +// localAddress = Utils.getIpAddress(context +// .getAxisConfiguration()); +// } catch (SocketException e) { +// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. +// } +// } +// String protocol="http"; +// if(ServerSettings.isEnableHttps()){ +// protocol="https"; +// } +// +// try { +// port = ServerSettings.getTomcatPort(protocol); +// } catch (ApplicationSettingsException e) { +// //we will ignore this exception since the properties file will not contain the values +// //when it is ok to retrieve them from the axis2 context +// } +// if (port == null) { +// TransportInDescription transportInDescription = context +// .getAxisConfiguration().getTransportsIn() +// .get(protocol); +// if (transportInDescription != null +// && transportInDescription.getParameter(PORT) != null) { +// port = (String) transportInDescription +// .getParameter(PORT).getValue(); +// } +// } +// localAddress = protocol+"://" + localAddress + ":" + port; +// localAddress = localAddress + "/" +// //We are not using axis2 config context to get the context root because it is invalid +// //+ context.getContextRoot() + "/" +// //FIXME: the context root will be correct after updating the web.xml +// + ServerSettings.getServerContextRoot() + "/" +// + context.getServicePath() + "/" +// + serviceName; +// log.debug("Service Address Configured:" + localAddress); +// return localAddress; +// } +//} http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java ---------------------------------------------------------------------- diff --git a/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java b/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java index 5cc3e00..4ade721 100644 --- a/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java +++ b/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java @@ -31,18 +31,11 @@ import junit.framework.TestCase; */ public class ApplicationSettingsTest extends TestCase { - public void testGetAbsoluteSetting() throws Exception { - - System.setProperty(AiravataUtils.EXECUTION_MODE, "SERVER"); - String url = ServerSettings.getSetting("registry.service.wsdl"); - Assert.assertEquals("http://localhost:8080/airavata-server/services/RegistryService?wsdl";, url); - - } - + public void testGetAbsoluteSettingWithSpecialCharacters() throws Exception { System.setProperty(AiravataUtils.EXECUTION_MODE, "SERVER"); - String url = ServerSettings.getSetting("system.user"); + String url = ServerSettings.getSetting("default.registry.user"); Assert.assertEquals("admin", url); } http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/configuration/client/src/main/resources/airavata-client.properties ---------------------------------------------------------------------- diff --git a/modules/configuration/client/src/main/resources/airavata-client.properties b/modules/configuration/client/src/main/resources/airavata-client.properties index 9575517..98972cd 100644 --- a/modules/configuration/client/src/main/resources/airavata-client.properties +++ b/modules/configuration/client/src/main/resources/airavata-client.properties @@ -51,6 +51,7 @@ default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA default.registry.gateway=default +gateway_id=php_reference_gateway ########################################################################### # Airavata App Catalog DB Configuration @@ -96,5 +97,4 @@ thrift.server.port=8930 #app.catalog.server.host=${thrift.server.host} #app.catalog.server.port=8931 -gateway_id=php_reference_gateway http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/configuration/server/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties index 878c341..4148cd9 100644 --- a/modules/configuration/server/src/main/resources/airavata-server.properties +++ b/modules/configuration/server/src/main/resources/airavata-server.properties @@ -21,37 +21,14 @@ ########################################################################### # # This properties file provides configuration for all Airavata Services: -# Registry, Workflow Interpreter, GFac, Message Broker, Message Box +# API Server, Registry, Workflow Interpreter, GFac, Orchestrator # ########################################################################### ########################################################################### -# Airavata Embedded-Tomcat Server Configuration +# API Server Registry Configuration ########################################################################### -# By default, tomcat runs on port 80. If the port is changed, it will be -# have to be specified with port properties. This will be picked up by -# the registry service to register the service end-points. -port=8080 - -#This property will be useful when there are multiple network interfaces in the machine where airavata is -#deployed, so users have to specify the ip address manually and this can be use for callback ip of the system(specially in gfac). - -#ip=192.2.33.12 - - -#This property will enable https and stops http, during the url registration, https urls will be stored and -# http urls will not get registered, because currently airavata supports only one url for each service -#enable.https=false -#system properties used by services to register service URLs -system.gateway=${gateway_id} -system.user=admin -system.password=admin -airavata.server.url=http://localhost:8080/airavata/services/registry - -########################################################################### -# Airavata Registry Configuration -########################################################################### #for derby [AiravataJPARegistry] registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata @@ -64,16 +41,17 @@ start.derby.server.mode=true validationQuery=SELECT 1 from CONFIGURATION jpa.cache.size=5000 #jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true -# Properties to setup registry service + +# Properties for default user mode default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA -default.registry.gateway=${gateway_id} -#for rest [RegistryClient] -#registry.jdbc.url=http://localhost:9080/airavata-services +default.registry.gateway=php_reference_gateway + +#ip=127.0.0.1 ########################################################################### -# Airavata App Catalog DB Configuration +# Application Catalog DB Configuration ########################################################################### #for derby [AiravataJPARegistry] appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver @@ -85,31 +63,55 @@ appcatalog.jdbc.user=airavata appcatalog.jdbc.password=airavata appcatalog.validationQuery=SELECT 1 from CONFIGURATION -#user defined registry accessor classes -#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry -#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry -#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry -#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry -#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry -#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +########################################################################### +# Server module Configuration +########################################################################### + +servers=apiserver,orchestrator,gfac,workflowserver +#shutdown.trategy=NONE +shutdown.trategy=SELF_TERMINATE + + +apiserver.server.host=localhost +apiserver.server.port=8930 +apiserver.server.min.threads=50 +workflow.server.host=localhost +workflow.server.port=8931 +orchestrator.server.host=localhost +orchestrator.server.port=8940 +gfac.server.host=localhost +gfac.server.port=8950 +orchestrator.server.min.threads=50 ########################################################################### -# Airavata Workflow Interpreter Configurations +# Credential Store module Configuration ########################################################################### +credential.store.keystore.url=/Users/lahirugunathilake/Downloads/airavata_sym.jks +credential.store.keystore.alias=airavata +credential.store.keystore.password=airavata +credential.store.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata +credential.store.jdbc.user=airavata +credential.store.jdbc.password=airavata +credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver -runInThread=true -provenance=true -provenanceWriterThreadPoolSize=20 -gfac.embedded=true +notifier.enabled=false +#period in milliseconds +notifier.duration=5000 -# -# Security Configuration used by Airavata Generic Factory Service -# to interact with Computational Resources. -# +email.server=smtp.googlemail.com +email.server.port=465 +email.user=airavata +email.password=xxx +email.ssl=true [email protected] ########################################################################### # Airavata GFac MyProxy GSI credentials to access Grid Resources. ########################################################################### +# +# Security Configuration used by Airavata Generic Factory Service +# to interact with Computational Resources. +# gfac=org.apache.airavata.gfac.server.GfacServer myproxy.server=myproxy.teragrid.org myproxy.username=ogce @@ -133,28 +135,52 @@ trusted.cert.location=/Users/lahirugunathilake/Downloads/certificates +########################################################################### +# Airavata Workflow Interpreter Configurations +########################################################################### + +#runInThread=true +#provenance=true +#provenanceWriterThreadPoolSize=20 +#gfac.embedded=true +#workflowserver=org.apache.airavata.api.server.WorkflowServer + + +########################################################################### +# API Server module Configuration +########################################################################### +apiserver=org.apache.airavata.api.server.AiravataAPIServer ########################################################################### -# Advance configuration to change service implementations +# Workflow Server module Configuration ########################################################################### -#Update the server context root path if airavata server is deployed under a different context root other than axis2 -server.context-root=airavata-server +workflowserver=org.apache.airavata.api.server.WorkflowServer +########################################################################### +# Advance configuration to change service implementations +########################################################################### +# If false, disables two phase commit when submitting jobs +TwoPhase=true # # Class which implemented HostScheduler interface. It will determine the which host to submit the request # host.scheduler=org.apache.airavata.gfac.core.scheduler.impl.SimpleHostScheduler +########################################################################### +# Monitoring module Configuration +########################################################################### -###---------------------------REGISTRY API IMPLEMENTATION---------------------------### +#This will be the primary monitoring tool which runs in airavata, in future there will be multiple monitoring +#mechanisms and one would be able to start a monitor +monitors=org.apache.airavata.gfac.monitor.impl.pull.qstat.QstatMonitor,org.apache.airavata.gfac.monitor.impl.LocalJobMonitor -#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry -#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient ########################################################################### # AMQP Notification Configuration ########################################################################### + + amqp.notification.enable=1 amqp.broker.host=localhost @@ -166,20 +192,6 @@ amqp.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPSenderImpl amqp.topic.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPTopicSenderImpl amqp.broadcast.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPBroadcastSenderImpl -###---------------------------Computational Middleware Configurations---------------------------### - -#enable.application.job.status.history=true -#http://localhost:8080/axis2/services/RegistryService?wsdl -registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl - -# If false, disables two phase commit when submitting jobs -TwoPhase=true - - -###---------------------------Monitoring module Configurations---------------------------### -#This will be the primary monitoring tool which runs in airavata, in future there will be multiple monitoring -#mechanisms and one would be able to start a monitor -monitors=org.apache.airavata.gfac.monitor.impl.pull.qstat.QstatMonitor,org.apache.airavata.gfac.monitor.impl.LocalJobMonitor #,org.apache.airavata.gfac.monitor.impl.push.amqp.AMQPMonitor #This is the amqp related configuration and this lists down the Rabbitmq host, this is an xsede specific configuration amqp.hosts=info1.dyn.teragrid.org,info2.dyn.teragrid.org @@ -191,11 +203,11 @@ publish.rabbitmq=false activity.publisher=org.apache.airavata.messaging.core.impl.RabbitMQPublisher rabbitmq.broker.url=amqp://localhost:5672 rabbitmq.exchange.name=airavata_rabbitmq_exchange -#This property will be useful when there are multiple network interfaces in the machine where airavata is -#deployed, so users have to specify the ip address manually and this can be use for callback ip of the system(specially in gfac). -#ip=192.2.33.12 -###---------------------------Orchestrator module Configurations---------------------------### +########################################################################### +# Orchestrator module Configuration +########################################################################### + #job.submitter=org.apache.airavata.orchestrator.core.impl.GFACEmbeddedJobSubmitter job.submitter=org.apache.airavata.orchestrator.core.impl.GFACServiceJobSubmitter job.validators=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator @@ -206,54 +218,10 @@ embedded.mode=true enable.validation=true orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer -###---------------------------API Server module Configurations---------------------------### -apiserver=org.apache.airavata.api.server.AiravataAPIServer - -###---------------------------Workflow Server module Configurations---------------------------### -workflowserver=org.apache.airavata.api.server.WorkflowServer - - -###---------------------------Airavata Server Configurations---------------------------### -#servers=apiserver,appcatalogserver,orchestrator,gfac -servers=apiserver,orchestrator,gfac,workflowserver -#shutdown.trategy=NONE -shutdown.trategy=SELF_TERMINATE - - -###--------------------------- Credential Store Specific Parameters---------------------------### -credential.store.keystore.url=/Users/lahirugunathilake/Downloads/airavata_sym.jks -credential.store.keystore.alias=airavata -credential.store.keystore.password=airavata -credential.store.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata -credential.store.jdbc.user=airavata -credential.store.jdbc.password=airavata -credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver - -notifier.enabled=false -#period in milliseconds -notifier.duration=5000 - -email.server=smtp.googlemail.com -email.server.port=465 -email.user=airavata -email.password=xxx -email.ssl=true [email protected] - -gateway_id=php_reference_gateway - -apiserver.server.host=localhost -apiserver.server.port=8930 -apiserver.server.min.threads=50 -workflow.server.host=localhost -workflow.server.port=8931 -orchestrator.server.host=localhost -orchestrator.server.port=8940 -gfac.server.host=localhost -gfac.server.port=8950 -orchestrator.server.min.threads=50 +########################################################################### +# Zookeeper Server Configuration +########################################################################### -##----------------------------- Zookeeper Server Configurations ----------------------### embedded.zk=true zookeeper.server.host=localhost zookeeper.server.port=2181 http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/configuration/server/src/main/resources/axis2.xml ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/axis2.xml b/modules/configuration/server/src/main/resources/axis2.xml deleted file mode 100644 index 7637700..0000000 --- a/modules/configuration/server/src/main/resources/axis2.xml +++ /dev/null @@ -1,533 +0,0 @@ -<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more - contributor license agreements. See the NOTICE file ~ distributed with this - work for additional information ~ regarding copyright ownership. The ASF - licenses this file ~ to you under the Apache License, Version 2.0 (the ~ - "License"); you may not use this file except in compliance ~ with the License. - You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ ~ Unless required by applicable law or agreed to in writing, ~ software - distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the - License for the ~ specific language governing permissions and limitations - ~ under the License. --> - -<axisconfig name="AxisJava2.0"> - <!-- ================================================= --> - <!-- Parameters --> - <!-- ================================================= --> - <parameter name="hotdeployment">true</parameter> - <parameter name="hotupdate">false</parameter> - <parameter name="enableMTOM">false</parameter> - <parameter name="enableSwA">false</parameter> - - <!--Uncomment if you want to enable file caching for attachments --> - <!--parameter name="cacheAttachments">true</parameter> <parameter name="attachmentDIR"></parameter> - <parameter name="sizeThreshold">4000</parameter --> - - <!--Uncomment if you want to plugin your own attachments lifecycle implementation --> - <!--<attachmentsLifecycleManager class="org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl"/> --> - - - <!--Uncomment if you want to enable the reduction of the in-memory cache - of WSDL definitions --> - <!--In some server environments, the available memory heap is limited - and can fill up under load --> - <!--Since in-memory copies of WSDL definitions can be large, some steps - can be taken --> - <!--to reduce the memory needed for the cached WSDL definitions. --> - <!--parameter name="reduceWSDLMemoryCache">true</parameter --> - - <!--This will give out the timout of the configuration contexts, in milliseconds --> - <parameter name="ConfigContextTimeoutInterval">30000</parameter> - - <!--During a fault, stack trace can be sent with the fault message. The - following flag will control --> - <!--that behavior. --> - <parameter name="sendStacktraceDetailsWithFaults">false</parameter> - - <!--If there aren't any information available to find out the fault reason, - we set the message of the exception --> - <!--as the faultreason/Reason. But when a fault is thrown from a service - or some where, it will be --> - <!--wrapped by different levels. Due to this the initial exception message - can be lost. If this flag --> - <!--is set, then Axis2 tries to get the first exception and set its message - as the faultreason/Reason. --> - <parameter name="DrillDownToRootCauseForFaultReason">false</parameter> - - <parameter name="userName">admin</parameter> - <parameter name="password">axis2</parameter> - - <!--To override repository/services you need to uncomment following parameter - and value SHOULD be absolute file path. --> - <!--ServicesDirectory only works on the following cases --> - <!---File based configurator and in that case the value should be a file - URL (http:// not allowed) --> - <!---When creating URL Based configurator with URL file:// --> - <!--- War based configurator with expanded case , --> - - <!--All the other scenarios it will be ignored. --> - <!--<parameter name="ServicesDirectory">service</parameter> --> - <!--To override repository/modules you need to uncomment following parameter - and value SHOULD be absolute file path --> - <!--<parameter name="ModulesDirectory">modules</parameter> --> - - - <!--Following params will set the proper context paths for invocations. - All the endpoints will have a commons context --> - <!--root which can configured using the following contextRoot parameter --> - <!--<parameter name="contextRoot">axis2</parameter> --> - - <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters - can be used to distinguiush those endpoints --> - <!--In case of a servlet, if you change this you have to manually change - the settings of your servlet container to map this --> - <!--context path to proper Axis2 servlets --> - <!--<parameter name="servicePath">services</parameter> --> - <!--<parameter name="restPath">rest</parameter> --> - - <!-- Following parameter will completely disable REST handling in Axis2 --> - <parameter name="disableREST" locked="false">false</parameter> - - <!-- Following parameter will suppress generation of SOAP 1.2 bindings - in auto-generated WSDL files --> - <parameter name="disableSOAP12" locked="true">false</parameter> - - <!--POJO deployer , this will alow users to drop .class file and make - that into a service --> - <deployer extension=".class" directory="pojo" - class="org.apache.axis2.deployment.POJODeployer" /> - <deployer extension=".jar" directory="servicejars" - class="org.apache.axis2.jaxws.framework.JAXWSDeployer" /> - <deployer extension=".jar" directory="transports" - class="org.apache.axis2.deployment.TransportDeployer" /> - - <!--CORBA deployer , this will alow users to invoke remote CORBA services - through Axis2 --> - <!--<deployer extension=".xml" directory="corba" class="org.apache.axis2.corba.deployer.CorbaDeployer"/> --> - - <!--<deployer extension=".jsa" directory="rmiservices" class="org.apache.axis2.rmi.deploy.RMIServiceDeployer"/> --> - - - <!-- Following parameter will set the host name for the epr --> - <!--<parameter name="hostname" locked="true">myhost.com</parameter> --> - - <!-- If you have a front end host which exposes this webservice using - a different public URL --> - <!-- use this parameter to override autodetected url --> - <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter> --> - - - <!-- The way of adding listener to the system --> - <!-- <listener class="org.apache.axis2.ObserverIMPL"> --> - <!-- <parameter name="RSS_URL">http://127.0.0.1/rss</parameter> --> - <!-- </listener> --> - - <threadContextMigrators> - <threadContextMigrator listId="JAXWS-ThreadContextMigrator-List" - class="org.apache.axis2.jaxws.addressing.migrator.EndpointContextMapMigrator" /> - </threadContextMigrators> - - <!-- ================================================= --> - <!-- Message Receivers --> - <!-- ================================================= --> - <!--This is the default MessageReceiver for the system , if you want - to have MessageReceivers for --> - <!--all the other MEP implement it and add the correct entry to here - , so that you can refer from --> - <!--any operation --> - <!--Note : You can override this for a particular service by adding the - same element with your requirement --> - <messageReceivers> - <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"; - class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" /> - <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"; - class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" /> - <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"; - class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" /> - <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"; - class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" /> - <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"; - class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" /> - <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"; - class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" /> - </messageReceivers> - - <!-- ================================================= --> - <!-- Message Formatter --> - <!-- ================================================= --> - <!--Following content type to message formatter mapping can be used to - implement support for different message --> - <!--format serialization in Axis2. These message formats are expected - to be resolved based on the content type. --> - <messageFormatters> - <messageFormatter contentType="application/x-www-form-urlencoded" - class="org.apache.axis2.transport.http.XFormURLEncodedFormatter" /> - <messageFormatter contentType="multipart/form-data" - class="org.apache.axis2.transport.http.MultipartFormDataFormatter" /> - <messageFormatter contentType="application/xml" - class="org.apache.axis2.transport.http.ApplicationXMLFormatter" /> - <messageFormatter contentType="text/xml" - class="org.apache.axis2.transport.http.SOAPMessageFormatter" /> - <messageFormatter contentType="application/soap+xml" - class="org.apache.axis2.transport.http.SOAPMessageFormatter" /> - <messageFormatter contentType="application/json" - class="org.apache.airavata.json.StaxonJSONFormatter"/> - </messageFormatters> - - <!-- ================================================= --> - <!-- Message Builders --> - <!-- ================================================= --> - <!--Following content type to builder mapping can be used to implement - support for different message --> - <!--formats in Axis2. These message formats are expected to be resolved - based on the content type. --> - <messageBuilders> - <messageBuilder contentType="application/xml" - class="org.apache.axis2.builder.ApplicationXMLBuilder" /> - <messageBuilder contentType="application/x-www-form-urlencoded" - class="org.apache.axis2.builder.XFormURLEncodedBuilder" /> - <messageBuilder contentType="multipart/form-data" - class="org.apache.axis2.builder.MultipartFormDataBuilder" /> - <messageBuilder contentType="application/json" - class="org.apache.airavata.json.StaxonJSONBuilder"/> - </messageBuilders> - - <!-- ================================================= --> - <!-- Transport Ins --> - <!-- ================================================= --> - <transportReceiver name="http" - class="org.apache.axis2.transport.http.SimpleHTTPServer"> - <parameter name="port">8080</parameter> - <!-- Here is the complete list of supported parameters (see example - settings further below): port: the port to listen on (default 6060) hostname: - if non-null, url prefix used in reply-to endpoint references (default null) - originServer: value of http Server header in outgoing messages (default "Simple-Server/1.1") - requestTimeout: value in millis of time that requests can wait for data (default - 20000) requestTcpNoDelay: true to maximize performance and minimize latency - (default true) false to minimize bandwidth consumption by combining segments - requestCoreThreadPoolSize: number of threads available for request processing - (unless queue fills up) (default 25) requestMaxThreadPoolSize: number of - threads available for request processing if queue fills up (default 150) - note that default queue never fills up: see HttpFactory threadKeepAliveTime: - time to keep threads in excess of core size alive while inactive (default - 180) note that no such threads can exist with default unbounded request queue - threadKeepAliveTimeUnit: TimeUnit of value in threadKeepAliveTime (default - SECONDS) (default SECONDS) --> - <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter> --> - <!-- <parameter name="originServer">My-Server/1.1</parameter> --> - <!-- <parameter name="requestTimeout">10000</parameter> --> - <!-- <parameter name="requestTcpNoDelay">false</parameter> --> - <!-- <parameter name="requestCoreThreadPoolSize">50</parameter> --> - <!-- <parameter name="requestMaxThreadPoolSize">100</parameter> --> - <!-- <parameter name="threadKeepAliveTime">240000</parameter> --> - <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> --> - </transportReceiver> - - <!--Uncomment if you want to have TCP transport support --> - <!--transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer"> - <parameter name="port">6060</parameter --> - > - <!--If you want to give your own host address for EPR generation --> - <!--uncomment the following paramter , and set it as you required. --> - <!--<parameter name="hostname">tcp://myApp.com/ws</parameter> --> - <!-- /transportReceiver --> - - <!-- ================================================= --> - <!-- Transport Outs --> - <!-- ================================================= --> - - <!--Uncomment if you want to have TCP transport support --> - <!-- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/> --> - <transportSender name="local" - class="org.apache.axis2.transport.local.LocalTransportSender" /> - <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> - <parameter name="PROTOCOL">HTTP/1.1</parameter> - <parameter name="Transfer-Encoding">chunked</parameter> - - <!-- If following is set to 'true', optional action part of the Content-Type - will not be added to the SOAP 1.2 messages --> - <!-- <parameter name="OmitSOAP12Action">true</parameter> --> - </transportSender> - - <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> - <parameter name="PROTOCOL">HTTP/1.1</parameter> - <parameter name="Transfer-Encoding">chunked</parameter> - </transportSender> - - <!-- Please enable this if you need the java transport --> - <!-- <transportSender name="java" class="org.apache.axis2.transport.java.JavaTransportSender"/> --> - - <!-- ================================================= --> - <!-- Global Modules --> - <!-- ================================================= --> - <!-- Comment this to disable Addressing --> - <module ref="addressing" /> - - <!--Configuring module , providing parameters for modules whether they - refer or not --> - <!--<moduleConfig name="addressing"> --> - <!--<parameter name="addressingPara">N/A</parameter> --> - <!--</moduleConfig> --> - - <!-- ================================================= --> - <!-- Clustering --> - <!-- ================================================= --> - <!-- To enable clustering for this node, set the value of "enable" attribute - of the "cluster" element to "true". The initilization of a node in the cluster - is handled by the class corresponding to the "class" attribute of the "cluster" - element. It is also responsible for getting this node to join the cluster. --> - <cluster class="org.apache.axis2.clustering.tribes.TribesClusterManager" - enable="false"> - - <!-- This parameter indicates whther the cluster has to be automatically - initalized when the AxisConfiguration is built. If set to "true" the initialization - will not be done at that stage, and some other party will have to explictly - initialize the cluster. --> - <parameter name="AvoidInitiation">true</parameter> - - <!-- Indicates whether this member is active or not. This will be - useful in a setup where members are deployed in ACTIVE and/or PASSIVE configuration --> - <parameter name="isActive">true</parameter> - - <!-- An implementation of org.apache.axis2.clustering.MembershipListener - which will be called on membership changes --> - <!-- <parameter name="membershipListener"> <class>org.apache.axis2.clustering.MembershipListenerImpl</class> - <properties> <property name="foo">bar</property> </properties> </parameter> --> - - <!-- The membership scheme used in this setup. The only values supported - at the moment are "multicast" and "wka" 1. multicast - membership is automatically - discovered using multicasting 2. wka - Well-Known Address based multicasting. - Membership is discovered with the help of one or more nodes running at a - Well-Known Address. New members joining a cluster will first connect to a - well-known node, register with the well-known node and get the membership - list from it. When new members join, one of the well-known nodes will notify - the others in the group. When a member leaves the cluster or is deemed to - have left the cluster, it will be detected by the Group Membership Service - (GMS) using a TCP ping mechanism. --> - <parameter name="membershipScheme">multicast</parameter> - - <!-- The clustering domain/group. Nodes in the same group will belong - to the same multicast domain. There will not be interference between nodes - in different groups. --> - <parameter name="domain">apache.axis2.domain</parameter> - - <!-- This parameter is only valid when the "mode" parameter is set - to application. This indicates the domain in which the the applications being - load balanced are deployed. --> - <parameter name="applicationDomain">apache.axis2.application.domain - </parameter> - - <!-- When a Web service request is received, and processed, before - the response is sent to the client, should we update the states of all members - in the cluster? If the value of this parameter is set to "true", the response - to the client will be sent only after all the members have been updated. - Obviously, this can be time consuming. In some cases, such this overhead - may not be acceptable, in which case the value of this parameter should be - set to "false" --> - <parameter name="synchronizeAll">true</parameter> - - <!-- The maximum number of times we need to retry to send a message - to a particular node before giving up and considering that node to be faulty --> - <parameter name="maxRetries">10</parameter> - - <!-- The multicast address to be used --> - <parameter name="mcastAddress">228.0.0.4</parameter> - - <!-- The multicast port to be used --> - <parameter name="mcastPort">45564</parameter> - - <!-- The frequency of sending membership multicast messages (in ms) --> - <parameter name="mcastFrequency">500</parameter> - - <!-- The time interval within which if a member does not respond, - the member will be deemed to have left the group (in ms) --> - <parameter name="memberDropTime">3000</parameter> - - <!-- The IP address of the network interface to which the multicasting - has to be bound to. Multicasting would be done using this interface. --> - <parameter name="mcastBindAddress">127.0.0.1</parameter> - - <!-- The host name or IP address of this member --> - <parameter name="localMemberHost">127.0.0.1</parameter> - - <!-- The TCP port used by this member. This is the port through which - other nodes will contact this member --> - <parameter name="localMemberPort">4000</parameter> - - <!-- Preserve message ordering. This will be done according to sender - order. --> - <parameter name="preserveMessageOrder">true</parameter> - - <!-- Maintain atmost-once message processing semantics --> - <parameter name="atmostOnceMessageSemantics">true</parameter> - - <!-- The list of static or well-known members. These entries will - only be valid if the "membershipScheme" above is set to "wka" --> - <members> - <member> - <hostName>127.0.0.1</hostName> - <port>4000</port> - </member> - <member> - <hostName>127.0.0.1</hostName> - <port>4001</port> - </member> - </members> - - <!-- Enable the load balancer entry if you need to run this node - as a load balancer. Multiple application domains with different LoadBalanceEventHandler - implementations can be defined in this section. --> - <loadBalancer enable="false"> - <applicationDomain name="apache.axis2.application.domain" - handler="org.apache.axis2.clustering.DefaultLoadBalanceEventHandler" /> - </loadBalancer> - - <!-- This interface is responsible for handling configuration management. - Configuraion changes include: 1. Rebooting an entire cluster, in which case, - all nodes have to load the new Axis2 configuration in a consistent manner - 2. Deploying a new service to a cluster or undeploying a service from a cluster - 3. Changing the policies of a service deployed on the cluster The "enable" - attribute indicates whether Configuration management has been enabled --> - <configurationManager - class="org.apache.axis2.clustering.configuration.DefaultConfigurationManager" - enable="true"> - <listener - class="org.apache.axis2.clustering.configuration.DefaultConfigurationManagerListener" /> - </configurationManager> - - <!-- This interface is responsible for handling context replication. - The property changes in the Axis2 context hierarchy in this node, are propagated - to all other nodes in the cluster. The "excludes" patterns can be used to - specify the prefixes (e.g. local_*) or suffixes (e.g. *_local) of the properties - to be excluded from replication. The pattern "*" indicates that all properties - in a particular context should not be replicated. The "enable" attribute - indicates whether context replication has been enabled --> - <contextManager - class="org.apache.axis2.clustering.context.DefaultContextManager" - enable="true"> - <listener - class="org.apache.axis2.clustering.context.DefaultContextManagerListener" /> - <replication> - <defaults> - <exclude name="local_*" /> - <exclude name="LOCAL_*" /> - </defaults> - <context class="org.apache.axis2.context.ConfigurationContext"> - <exclude name="UseAsyncOperations" /> - <exclude name="SequencePropertyBeanMap" /> - </context> - <context class="org.apache.axis2.context.ServiceGroupContext"> - <exclude name="my.sandesha.*" /> - </context> - <context class="org.apache.axis2.context.ServiceContext"> - <exclude name="my.sandesha.*" /> - </context> - </replication> - </contextManager> - </cluster> - - <!-- ================================================= --> - <!-- Phases --> - <!-- ================================================= --> - <phaseOrder type="InFlow"> - <!-- System predefined phases --> - <phase name="Transport"> - <handler name="RequestURIBasedDispatcher" - class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"> - <order phase="Transport" /> - </handler> - <handler name="SOAPActionBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"> - <order phase="Transport" /> - </handler> - </phase> - <phase name="Addressing"> - <handler name="AddressingBasedDispatcher" - class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"> - <order phase="Addressing" /> - </handler> - </phase> - <phase name="Security" /> - <phase name="PreDispatch" /> - <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"> - <handler name="RequestURIBasedDispatcher" - class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher" /> - <handler name="SOAPActionBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher" /> - <handler name="RequestURIOperationDispatcher" - class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher" /> - <handler name="SOAPMessageBodyBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher" /> - <handler name="HTTPLocationBasedDispatcher" - class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher" /> - <handler name="GenericProviderDispatcher" - class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher" /> - <handler name="MustUnderstandValidationDispatcher" - class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher" /> - </phase> - <phase name="RMPhase" /> - <!-- System predefined phases --> - <!-- After Postdispatch phase module author or service author can - add any phase he want --> - <phase name="OperationInPhase"> - <handler name="MustUnderstandChecker" - class="org.apache.axis2.jaxws.dispatchers.MustUnderstandChecker"> - <order phase="OperationInPhase" /> - </handler> - </phase> - <phase name="soapmonitorPhase" /> - </phaseOrder> - <phaseOrder type="OutFlow"> - <!-- user can add his own phases to this area --> - <phase name="soapmonitorPhase" /> - <phase name="OperationOutPhase" /> - <!--system predefined phase --> - <!--these phase will run irrespective of the service --> - <phase name="RMPhase" /> - <phase name="PolicyDetermination" /> - <phase name="MessageOut" /> - <phase name="Security" /> - </phaseOrder> - <phaseOrder type="InFaultFlow"> - <phase name="Addressing"> - <handler name="AddressingBasedDispatcher" - class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"> - <order phase="Addressing" /> - </handler> - </phase> - <phase name="Security" /> - <phase name="PreDispatch" /> - <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"> - <handler name="RequestURIBasedDispatcher" - class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher" /> - <handler name="SOAPActionBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher" /> - <handler name="RequestURIOperationDispatcher" - class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher" /> - <handler name="SOAPMessageBodyBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher" /> - <handler name="HTTPLocationBasedDispatcher" - class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher" /> - <handler name="GenericProviderDispatcher" - class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher" /> - <handler name="MustUnderstandValidationDispatcher" - class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher" /> - </phase> - <phase name="RMPhase" /> - <!-- user can add his own phases to this area --> - <phase name="OperationInFaultPhase" /> - <phase name="soapmonitorPhase" /> - </phaseOrder> - <phaseOrder type="OutFaultFlow"> - <!-- user can add his own phases to this area --> - <phase name="soapmonitorPhase" /> - <phase name="OperationOutFaultPhase" /> - <phase name="RMPhase" /> - <phase name="PolicyDetermination" /> - <phase name="MessageOut" /> - <phase name="Security" /> - </phaseOrder> -</axisconfig> - http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/configuration/server/src/main/resources/host.xml ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/host.xml b/modules/configuration/server/src/main/resources/host.xml deleted file mode 100644 index 8e57765..0000000 --- a/modules/configuration/server/src/main/resources/host.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more - contributor license agreements. See the NOTICE file ~ distributed with this - work for additional information ~ regarding copyright ownership. The ASF - licenses this file ~ to you under the Apache License, Version 2.0 (the ~ - "License"); you may not use this file except in compliance ~ with the License. - You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ ~ Unless required by applicable law or agreed to in writing, ~ software - distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the - License for the ~ specific language governing permissions and limitations - ~ under the License. --> - -<servers> - <server> - <type>local</type> - <name>LocalHost</name> - <host>127.0.0.1</host> - </server> - <!-- Test jobs for steele and forge. - <server> - <name>steele.purdue.teragrid.org</name> - <host>steele.purdue.teragrid.org</host> - <gram.endpoint>tg-steele.rcac.purdue.edu:2119/jobmanager-pbs</gram.endpoint> - <gridftp.endpoint>gsiftp://tg-data.purdue.teragrid.org:2811/</gridftp.endpoint> - </server> - - <server> - <name>forge.ncsa.teragrid.org</name> - <host>forge.ncsa.teragrid.org</host> - <gram.endpoint>grid-forge.ncsa.xsede.org:2119/jobmanager-pbs</gram.endpoint> - <gridftp.endpoint>gsiftp://gridftp-forge.ncsa.xsede.org:2811/</gridftp.endpoint> - </server> - --> - <server> - <name>globus-lonestar</name> - <type>globus</type> - <host>lonestar4.tacc.teragrid.org</host> - <gram.endpoint>gridftp1.ls4.tacc.utexas.edu:2119/jobmanager-sge</gram.endpoint> - <gridftp.endpoint>gsiftp://gridftp1.ls4.tacc.utexas.edu:2811/</gridftp.endpoint> - </server> - - <server> - <name>globus-stampede</name> - <type>globus</type> - <monitor host="stampede.tacc.utexas.edu"> - <primary>org.apache.airavata.monitor.impl.AMQPMonitor</primary> - <secondary>org.apache.airavata.monitor.impl.GramMonitor</secondary> - </monitor> - <monitor hostType="SSHHostTypeImpl"> - <primary>org.apache.airavata.monitor.impl.MoabMonitor</primary> - <secondary>org.apache.airavata.monitor.impl.QstatMonitor</secondary> - </monitor> - <host>stampede.tacc.utexas.edu</host> - <gram.endpoint>login5.stampede.tacc.utexas.edu:2119/jobmanager-slurm3</gram.endpoint> - <gridftp.endpoint>gsiftp://data1.stampede.tacc.utexas.edu:2811/</gridftp.endpoint> - </server> - - <server> - <name>globus-trestles</name> - <type>globus</type> - <host>trestles.sdsc.edu</host> - <gram.endpoint>trestles-login2.sdsc.edu:2119/jobmanager-pbstest2</gram.endpoint> - <gridftp.endpoint>gsiftp://trestles-dm1.sdsc.edu:2811/</gridftp.endpoint> - </server> - <server> - <type>ssh</type> - <name>bigred2</name> - <host>bigred2.uits.iu.edu</host> - <hpc.resource>true</hpc.resource> - </server> - <server> - <type>gsissh</type> - <name>gsissh-trestles</name> - <host>trestles.sdsc.edu</host> - </server> - <!-- - <server> - <name>kraken</name> - <host>gsissh.kraken.nics.xsede.org</host> - <gram.endpoint>grid.nics.xsede.org:2119/jobmanager-pbs</gram.endpoint> - <gridftp.endpoint>gsiftp://gridftp.kraken.nics.xsede.org:2811/</gridftp.endpoint> - </server> --> - -</servers> http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/basic/BasicAccessAuthenticator.java ---------------------------------------------------------------------- diff --git a/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/basic/BasicAccessAuthenticator.java b/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/basic/BasicAccessAuthenticator.java index 07ad123..c34cb1b 100644 --- a/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/basic/BasicAccessAuthenticator.java +++ b/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/basic/BasicAccessAuthenticator.java @@ -20,7 +20,9 @@ package org.apache.airavata.credentialstore.basic; +import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.Constants; +import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.credentialstore.session.ServletRequestHelper; import org.apache.airavata.security.AbstractAuthenticator; import org.apache.airavata.security.AuthenticationException; @@ -166,9 +168,16 @@ public class BasicAccessAuthenticator extends AbstractAuthenticator { boolean seenInSession = false; if (httpSession != null) { - String user = (String)httpSession.getAttribute(Constants.USER_IN_SESSION); - String gateway = (String)httpSession.getAttribute(Constants.GATEWAY_NAME); - + String user = null; + String gateway = null; + try{ + user = (String)httpSession.getAttribute(Constants.USER_IN_SESSION); + gateway = (String)httpSession.getAttribute(ServerSettings.getDefaultUserGateway()); + } + catch (ApplicationSettingsException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } if (user != null && gateway != null) { servletRequestHelper.addToContext(user, gateway); seenInSession = true; http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/session/ServletRequestHelper.java ---------------------------------------------------------------------- diff --git a/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/session/ServletRequestHelper.java b/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/session/ServletRequestHelper.java index c7cc85b..cccbc56 100644 --- a/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/session/ServletRequestHelper.java +++ b/modules/credential-store-service/credential-store-webapp/src/main/java/org/apache/airavata/credentialstore/session/ServletRequestHelper.java @@ -55,8 +55,13 @@ public class ServletRequestHelper { String gatewayId = getGatewayId(servletRequest); if (servletRequest.getSession() != null) { - servletRequest.getSession().setAttribute(Constants.USER_IN_SESSION, userName); - servletRequest.getSession().setAttribute(Constants.GATEWAY_NAME, gatewayId); + try { + servletRequest.getSession().setAttribute(Constants.USER_IN_SESSION, userName); + servletRequest.getSession().setAttribute(ServerSettings.getDefaultUserGateway(), gatewayId); + } catch (ApplicationSettingsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } addToContext(userName, gatewayId); @@ -93,11 +98,17 @@ public class ServletRequestHelper { } String getGatewayId(HttpServletRequest request) throws AuthenticationException { - String gatewayId = request.getHeader(Constants.GATEWAY_NAME); + String gatewayId = null; + try { + gatewayId = request.getHeader(ServerSettings.getDefaultUserGateway()); + } catch (ApplicationSettingsException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } if (gatewayId == null) { try { - gatewayId = ServerSettings.getSystemUserGateway(); + gatewayId = ServerSettings.getDefaultUserGateway(); } catch (ApplicationSettingsException e) { throw new AuthenticationException("Unable to retrieve default gateway", e); }
