Skip to content

Commit 8475ee5

Browse files
committed
[breaking] servers - renamed JettyWebServer Jetty8WebServer, same for module and properties + added SessionsTest for jetty 8
1 parent 95ed631 commit 8475ee5

File tree

7 files changed

+45
-48
lines changed

7 files changed

+45
-48
lines changed

restx-core-shell/src/main/resources/templates/srv/main/src/main/java/$packagePath$/_AppServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.google.common.base.Optional;
44
import restx.server.WebServer;
5-
import restx.server.JettyWebServer;
5+
import restx.server.Jetty8WebServer;
66

77
/**
88
* This class can be used to run the app.
@@ -17,7 +17,7 @@ public class AppServer {
1717

1818
public static void main(String[] args) throws Exception {
1919
int port = Integer.valueOf(Optional.fromNullable(System.getenv("PORT")).or("{{defaultPort}}"));
20-
WebServer server = new JettyWebServer(WEB_INF_LOCATION, WEB_APP_LOCATION, port, "0.0.0.0");
20+
WebServer server = new Jetty8WebServer(WEB_INF_LOCATION, WEB_APP_LOCATION, port, "0.0.0.0");
2121

2222
/*
2323
* load mode from system property if defined, or default to dev

restx-samplest/src/main/java/samplest/AppServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package samplest;
22

33
import com.google.common.base.Optional;
4-
import restx.server.JettyWebServer;
4+
import restx.server.Jetty8WebServer;
55
import restx.server.WebServer;
66
//import restx.server.simple.simple.SimpleWebServer;
77

@@ -15,7 +15,7 @@ public class AppServer {
1515

1616
public static void main(String[] args) throws Exception {
1717
int port = Integer.valueOf(Optional.fromNullable(System.getenv("PORT")).or("8080"));
18-
WebServer server = new JettyWebServer(WEB_INF_LOCATION, WEB_APP_LOCATION, port, "0.0.0.0");
18+
WebServer server = new Jetty8WebServer(WEB_INF_LOCATION, WEB_APP_LOCATION, port, "0.0.0.0");
1919

2020
/*
2121
* load mode from system property if defined, or default to dev
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package restx.server;
2+
3+
import restx.factory.Module;
4+
import restx.factory.Provides;
5+
6+
import javax.inject.Named;
7+
8+
/**
9+
* @author fcamblor
10+
*/
11+
@Module(priority = 1000)
12+
public class Jetty8ServerModule {
13+
@Provides
14+
@Named("restx.server.jetty8.webxml.default.location")
15+
public String restxServerJettyWebXmlDefaultLocation(@Named("restx.server.jetty8.appbase.default.location") String appBase) {
16+
return appBase+"/WEB-INF/web.xml";
17+
}
18+
19+
20+
@Provides
21+
@Named("restx.server.jetty8.appbase.default.location")
22+
public String restxServerJettyAppBaseDefaultLocation() {
23+
return "src/main/webapp";
24+
}
25+
26+
@Provides
27+
@Named("restx.server.jetty8")
28+
public WebServerSupplier jettyWebServerSupplier(
29+
@Named("restx.server.jetty8.appbase.default.location") String appBase,
30+
@Named("restx.server.jetty8.webxml.default.location") String webxml){
31+
return Jetty8WebServer.jettyWebServerSupplier(webxml, appBase);
32+
}
33+
}

restx-server-jetty8/src/main/java/restx/server/JettyWebServer.java renamed to restx-server-jetty8/src/main/java/restx/server/Jetty8WebServer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020
import static restx.common.MoreFiles.checkFileExists;
2121

22-
public class JettyWebServer extends WebServerBase {
23-
private static final Logger logger = LoggerFactory.getLogger(JettyWebServer.class);
22+
public class Jetty8WebServer extends WebServerBase {
23+
private static final Logger logger = LoggerFactory.getLogger(Jetty8WebServer.class);
2424

2525
private Server server;
2626
private String webInfLocation;
2727

28-
public JettyWebServer(String appBase, int aPort) {
28+
public Jetty8WebServer(String appBase, int aPort) {
2929
this(null, appBase, aPort, null);
3030
}
3131

32-
public JettyWebServer(String webInfLocation, String appBase, int port, String bindInterface) {
32+
public Jetty8WebServer(String webInfLocation, String appBase, int port, String bindInterface) {
3333
super(checkNotNull(appBase), port, bindInterface, "Jetty8", "org.eclipse.jetty", "jetty-server");
3434

3535
if (webInfLocation != null) {
@@ -115,7 +115,7 @@ public static WebServerSupplier jettyWebServerSupplier(final String webInfLocati
115115
return new WebServerSupplier() {
116116
@Override
117117
public WebServer newWebServer(int port) {
118-
return new JettyWebServer(webInfLocation, appBase, port, "0.0.0.0");
118+
return new Jetty8WebServer(webInfLocation, appBase, port, "0.0.0.0");
119119
}
120120
};
121121
}
@@ -128,6 +128,6 @@ public static void main(String[] args) throws Exception {
128128

129129
String appBase = args[0];
130130
int port = args.length > 1 ? Integer.parseInt(args[1]) : 8086;
131-
new JettyWebServer(appBase + "WEB-INF/web.xml", appBase, port, "0.0.0.0").startAndAwait();
131+
new Jetty8WebServer(appBase + "WEB-INF/web.xml", appBase, port, "0.0.0.0").startAndAwait();
132132
}
133133
}

restx-server-jetty8/src/main/java/restx/server/JettyServerModule.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

restx-server-jetty8/src/test/java/restx/server/WebServerExample.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.google.common.collect.ImmutableMap;
66
import restx.*;
77
import restx.entity.MatchedEntityOutputRoute;
8-
import restx.entity.MatchedEntityRoute;
98
import restx.servlet.AbstractRestxMainRouterServlet;
109

1110
import java.io.IOException;
@@ -46,7 +45,7 @@ public Optional<?> route(RestxRequest restxRequest, RestxRequestMatch match) thr
4645

4746

4847
public static void main(String[] args) throws Exception {
49-
WebServer webServer = new JettyWebServer(
48+
WebServer webServer = new Jetty8WebServer(
5049
"src/test/resources/restx/server/WebServerExample-web.xml",
5150
".", 8080, "localhost");
5251
webServer.startAndAwait();

restx-specs-tests/src/test/java/restx/ResourcesRouteTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import java.io.IOException;
1010

11-
import static restx.server.JettyWebServer.jettyWebServerSupplier;
11+
import static restx.server.Jetty8WebServer.jettyWebServerSupplier;
1212

1313
/**
1414
* @author fcamblor

0 commit comments

Comments
 (0)