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

Fixed JSTL error issue #31

Merged
merged 3 commits into from
Feb 13, 2025
Merged

Fixed JSTL error issue #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2035955
Added support for tag lib in newer version of tomcat
netkraft Jan 13, 2025
1e37b93
Added support for tag lib in newer version of tomcat
netkraft Jan 13, 2025
afd3731
update to get JS files using https
netkraft Jan 21, 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
4 changes: 2 additions & 2 deletions dcdt-core/src/test/resources/META-INF/core/core-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ dcdt.test.json.mail.addr=test-json@${dcdt.test.json.domain.name}
#====================================================================================================
# LOOKUP
#====================================================================================================
dcdt.test.lookup.domain.name=demo.direct-test.com
dcdt.test.lookup.domain.name=dcdt31.healthit.gov
dcdt.test.lookup.domain.name.2=direct-test.com
dcdt.test.lookup.domain.ldap.name=ldap.${dcdt.test.lookup.domain.name}
dcdt.test.lookup.domain.1.name=domain1.${dcdt.test.lookup.domain.name}
Expand All @@ -179,7 +179,7 @@ dcdt.test.dns.lookup.domain.1.name=${dcdt.test.lookup.domain.1.name}
#====================================================================================================
# HTTP LOOKUP
#====================================================================================================
dcdt.test.http.lookup.1.uri=http://${dcdt.test.lookup.domain.name}/dcdt-web/favicon.ico
dcdt.test.http.lookup.1.uri=http://${dcdt.test.lookup.domain.name}/dcdt/favicon.ico

#====================================================================================================
# LDAP LOOKUP
Expand Down
10 changes: 5 additions & 5 deletions dcdt-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>[2.8.11.1,)</version>
<version>2.6.1</version>
</dependency>
<dependency>
<groupId>com.github.sebhoss</groupId>
Expand Down Expand Up @@ -262,7 +262,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>[1.18,)</version>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -420,7 +420,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.3.17.RELEASE</version>
<version>4.2.2.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Expand Down Expand Up @@ -942,7 +942,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.2.1.RELEASE</version>
<version>4.2.2.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Expand Down Expand Up @@ -974,7 +974,7 @@
<inherited>true</inherited>
<configuration>
<scripts>
<script>file:///C:\Users\Sandeep Savarala\Documents\GitHub\DCDT\dcdt\dcdt-core\src\main\scripts\groovy\process-project-properties.groovy</script>
<script>file:///C:\github\dcdt\dcdt-core\src\main\scripts\groovy\process-project-properties.groovy</script>
</scripts>
</configuration>
</execution>
Expand Down
2 changes: 1 addition & 1 deletion dcdt-service-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@
<inherited>true</inherited>
<configuration>
<scripts>
<script>file:\\\C:\Users\Sandeep Savarala\Documents\GitHub\DCDT\dcdt\dcdt-service-core\src\main\scripts\groovy\process-service-executable-files.groovy</script>
<script>file:\\\C:\github\dcdt\dcdt-service-core\src\main\scripts\groovy\process-service-executable-files.groovy</script>
</scripts>
</configuration>
</execution>
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/webapp/META-INF/tags/tags-dcdt.tld → .../src/main/webapp/WEB-INF/tag/implicit.tld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<display-name>DCDT JSP Tag Library</display-name>
<tlib-version>1.0</tlib-version>
<short-name>dcdt</short-name>
<uri>http://direct-test.com/tags</uri>
<uri>/WEB-INF/tag/implicit.tld</uri>

<!--====================================================================================================
= TAGS
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/content-admin-login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/content-admin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/content-discovery-mail-mapping.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/content-discovery.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/content-error.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/content-home.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/content-hosting.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/content-version.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/head-admin-login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/head-admin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/head-discovery-mail-mapping.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/head-discovery.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/head-error.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/head-hosting.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/content/head-version.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/include/component/component-glyph-item.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/include/component/component-glyph.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/include/content.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/include/footer.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
2 changes: 1 addition & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/include/head-testcases.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="dcdt" uri="/WEB-INF/tag/implicit.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
17 changes: 8 additions & 9 deletions dcdt-web/src/main/webapp/WEB-INF/views/include/head.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down Expand Up @@ -37,9 +36,9 @@
<c:set var="templateName" scope="request"><tiles:getAsString name="name"/></c:set>
<c:set var="templateNameProp" scope="request" value="${fn:replace(templateName, '-', '.')}"/>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<script type="text/javascript" src="http://code.jquery.com/jquery-2.1.0.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/ui/1.10.4/jquery-ui.min.js"></script>
<script type="text/javascript" src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.0.min.js"></script>
<script type="text/javascript" src="https://code.jquery.com/ui/1.10.4/jquery-ui.min.js"></script>
<script type="text/javascript" src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
<script type="text/javascript" src="${urlStaticScripts}/web.js"></script>
<script type="text/javascript" src="${urlStaticScripts}/web-form.js"></script>
<script type="text/javascript" src="${urlStaticScripts}/web-beans.js"></script>
Expand All @@ -50,9 +49,9 @@
<script type="text/javascript" src="${urlStaticScripts}/ga.js"></script>
</c:if>
<link rel="icon" type="image/png" href="${urlStaticImages}/dcdt-logo-16x16.png"/>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css"/>
<link rel="stylesheet" type="text/css" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css"/>
<link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css"/>
<link rel="stylesheet" type="text/css" href="https://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css"/>
<link rel="stylesheet" type="text/css" href="${urlStaticStyles}/web.css"/>
<title><spring:message code="dcdt.web.title.${templateNameProp}"/></title>
<title><spring:message code="dcdt.web.title.${templateNameProp}"/></title>
1 change: 0 additions & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/include/nav.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down
2 changes: 1 addition & 1 deletion dcdt-web/src/main/webapp/WEB-INF/views/layout.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="dcdt" uri="/META-INF/tags/tags-dcdt.tld" %>
<%@taglib prefix="dcdt" uri="/WEB-INF/tag/implicit.tld" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
Expand Down