Skip to content

Commit

Permalink
update dependencies and package names
Browse files Browse the repository at this point in the history
  • Loading branch information
rchatley committed Sep 18, 2018
1 parent ca1fd60 commit 11f29ab
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 51 deletions.
13 changes: 10 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,26 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ic.doc</groupId>
<groupId>com.develogical</groupId>
<version>1.0-SNAPSHOT</version>
<artifactId>SkeletonWebApp</artifactId>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>9.4.0.RC3</version>
<version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
Expand All @@ -36,7 +43,7 @@
<assembleDirectory>target</assembleDirectory>
<programs>
<program>
<mainClass>ic.doc.WebServer</mainClass>
<mainClass>com.develogical.WebServer</mainClass>
<name>skeletonwebapp</name>
</program>
</programs>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ic.doc;
package com.develogical;

public class QueryProcessor {

Expand Down
48 changes: 48 additions & 0 deletions src/main/java/com/develogical/WebServer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.develogical;

import com.develogical.web.IndexPage;
import com.develogical.web.ResultsPage;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder;

public class WebServer {

public WebServer() throws Exception {

Server server = new Server(portNumberToUse());

ServletHandler handler = new ServletHandler();
handler.addServletWithMapping(new ServletHolder(new Website()), "/*");
server.setHandler(handler);

server.start();
}

static class Website extends HttpServlet {

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
String query = req.getParameter("q");
if (query == null) {
new IndexPage().writeTo(resp);
} else {
new ResultsPage(query, new QueryProcessor().process(query)).writeTo(resp);
}
}
}

private Integer portNumberToUse() {
return System.getenv("PORT") != null ? Integer.valueOf(System.getenv("PORT")) : 8080;
}

public static void main(String[] args) throws Exception {
new WebServer();
}

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ic.doc.web;
package com.develogical.web;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ic.doc.web;
package com.develogical.web;

import java.io.PrintWriter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ic.doc.web;
package com.develogical.web;

import java.io.PrintWriter;

Expand Down
43 changes: 0 additions & 43 deletions src/main/java/ic/doc/WebServer.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ic.doc;
package com.develogical;

import org.junit.Test;

Expand Down

0 comments on commit 11f29ab

Please sign in to comment.