import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.preventers.AppContextLeakPreventer;
import org.eclipse.jetty.webapp.WebAppContext;
import org.osgi.framework.Bundle;
+import eu.etaxonomy.taxeditor.webapp.server.RemotingLoginDialogLocal;
+
/**
* (Singleton) Server instance which manages a compatible cdmlib-webapp-war.
* This is done by launching a jetty instance (using jetty-runner) as an
private boolean forceSchemaUpdate = false;
public CdmServer(String dataSourceName, File dataSourcesFile) throws CdmEmbeddedServerException {
- if(StringUtil.isBlank(dataSourceName)) {
+ if(StringUtils.isBlank(dataSourceName)) {
throw new CdmEmbeddedServerException("DataSource name is not valid");
}
server.addBean(new AppContextLeakPreventer());
WebAppContext webapp = new WebAppContext();
+
webapp.setContextPath(contextPath);
webapp.setWar(warFile.getAbsolutePath());
webapp.setThrowUnavailableOnStartupException(true);
throw new CdmEmbeddedServerException("Could not find a free TCP/IP port to start embedded Jetty HTTP Server on");
}
- public void start(ICDMServerError cdmServerError) throws CdmEmbeddedServerException {
+ public void start(CDMServerError cdmServerError) throws CdmEmbeddedServerException {
start(true, cdmServerError);
}
- public void start(boolean wait, final ICDMServerError cdmServerError) throws CdmEmbeddedServerException {
+ public void start(boolean wait, final RemotingLoginDialogLocal remotingLoginDialogLocal) throws CdmEmbeddedServerException {
if(server == null) {
throw new CdmEmbeddedServerException("Server is already disposed");
cause = cause.getCause();
}
}
- cdmServerError.handleError(new RuntimeException("Error during CDM server startup", t));
+ remotingLoginDialogLocal.handleError(new RuntimeException("Error during CDM server startup", t));
}
}
};