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

cadc-rest: make RestAction.appName use whole context path for uniqueness #245

Merged
merged 2 commits into from
Mar 20, 2024
Merged

cadc-rest: make RestAction.appName use whole context path for uniqueness #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd55683
cadc-rest: make RestAction.appName use whole context path for uniqueness
pdowler Mar 19, 2024
b185199
cadc-util: update log4j dependency to min latest
pdowler Mar 20, 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
2 changes: 1 addition & 1 deletion cadc-rest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sourceCompatibility = 1.8

group = 'org.opencadc'

version = '1.3.18'
version = '1.3.19'

description = 'OpenCADC REST server library'
def git_url = 'https://github.com/opencadc/core'
Expand Down
3 changes: 2 additions & 1 deletion cadc-rest/src/main/java/ca/nrc/cadc/rest/RestServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ public void init(ServletConfig config) throws ServletException {
this.deleteAction = loadAction(config, "delete");
this.headAction = loadAction(config, "head");

this.appName = config.getServletContext().getServletContextName();
// appName: war file foo#bar.war, context path /foo/bar -> foo-bar
this.appName = config.getServletContext().getContextPath().substring(1).replaceAll("/", "-");
this.componentID = appName + "." + config.getServletName();
String augment = config.getInitParameter(AUGMENT_SUBJECT_PARAM);
if (augment != null && augment.equalsIgnoreCase(Boolean.FALSE.toString())) {
Expand Down
18 changes: 6 additions & 12 deletions cadc-util/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,17 @@ sourceCompatibility = 1.8

group = 'org.opencadc'

version = '1.11.0'
version = '1.11.1'

description = 'OpenCADC core utility library'
def git_url = 'https://github.com/opencadc/core'

dependencies {
//compile 'org.apache.logging.log4j:log4j-1.2-api:[2.17.2,3.0)'
//compile 'org.apache.logging.log4j:log4j-api:[2.17.2,3.0)'
//compile 'org.apache.logging.log4j:log4j-core:[2.17.2,3.0)'
//compile 'org.apache.logging.log4j:log4j:[2.17.2,3.0)'

// log4j 2.18+ suffers from a class loading issue: technical debt
compile 'org.apache.logging.log4j:log4j-1.2-api:2.17.2'
compile 'org.apache.logging.log4j:log4j-api:2.17.2'
compile 'org.apache.logging.log4j:log4j-core:2.17.2'
compile 'org.apache.logging.log4j:log4j:2.17.2'

compile 'org.apache.logging.log4j:log4j-1.2-api:[2.23.1,3.0)'
compile 'org.apache.logging.log4j:log4j-api:[2.23.1,3.0)'
compile 'org.apache.logging.log4j:log4j-core:[2.23.1,3.0)'
compile 'org.apache.logging.log4j:log4j:[2.23.1,3.0)'

compile 'org.bouncycastle:bcprov-jdk18on:[1.70,2.0)'
compile 'org.bouncycastle:bcpkix-jdk18on:[1.70,2.0)'
compile 'javax.servlet:javax.servlet-api:3.1.0'
Expand Down
Loading