diff --git a/src/main/java/org/gcube/common/core/publisher/is/legacy/LegacyISPublisher.java b/src/main/java/org/gcube/common/core/publisher/is/legacy/LegacyISPublisher.java index ad74456..9bac844 100644 --- a/src/main/java/org/gcube/common/core/publisher/is/legacy/LegacyISPublisher.java +++ b/src/main/java/org/gcube/common/core/publisher/is/legacy/LegacyISPublisher.java @@ -79,7 +79,9 @@ public class LegacyISPublisher implements Publisher{ public void run() { try { logger.info("(inside task)publishing application in context {}", context); - registry.getStubs().create(toXml(enpoint), enpoint.type().toString()); + String resource = toXml(enpoint); + registry.getStubs().create(resource, enpoint.type().toString()); + logger.debug("publisher resource in context {} : {}",context, resource); }catch (Exception e) { logger.error("erro publishing application", e); throw new RuntimeException(e); diff --git a/src/main/java/org/gcube/common/core/publisher/is/legacy/application/ApplicationProfileBuilder.java b/src/main/java/org/gcube/common/core/publisher/is/legacy/application/ApplicationProfileBuilder.java index b2d6ac6..04db9b9 100644 --- a/src/main/java/org/gcube/common/core/publisher/is/legacy/application/ApplicationProfileBuilder.java +++ b/src/main/java/org/gcube/common/core/publisher/is/legacy/application/ApplicationProfileBuilder.java @@ -8,15 +8,18 @@ import java.util.List; import javax.servlet.ServletRegistration; import org.gcube.common.resources.gcore.GCoreEndpoint; +import org.gcube.smartgears.configuration.ProxyAddress; import org.gcube.smartgears.configuration.application.ApplicationConfiguration; import org.gcube.smartgears.configuration.container.ContainerConfiguration; import org.gcube.smartgears.context.application.ApplicationContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ApplicationProfileBuilder { private static List servletExcludes = Arrays.asList("default","jsp"); - // private static final Logger log = LoggerFactory.getLogger(ProfileBuilder.class); + private static final Logger log = LoggerFactory.getLogger(ApplicationProfileBuilder.class); private ApplicationContext context; @@ -44,15 +47,18 @@ public class ApplicationProfileBuilder { endpoint.profile().newDeploymentData() .activationTime(Calendar.getInstance()) .status((context.lifecycle().state().remoteForm())); - + + log.debug("publishing aplication profile with id {} for {} with status {}",context.id(), configuration.name(), context.lifecycle().state().remoteForm()); + endpoint.profile().endpoints().clear(); String baseAddress; - if (configuration.proxied() && container.proxy()!=null){ - String protocol = container.proxy().getProtocol(); - String port = container.proxy().getPort()!=null?":"+container.proxy().getPort():""; + if (configuration.proxyAddress()!=null){ + ProxyAddress proxy = configuration.proxyAddress(); + String protocol = proxy.getProtocol(); + String port = proxy.getPort()!=null?":"+proxy.getPort():""; - baseAddress=String.format("%s://%s%s%s", protocol , container.proxy().getHostname(), port,context.application().getContextPath()); + baseAddress=String.format("%s://%s%s%s", protocol , proxy.getHostname(), port,context.application().getContextPath()); } else { String protocol = container.protocol(); int port = container.port();