-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [Update] JSON-logging V0.0.8 * [Update] Changelog
- Loading branch information
1 parent
b8bb035
commit d0c815c
Showing
7 changed files
with
312 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
153 changes: 153 additions & 0 deletions
153
...dded-8.5/src/shared/main/java/eu/xenit/alfresco/tomcat/embedded/tomcat/TomcatFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| package eu.xenit.alfresco.tomcat.embedded.tomcat; | ||
|
|
||
| import eu.xenit.alfresco.tomcat.embedded.config.TomcatConfiguration; | ||
| import eu.xenit.logging.json.valve.JsonAccessLogValve85; | ||
| import org.apache.catalina.LifecycleException; | ||
| import org.apache.catalina.LifecycleListener; | ||
| import org.apache.catalina.Service; | ||
| import org.apache.catalina.WebResourceRoot; | ||
| import org.apache.catalina.connector.Connector; | ||
| import org.apache.catalina.core.StandardContext; | ||
| import org.apache.catalina.startup.Tomcat; | ||
| import org.apache.catalina.webresources.DirResourceSet; | ||
| import org.apache.catalina.webresources.StandardRoot; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static eu.xenit.alfresco.tomcat.embedded.utils.Utils.redirectLog4j; | ||
|
|
||
| public class TomcatFactory { | ||
|
|
||
| private final TomcatConfiguration configuration; | ||
|
|
||
| public TomcatFactory(TomcatConfiguration configuration) { | ||
| this.configuration = configuration; | ||
| } | ||
|
|
||
| public static Connector getConnector(Tomcat tomcat, String protocol, int port, boolean sslEnabled, String scheme, int maxThreads, int maxHttpHeaderSize, String relaxedPathChars, String relaxedQueryChars) { | ||
| Connector connector = new Connector(protocol); | ||
| connector.setPort(port); | ||
| connector.setProperty("connectionTimeout", "240000"); | ||
| connector.setURIEncoding(StandardCharsets.UTF_8.name()); | ||
| connector.setProperty("SSLEnabled", String.valueOf(sslEnabled)); | ||
| connector.setProperty("maxThreads", String.valueOf(maxThreads)); | ||
| connector.setProperty("maxHttpHeaderSize", String.valueOf(maxHttpHeaderSize)); | ||
| connector.setProperty("relaxedPathChars", relaxedPathChars); | ||
| connector.setProperty("relaxedQueryChars", relaxedQueryChars); | ||
| connector.setScheme(scheme); | ||
| Service service = tomcat.getService(); | ||
| service.setContainer(tomcat.getEngine()); | ||
| connector.setService(service); | ||
| return connector; | ||
| } | ||
|
|
||
| private TomcatConfiguration getConfiguration() { | ||
| return configuration; | ||
| } | ||
|
|
||
| public Tomcat getTomcat() throws IOException { | ||
| Tomcat tomcat = new Tomcat(); | ||
| tomcat.setBaseDir(getConfiguration().getTomcatBaseDir()); | ||
| tomcat.setPort(getConfiguration().getTomcatPort()); | ||
| tomcat.getServer().setPort(getConfiguration().getTomcatServerPort()); | ||
| createDefaultConnector(tomcat); | ||
| addUserWithRole(tomcat, "CN=Alfresco Repository Client, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB", null, "repoclient"); | ||
| addUserWithRole(tomcat, "CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB", null, "repository"); | ||
| Path webapps = Paths.get(getConfiguration().getWebappsPath()); | ||
| if (Files.exists(webapps)) { | ||
| try (var directoryStream = Files.newDirectoryStream(webapps)) { | ||
| directoryStream.forEach(path -> addWebapp(tomcat, path)); | ||
| } | ||
| } | ||
| return tomcat; | ||
| } | ||
|
|
||
| protected boolean isEmptyDir(Path path) { | ||
| if (Files.isDirectory(path)) { | ||
| try (Stream<Path> entries = Files.list(path)) { | ||
| return entries.findFirst().isEmpty(); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| private void addWebapp(Tomcat tomcat, Path path) { | ||
| if (isEmptyDir(path)) { | ||
| // Our gradle plugin adds a share directory, even when baseShareWar is not configured | ||
| return; | ||
| } | ||
| if (Files.isDirectory(path)) { | ||
| String contextPath = "/" + path.getFileName().toString(); | ||
| String absolutePath = path.toAbsolutePath().toString(); | ||
| StandardContext ctx = (StandardContext) tomcat.addWebapp(contextPath, absolutePath); | ||
| ctx.setParentClassLoader(Thread.currentThread().getContextClassLoader()); | ||
| LifecycleListener lifecycleListener = event -> { | ||
| if (event.getType().equals("before_start")) { | ||
| WebResourceRoot resources = new StandardRoot(ctx); | ||
| resources.setCacheMaxSize(getConfiguration().getTomcatCacheMaxSize()); | ||
| resources.addPostResources(new DirResourceSet(resources, "/WEB-INF/classes", getConfiguration().getSharedClasspathDir(), "/")); | ||
| resources.addPostResources(new DirResourceSet(resources, "/WEB-INF/classes", getConfiguration().getGeneratedClasspathDir(), "/")); | ||
| resources.addJarResources(new DirResourceSet(resources, "/WEB-INF/lib", getConfiguration().getSharedLibDir(), "/")); | ||
| if (getConfiguration().isJsonLogging()) { | ||
| redirectLog4j(path, Paths.get(configuration.getGeneratedClasspathDir())); | ||
| } | ||
| ctx.setResources(resources); | ||
| } | ||
| if (getConfiguration().isExitOnFailure() && event.getType().equals("after_stop")) { | ||
| stopTomcat(tomcat); | ||
| } | ||
| }; | ||
| ctx.addLifecycleListener(lifecycleListener); | ||
|
|
||
| if (getConfiguration().isAccessLogging()) { | ||
| JsonAccessLogValve85 valve = new JsonAccessLogValve85(); | ||
| ctx.addValve(valve); | ||
| ctx.getAccessLog(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void createDefaultConnector(Tomcat tomcat) { | ||
| Connector connector = getConnector(tomcat, | ||
| "HTTP/1.1", | ||
| getConfiguration().getTomcatPort(), | ||
| false, | ||
| "http", | ||
| getConfiguration().getTomcatMaxThreads(), | ||
| getConfiguration().getTomcatMaxHttpHeaderSize(), | ||
| getConfiguration().getTomcatRelaxedPathChars(), | ||
| getConfiguration().getTomcatRelaxedQueryChars() | ||
| ); | ||
| connector.setRedirectPort(getConfiguration().getTomcatSslPort()); | ||
| tomcat.setConnector(connector); | ||
| } | ||
|
|
||
| private void addUserWithRole(Tomcat tomcat, String username, String password, String role) { | ||
| tomcat.addUser(username, password); | ||
| tomcat.addRole(username, role); | ||
| } | ||
|
|
||
|
|
||
| private void stopTomcat(Tomcat tomcat) { | ||
| Thread thread = new Thread(() -> { | ||
| try { | ||
| tomcat.stop(); | ||
| tomcat.destroy(); | ||
| } catch (LifecycleException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| }); | ||
| thread.start(); | ||
|
|
||
| } | ||
|
|
||
|
|
||
| } |
153 changes: 153 additions & 0 deletions
153
...bedded-9/src/shared/main/java/eu/xenit/alfresco/tomcat/embedded/tomcat/TomcatFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| package eu.xenit.alfresco.tomcat.embedded.tomcat; | ||
|
|
||
| import eu.xenit.alfresco.tomcat.embedded.config.TomcatConfiguration; | ||
| import eu.xenit.logging.json.valve.JsonAccessLogValve85; | ||
| import org.apache.catalina.LifecycleException; | ||
| import org.apache.catalina.LifecycleListener; | ||
| import org.apache.catalina.Service; | ||
| import org.apache.catalina.WebResourceRoot; | ||
| import org.apache.catalina.connector.Connector; | ||
| import org.apache.catalina.core.StandardContext; | ||
| import org.apache.catalina.startup.Tomcat; | ||
| import org.apache.catalina.webresources.DirResourceSet; | ||
| import org.apache.catalina.webresources.StandardRoot; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static eu.xenit.alfresco.tomcat.embedded.utils.Utils.redirectLog4j; | ||
|
|
||
| public class TomcatFactory { | ||
|
|
||
| private final TomcatConfiguration configuration; | ||
|
|
||
| public TomcatFactory(TomcatConfiguration configuration) { | ||
| this.configuration = configuration; | ||
| } | ||
|
|
||
| public static Connector getConnector(Tomcat tomcat, String protocol, int port, boolean sslEnabled, String scheme, int maxThreads, int maxHttpHeaderSize, String relaxedPathChars, String relaxedQueryChars) { | ||
| Connector connector = new Connector(protocol); | ||
| connector.setPort(port); | ||
| connector.setProperty("connectionTimeout", "240000"); | ||
| connector.setURIEncoding(StandardCharsets.UTF_8.name()); | ||
| connector.setProperty("SSLEnabled", String.valueOf(sslEnabled)); | ||
| connector.setProperty("maxThreads", String.valueOf(maxThreads)); | ||
| connector.setProperty("maxHttpHeaderSize", String.valueOf(maxHttpHeaderSize)); | ||
| connector.setProperty("relaxedPathChars", relaxedPathChars); | ||
| connector.setProperty("relaxedQueryChars", relaxedQueryChars); | ||
| connector.setScheme(scheme); | ||
| Service service = tomcat.getService(); | ||
| service.setContainer(tomcat.getEngine()); | ||
| connector.setService(service); | ||
| return connector; | ||
| } | ||
|
|
||
| private TomcatConfiguration getConfiguration() { | ||
| return configuration; | ||
| } | ||
|
|
||
| public Tomcat getTomcat() throws IOException { | ||
| Tomcat tomcat = new Tomcat(); | ||
| tomcat.setBaseDir(getConfiguration().getTomcatBaseDir()); | ||
| tomcat.setPort(getConfiguration().getTomcatPort()); | ||
| tomcat.getServer().setPort(getConfiguration().getTomcatServerPort()); | ||
| createDefaultConnector(tomcat); | ||
| addUserWithRole(tomcat, "CN=Alfresco Repository Client, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB", null, "repoclient"); | ||
| addUserWithRole(tomcat, "CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB", null, "repository"); | ||
| Path webapps = Paths.get(getConfiguration().getWebappsPath()); | ||
| if (Files.exists(webapps)) { | ||
| try (var directoryStream = Files.newDirectoryStream(webapps)) { | ||
| directoryStream.forEach(path -> addWebapp(tomcat, path)); | ||
| } | ||
| } | ||
| return tomcat; | ||
| } | ||
|
|
||
| protected boolean isEmptyDir(Path path) { | ||
| if (Files.isDirectory(path)) { | ||
| try (Stream<Path> entries = Files.list(path)) { | ||
| return entries.findFirst().isEmpty(); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| private void addWebapp(Tomcat tomcat, Path path) { | ||
| if (isEmptyDir(path)) { | ||
| // Our gradle plugin adds a share directory, even when baseShareWar is not configured | ||
| return; | ||
| } | ||
| if (Files.isDirectory(path)) { | ||
| String contextPath = "/" + path.getFileName().toString(); | ||
| String absolutePath = path.toAbsolutePath().toString(); | ||
| StandardContext ctx = (StandardContext) tomcat.addWebapp(contextPath, absolutePath); | ||
| ctx.setParentClassLoader(Thread.currentThread().getContextClassLoader()); | ||
| LifecycleListener lifecycleListener = event -> { | ||
| if (event.getType().equals("before_start")) { | ||
| WebResourceRoot resources = new StandardRoot(ctx); | ||
| resources.setCacheMaxSize(getConfiguration().getTomcatCacheMaxSize()); | ||
| resources.addPostResources(new DirResourceSet(resources, "/WEB-INF/classes", getConfiguration().getSharedClasspathDir(), "/")); | ||
| resources.addPostResources(new DirResourceSet(resources, "/WEB-INF/classes", getConfiguration().getGeneratedClasspathDir(), "/")); | ||
| resources.addJarResources(new DirResourceSet(resources, "/WEB-INF/lib", getConfiguration().getSharedLibDir(), "/")); | ||
| if (getConfiguration().isJsonLogging()) { | ||
| redirectLog4j(path, Paths.get(configuration.getGeneratedClasspathDir())); | ||
| } | ||
| ctx.setResources(resources); | ||
| } | ||
| if (getConfiguration().isExitOnFailure() && event.getType().equals("after_stop")) { | ||
| stopTomcat(tomcat); | ||
| } | ||
| }; | ||
| ctx.addLifecycleListener(lifecycleListener); | ||
|
|
||
| if (getConfiguration().isAccessLogging()) { | ||
| JsonAccessLogValve85 valve = new JsonAccessLogValve85(); | ||
| ctx.addValve(valve); | ||
| ctx.getAccessLog(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void createDefaultConnector(Tomcat tomcat) { | ||
| Connector connector = getConnector(tomcat, | ||
| "HTTP/1.1", | ||
| getConfiguration().getTomcatPort(), | ||
| false, | ||
| "http", | ||
| getConfiguration().getTomcatMaxThreads(), | ||
| getConfiguration().getTomcatMaxHttpHeaderSize(), | ||
| getConfiguration().getTomcatRelaxedPathChars(), | ||
| getConfiguration().getTomcatRelaxedQueryChars() | ||
| ); | ||
| connector.setRedirectPort(getConfiguration().getTomcatSslPort()); | ||
| tomcat.setConnector(connector); | ||
| } | ||
|
|
||
| private void addUserWithRole(Tomcat tomcat, String username, String password, String role) { | ||
| tomcat.addUser(username, password); | ||
| tomcat.addRole(username, role); | ||
| } | ||
|
|
||
|
|
||
| private void stopTomcat(Tomcat tomcat) { | ||
| Thread thread = new Thread(() -> { | ||
| try { | ||
| tomcat.stop(); | ||
| tomcat.destroy(); | ||
| } catch (LifecycleException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| }); | ||
| thread.start(); | ||
|
|
||
| } | ||
|
|
||
|
|
||
| } |