#78 - embedded jetty server impl in progress

payneteasy · Jan 23, 2024 · 1989284 · 1989284
1 parent 931c5ba
commit 1989284
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/srvlog-web/src/main/java/com/payneteasy/srvlog/StartSrvlogUIApp.java b/srvlog-web/src/main/java/com/payneteasy/srvlog/StartSrvlogUIApp.java
@@ -5,6 +5,7 @@
 import org.eclipse.jetty.plus.webapp.EnvConfiguration;
 import org.eclipse.jetty.plus.webapp.PlusConfiguration;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,9 +26,10 @@ public static void main(String[] args) throws Exception {
 
             WebAppContext webAppContext = new WebAppContext();
             webAppContext.setContextPath(config.getJettyContext());
-            webAppContext.setDefaultsDescriptor("src/main/webapp/WEB-INF/web.xml");
+            webAppContext.setDefaultsDescriptor("embedded-webapp/WEB-INF/web.xml");
             webAppContext.setDescriptor(config.webDescriptorPath());
-            webAppContext.setWar("src/main/webapp");
+            Resource webappResource = Resource.newClassPathResource("embedded-webapp");
+            webAppContext.setWarResource(webappResource);
 
             EnvConfiguration envConfiguration = new EnvConfiguration();
             envConfiguration.setJettyEnvXml(new File(config.getJettyEnvConfigPath()).toURI().toURL());

diff --git a/...webapp/WEB-INF/spring/spring-security.xml → ...webapp/WEB-INF/spring/spring-security.xml b/...webapp/WEB-INF/spring/spring-security.xml → ...webapp/WEB-INF/spring/spring-security.xml
diff --git a/...p/WEB-INF/spring/spring-ui-datasource.xml → ...p/WEB-INF/spring/spring-ui-datasource.xml b/...p/WEB-INF/spring/spring-ui-datasource.xml → ...p/WEB-INF/spring/spring-ui-datasource.xml
diff --git a/srvlog-web/src/main/webapp/WEB-INF/web.xml → ...resources/embedded-webapp/WEB-INF/web.xml b/srvlog-web/src/main/webapp/WEB-INF/web.xml → ...resources/embedded-webapp/WEB-INF/web.xml