Skip to content

J21tc9 #284

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

Open
ryanrdoherty wants to merge 8 commits into
base: master
Choose a base branch
from
Open

J21tc9 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
331c91b
Comment out JBrowse build
ryanrdoherty Nov 11, 2024
9a5a64f
Remove more JBrowse
ryanrdoherty Nov 11, 2024
1f1e891
Merge branch 'master' into no-jbrowse
ryanrdoherty Nov 23, 2024
1e38413
Changes for Servlet 4.0/Tomcat 9
ryanrdoherty Jan 7, 2025
b3fe2c7
Merge branch 'no-jbrowse' into j21tc9
ryanrdoherty Jan 8, 2025
0c0e05a
Merge branch 'master' into j21tc9
ryanrdoherty Jan 14, 2025
5cb161c
Merge branch 'master' into j21tc9
ryanrdoherty Jan 22, 2025
f93686a
Merge branch 'master' into j21tc9
Foxcapades Feb 26, 2025
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 Model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
7 changes: 1 addition & 6 deletions Service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>

Expand All @@ -86,11 +86,6 @@
<artifactId>jersey-media-multipart</artifactId>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down
11 changes: 3 additions & 8 deletions Site/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.4"
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:web="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
<web-app version="4.0"
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">

<context-param>
<param-name>GUS_HOME</param-name>
Expand All @@ -16,10 +15,6 @@
<param-value>/service</param-value>
</context-param>

<listener>
<listener-class>se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventorListener</listener-class>
</listener>

<listener>
<listener-class>org.apidb.apicommon.controller.ApplicationInitListener</listener-class>
</listener>
Expand Down
3 changes: 0 additions & 3 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<!-- oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo -->

<import file="${projectsDir}/EbrcWebSvcCommon/build.xml" />
<import file="${projectsDir}/JBrowse/build.xml" />
<import file="${projectsDir}/ApiCommonModel/build.xml" />

<!-- oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo -->
Expand All @@ -14,7 +13,6 @@

<target name="ApiCommonWebsite-Installation" depends="EbrcWebSvcCommon-Installation,
ApiCommonModel-Installation,
JBrowse-Installation,
ApiCommonWebsite/Model-Installation,
ApiCommonWebsite/View-Installation,
ApiCommonWebsite/Site-Installation,
Expand Down Expand Up @@ -88,7 +86,6 @@
<!-- oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo -->

<target name="ApiCommonWebsite-WebInstallation" depends="EbrcWebSvcCommon-WebInstallation,
JBrowse-WebInstallation,
ApiCommonWebsite-Installation,
ApiCommonWebsite/View-WebInstallation,
ApiCommonWebsite/Site-WebInstallation">
Expand Down