Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Embedded Tomcat support for custom webapp resources #701

Merged
merged 7 commits into from
Feb 2, 2024
Merged

Embedded Tomcat support for custom webapp resources #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f61d11e
Add support for custom webapp resources
labkey-tchad Jan 31, 2024
fc17712
Crash if resources are misconfigured
labkey-tchad Jan 31, 2024
9095054
Merge remote-tracking branch 'origin/develop' into fb_embedded_extraC…
labkey-tchad Jan 31, 2024
8b4f0d9
Merge branch 'develop' into fb_embedded_extraContextResources
labkey-jeckels Feb 2, 2024
803f272
Remove ldap and jms specific configurations
labkey-tchad Feb 2, 2024
91f5bb9
Merge remote-tracking branch 'origin/develop' into fb_embedded_extraC…
labkey-tchad Feb 2, 2024
146e70e
Merge branch 'develop' into fb_embedded_extraContextResources
labkey-tchad Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 8 additions & 20 deletions server/configs/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,6 @@ mail.smtpUser=@@smtpUser@@
# mail.smtpSocketFactoryClass=@@smtpSocketFactoryClass@@
# mail.smtpAuth=@@smtpAuth@@

# Optional - JMS configuration for remote ActiveMQ message management for distributed pipeline jobs
# https://www.labkey.org/Documentation/wiki-page.view?name=jmsQueue
#jms.type=org.apache.activemq.ActiveMQConnectionFactory
#jms.factory=org.apache.activemq.jndi.JNDIReferenceFactory
#jms.description=JMS Connection Factory
#jms.brokerURL=vm://localhost?broker.persistent=false&broker.useJmx=false
#jms.brokerName=LocalActiveMQBroker

# Optional - LDAP configuration for LDAP group/user synchronization
# https://www.labkey.org/Documentation/wiki-page.view?name=LDAP_sync
#ldap.type=org.labkey.premium.ldap.LdapConnectionConfigFactory
#ldap.factory=org.labkey.premium.ldap.LdapConnectionConfigFactory
#ldap.host=ldap.forumsys.com
#ldap.port=389
#ldap.principal=cn=read-only-admin,dc=example,dc=com
#ldap.credentials=password
#ldap.useTls=false
#ldap.useSsl=false
#ldap.sslProtocol=SSLv3

#useLocalBuild#spring.devtools.restart.additional-paths=@@pathToServer@@/build/deploy/modules,@@pathToServer@@/build/deploy/embedded/config

# HTTP session timeout for users - defaults to 30 minutes
Expand All @@ -109,6 +89,14 @@ management.endpoints.web.exposure.include=*
# Don't show the Spring banner on startup
spring.main.banner-mode=off

# Optional - JMS configuration for remote ActiveMQ message management for distributed pipeline jobs
# https://www.labkey.org/Documentation/wiki-page.view?name=jmsQueue
#context.resources.jms.name=jms/ConnectionFactory
#context.resources.jms.type=org.apache.activemq.ActiveMQConnectionFactory
#context.resources.jms.factory=org.apache.activemq.jndi.JNDIReferenceFactory
#context.resources.jms.description=JMS Connection Factory
#context.resources.jms.brokerURL=vm://localhost?broker.persistent=false&broker.useJmx=false
#context.resources.jms.brokerName=LocalActiveMQBroker

# Turn on JSON-formatted HTTP access logging to stdout. See issue 48565
# https://tomcat.apache.org/tomcat-9.0-doc/config/valve.html#JSON_Access_Log_Valve
Expand Down
Loading