gCubeSystem
/
resource-registry-handlers
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code review 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/resource-registry-handlers@146560 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2017-04-04 14:55:17 +00:00
parent bcfcabdd98
commit 9cec982786
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java
View File

@ -5,24 +5,18 @@ import org.gcube.informationsystem.model.entity.resource.HostingNode;
/**
* Library-wide constants.
*
*
* @author Fabio Simeoni
*
* @author Luca Frosini
* @author Lucio Lelii
*/
public class Constants {
public static final String HOSTING_NODE_PROPERTY = HostingNode.NAME;
/**
* The configuration name of {@link EServiceManager} and {@link HostingNodeManager}.
*/
public static final String RESOURCE_MANAGEMENT = "resource-management";
/**
* The name of the context property that contains the EService Resource.
*/
@ -31,4 +25,5 @@ public class Constants {
public static final long default_container_publication_frequency_in_seconds = 60;
public static final int application_republish_frequency_in_minutes = 20;
}

34
src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
View File

@ -597,6 +597,24 @@ public class EServiceManager extends ApplicationLifecycleHandler {
}
private static String getBaseAddress(ApplicationContext context){
ApplicationConfiguration configuration = context.configuration();
ContainerConfiguration container = context.container().configuration();
String baseAddress;
if (configuration.proxied()){
String protocol = container.proxyAddress().secure()? "https://": "http://";
int port = container.proxyAddress().port();
baseAddress=String.format("%s%s:%d%s", protocol , container.proxyAddress().hostname(), port, context.application().getContextPath());
} else {
String protocol = configuration.secure()? "https://": "http://";
int port = configuration.secure()?container.securePort(): container.port();
baseAddress=String.format("%s%s:%d%s", protocol , container.hostname(), port, context.application().getContextPath());
}
return baseAddress;
}
private EService instantiateEService() {
logger.info("Creating EService for {}", applicationContext.name());
@ -618,21 +636,7 @@ public class EServiceManager extends ApplicationLifecycleHandler {
eService, softwareFacet, null);
eService.addFacet(isIdentifiedBy);
ApplicationConfiguration configuration = applicationContext.configuration();
ContainerConfiguration container = applicationContext.container().configuration();
String baseAddress;
if (configuration.proxied()){
String protocol = container.proxyAddress().secure()? "https://": "http://";
int port = container.proxyAddress().port();
baseAddress=String.format("%s%s:%d%s", protocol , container.proxyAddress().hostname(), port,applicationContext.application().getContextPath());
} else {
String protocol = configuration.secure()? "https://": "http://";
int port = configuration.secure()?container.securePort(): container.port();
baseAddress=String.format("%s%s:%d%s", protocol , container.hostname(), port,applicationContext.application().getContextPath());
}
String baseAddress = EServiceManager.getBaseAddress(applicationContext);
for (ServletRegistration servlet : applicationContext.application()
.getServletRegistrations().values()) {
if (!servletExcludes.contains(servlet.getName())) {