Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

preseed.cfg was being server from target/classes but not from the jar

This commit is contained in:
David Ribeiro Alves 2012-03-15 06:33:37 +00:00
parent c9c4a1aef0
commit 641f530e0c
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/StartJettyIfNotAlreadyRunning.java
View File

@ -23,14 +23,21 @@ import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Throwables.propagate;
import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_PRECONFIGURATION_URL;
import java.io.IOException;
import java.net.URI;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerList;
@ -82,25 +89,30 @@ public class StartJettyIfNotAlreadyRunning extends CacheLoader<IsoSpec, URI> {
logger.debug("not starting jetty, as existing host is serving %s", preconfigurationUrl);
} else {
try {
logger.debug(">> starting jetty to serve %s", preconfigurationUrl);
Resource resource = Resource.newClassPathResource("preseed.cfg");
checkState(resource.getInputStream() != null, "cannot find preseed.cfg");
// find the the parent dir inside the jar to serve the file from
ContextHandler capHandler = new ContextHandler();
capHandler.setContextPath("/preseed.cfg");
ResourceHandler resourceHandler = new ResourceHandler();
resourceHandler.setBaseResource(resource);
capHandler.setHandler(resourceHandler);
final String preseedFile = IOUtils
.toString(Resource.newSystemResource("preseed.cfg").getURL().openStream());
HandlerList handlers = new HandlerList();
handlers.setHandlers(new Handler[] { capHandler, new DefaultHandler() });
jetty.setHandler(handlers);
checkState(preseedFile != null);
// since we're only serving the preseed.cfg file respond to all requests with it
jetty.setHandler(new AbstractHandler() {
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
response.setContentType("text/plain;charset=utf-8");
response.setStatus(HttpServletResponse.SC_OK);
baseRequest.setHandled(true);
response.getWriter().println(preseedFile);
}
});
jetty.start();
logger.debug("<< serving %s", resourceHandler.getBaseResource());
} catch (Exception e) {
logger.error(e, "Server jetty could not be started for %s", preconfigurationUrl);
throw Throwables.propagate(e);

9
labs/virtualbox/src/test/java/org/jclouds/virtualbox/StartJettyIfNotAlreadyRunningLiveTest.java
View File

@ -18,6 +18,8 @@
*/
package org.jclouds.virtualbox;
import static junit.framework.Assert.assertEquals;
import java.net.URI;
import java.net.URL;
import java.util.Properties;
@ -52,8 +54,9 @@ public class StartJettyIfNotAlreadyRunningLiveTest {
starter.load(null);
// if this opens up a file we're golden
IOUtils.toString(new URL("http://127.0.0.1:" + port + "/preseed.cfg").openStream());
String preseedFileFromJetty = IOUtils.toString(new URL("http://127.0.0.1:" + port + "/preseed.cfg").openStream());
String preseedFileFromFile = IOUtils
.toString(this.getClass().getClassLoader().getResourceAsStream("preseed.cfg")) + "\n";
assertEquals(preseedFileFromFile, preseedFileFromJetty);
}
}