diff --git a/java/tracking-help/src/main/webapp/WEB-INF/web.xml b/java/tracking-help/src/main/webapp/WEB-INF/web.xml index 04cc9ce..0e97cce 100644 --- a/java/tracking-help/src/main/webapp/WEB-INF/web.xml +++ b/java/tracking-help/src/main/webapp/WEB-INF/web.xml @@ -1,4 +1,5 @@ - - - EDIS Tracking Server Help - + + + EDIS Tracking Server Help + \ No newline at end of file diff --git a/java/tracking-parent/pom.xml b/java/tracking-parent/pom.xml index 5f1cd6c..96713a3 100644 --- a/java/tracking-parent/pom.xml +++ b/java/tracking-parent/pom.xml @@ -254,6 +254,7 @@ org.codehaus.mojo cobertura-maven-plugin + 2.5.1 maven-javadoc-plugin @@ -277,10 +278,11 @@ UTF-8 - 2.5 + 2.3 2.0.8 - 2.0.3 - 1.5.2 + 2.0.7.RELEASE + 1.6.2 + 1.2.14 2.4 3.6.0.16995 diff --git a/java/tracking-server-bigboard/pom.xml b/java/tracking-server-bigboard/pom.xml index 8565753..d83710c 100644 --- a/java/tracking-server-bigboard/pom.xml +++ b/java/tracking-server-bigboard/pom.xml @@ -57,14 +57,6 @@ maven-war-plugin - - src/main/webapp/WEB-INF - - weblogic.xml - - true - WEB-INF - ${edis.tracking.build.swf.directory} / @@ -124,87 +116,10 @@ true - - - - dev - - - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/webapp-dev/WEB-INF - - web.xml - - WEB-INF - - - src/main/webapp/WEB-INF - - web.xml - - - - src/main/webapp-dev - - BigBoard.jsp - - - - src/main/webapp - - BigBoard.jsp - - - - src/main/webapp/WEB-INF - - weblogic.xml - - true - WEB-INF - - - ${edis.tracking.build.swf.directory} - / - false - - *.swf - - - - - - - - - ${project.build.directory}/swf diff --git a/java/tracking-server-bigboard/src/main/webapp-dev/WEB-INF/web.xml b/java/tracking-server-bigboard/src/main/webapp-dev/WEB-INF/web.xml deleted file mode 100644 index 82dbf6f..0000000 --- a/java/tracking-server-bigboard/src/main/webapp-dev/WEB-INF/web.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - Emergency Department Tracking Board Server Proxy Application - - - javax.servlet.jsp.jstl.fmt.localizationContext - strings - - - - - javax.servlet.jsp.jstl.fmt.fallbackLocale - en - - - - contextConfigLocation - - classpath*:/applicationContext-dao.xml - - - - - noCacheFilter - gov.va.med.edp.web.servlet.filter.ResponseHeaderFilter - - Cache-Control - cache,must-revalidate - - - Pragma - public - - - - - org.springframework.web.util.IntrospectorCleanupListener - - - - org.springframework.web.context.ContextLoaderListener - - - - dispatcher - org.springframework.web.servlet.DispatcherServlet - 1 - - - - noCacheFilter - *.swf - - - - noCacheFilter - /bigboard.html - - - - dispatcher - /bigboard.html - - - - dispatcher - *.xml - - - - dispatcher - *.csv - - - - 5 - - - - /bigboard.html - - - - 500 - /error500.jsp - - - diff --git a/java/tracking-server-bigboard/src/main/webapp-dev/bigboard.jsp b/java/tracking-server-bigboard/src/main/webapp-dev/bigboard.jsp deleted file mode 100644 index c9ec2a5..0000000 --- a/java/tracking-server-bigboard/src/main/webapp-dev/bigboard.jsp +++ /dev/null @@ -1,149 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %><%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %> - - - - - - -<fmt:message key="app.name"/> - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/java/tracking-server-bigboard/src/main/webapp/WEB-INF/web.xml b/java/tracking-server-bigboard/src/main/webapp/WEB-INF/web.xml index b4419af..b1dc40c 100644 --- a/java/tracking-server-bigboard/src/main/webapp/WEB-INF/web.xml +++ b/java/tracking-server-bigboard/src/main/webapp/WEB-INF/web.xml @@ -97,30 +97,30 @@ /error500.jsp - - - ED Tracking Board Flex Client - *.swf - *.html - *.xml - *.jsp - *.csv - GET - POST - - - SSL_AUTHENTICATED_USERS - - - NONE - - + + + + + + + + + + + + + + + + + + - - CLIENT-CERT - + + + - - SSL_AUTHENTICATED_USERS - + + + diff --git a/java/tracking-server-bigboard/src/main/webapp/WEB-INF/weblogic.xml b/java/tracking-server-bigboard/src/main/webapp/WEB-INF/weblogic.xml deleted file mode 100644 index 040c522..0000000 --- a/java/tracking-server-bigboard/src/main/webapp/WEB-INF/weblogic.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - CookieName - edisboardJSESSIONID - - - PersistentStoreType - replicated_if_clustered - - - - true - - ${edis.tracking.boardContextRoot} - - SSL_AUTHENTICATED_USERS - SSL_AUTHENTICATED_USERS - - diff --git a/java/tracking-server-main/pom.xml b/java/tracking-server-main/pom.xml index 0e5b257..ea1a456 100644 --- a/java/tracking-server-main/pom.xml +++ b/java/tracking-server-main/pom.xml @@ -34,6 +34,23 @@ edis-tracking-server-core ${project.version} + + ch.qos.logback + logback-classic + 0.9.29 + runtime + + + javax.resource + connector + 1.0 + + + javax.servlet + servlet-api + ${servlet.version} + provided + javax.servlet jstl @@ -63,17 +80,9 @@ org.apache.maven.plugins maven-war-plugin + 2.1.1 - - src/main/webapp/WEB-INF - - kaajeeConfig.xml - weblogic.xml - - true - WEB-INF - ${edis.tracking.build.swf.directory} / @@ -87,6 +96,7 @@ maven-antrun-plugin + 1.2 process-resources @@ -154,51 +164,25 @@ --> + + org.mortbay.jetty + jetty-maven-plugin + 8.0.1.v20110908 + + 4 + + + logback.configurationFile + ${basedir}/jetty/logback.xml + + + + ${edis.tracking.trackingContextRoot} + + + - - - dev - - - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/webapp-dev/WEB-INF - - kaajeeConfig.xml - - WEB-INF - - - src/main/webapp/WEB-INF - - weblogic.xml - - - kaajeeConfig.xml - - true - WEB-INF - - - ${edis.tracking.build.swf.directory} - / - false - - *.swf - - - - - - - - - ${project.build.directory}/swf diff --git a/java/tracking-server-main/src/jetty/logback.xml b/java/tracking-server-main/src/jetty/logback.xml new file mode 100644 index 0000000..e684317 --- /dev/null +++ b/java/tracking-server-main/src/jetty/logback.xml @@ -0,0 +1,20 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/java/tracking-server-main/src/main/java/gov/va/med/edp/web/controller/LoginController.java b/java/tracking-server-main/src/main/java/gov/va/med/edp/web/controller/LoginController.java new file mode 100644 index 0000000..b5b66b1 --- /dev/null +++ b/java/tracking-server-main/src/main/java/gov/va/med/edp/web/controller/LoginController.java @@ -0,0 +1,44 @@ +package gov.va.med.edp.web.controller; + +import gov.va.med.edp.vistalink.locator.VistaLinkConnectorConfig; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.util.Assert; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.AbstractController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Set; + +public class LoginController extends AbstractController implements InitializingBean { + + public static final String DEFAULT_VIEW_NAME = "login"; + + private String viewName = DEFAULT_VIEW_NAME; + + private Set/**/ vistaAccounts; + + public void afterPropertiesSet() throws Exception { + Assert.notNull(viewName, "viewName must not be null"); + } + + protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { + return new ModelAndView(getViewName(), "vistaAccounts", vistaAccounts); + } + + public String getViewName() { + return viewName; + } + + public void setViewName(String viewName) { + this.viewName = viewName; + } + + public Set/**/ getVistaAccounts() { + return vistaAccounts; + } + + public void setVistaAccounts(Set/**/ vistaAccounts) { + this.vistaAccounts = vistaAccounts; + } +} \ No newline at end of file diff --git a/java/tracking-server-main/src/main/resources/application.properties b/java/tracking-server-main/src/main/resources/application.properties deleted file mode 100644 index 19d3836..0000000 --- a/java/tracking-server-main/src/main/resources/application.properties +++ /dev/null @@ -1,9 +0,0 @@ -# Generated by genAppProperties.xsl at 2007-09-06 02:48:11 -# -# Application=med.term.access -# Environment=readonly -# Database=hsqldb -# -gov.va.med.term.access.util.ImplementorRegistry/gov.va.med.term.access.TableManager$Factory=gov.va.med.term.access.readonly.factory.db.TableManagerFactory -gov.va.med.term.access.util.ImplementorRegistry/gov.va.med.term.access.*$Factory=gov.va.med.term.access.readonly.factory.cache.*Factory -gov.va.med.term.access.util.ImplementorRegistry/gov.va.med.term.access.readonly.Readonly*$Factory=gov.va.med.term.access.readonly.factory.db.*Factory diff --git a/java/tracking-server-main/src/main/resources/strings.properties b/java/tracking-server-main/src/main/resources/strings.properties index 19d03b2..cab438b 100644 --- a/java/tracking-server-main/src/main/resources/strings.properties +++ b/java/tracking-server-main/src/main/resources/strings.properties @@ -1,9 +1,18 @@ app.name=Emergency Department Integration Software - Tracking Application app.version=${project.version} app.buildtime=BUILD_TIME_PLACEHOLDER -copyright.year=2008 -copyright.organization.url=http://www.va.gov -copyright.organization=Department of Veterans Affairs +copyright.year=2011 +copyright.organization.url=http://www.worldvista.org +copyright.organization=WorldVistA help.contextRoot=${edis.tracking.helpContextRoot} logged.out=You have been logged out. -login.again=Log in again. \ No newline at end of file +login.again=Log in again. + +login.title=Emergency Department Integration Software +label.access=Access Code +label.verify=Verify Code +label.facility=Facility +button.login=Sign In +button.logout=Sign out + +errors.verify.mismatch=Access/Verify code pair mismatch \ No newline at end of file diff --git a/java/tracking-server-main/src/main/webapp-dev/WEB-INF/kaajeeConfig.xml b/java/tracking-server-main/src/main/webapp-dev/WEB-INF/kaajeeConfig.xml deleted file mode 100644 index c235042..0000000 --- a/java/tracking-server-main/src/main/webapp-dev/WEB-INF/kaajeeConfig.xml +++ /dev/null @@ -1,235 +0,0 @@ - - - - - EDIS Tracking Board - - - - 402 - 405 - 423 - 433 - 436 - 437 - 438 - 442 - 447 - 454 - 459 - 460 463 - 500 - 501 - 502 - 503 - 504 - 506 - 508 - 509 - 509A0 - 512 - 512A5 - 515 - 516 - 517 - 518 - 519 - 520 - 520A0 - 521 - 523 - 523A4 - 523A5 - 524 - 526 - 528 - 528A4 - 528A5 - 528A6 - 528A7 - 528A8 - 529 - 531 - 534 - 537 - 538 - 539 - 540 - 541 - 542 - 544 - 546 - 548 - 549 - 549A4 - 550 - 552 - 553 - 554 - 556 - 557 - 558 - 561 - 561A4 - 562 - 564 - 565 - 568 - 568A4 - 570 - 573 - 573A4 - 575 - 578 - 580 - 581 - 583 - 585 - 586 - 589 - 589A4 - 589A5 - 589A6 - 589A7 - 590 - 593 - 595 - 596 - 596A4 - 598 - 600 - 603 - 605 - 607 - 608 - 610 - 610A4 - 612 - 612A4 - 613 - 614 - 618 - 619 - 619A4 - 620 - 620A4 - 621 - 623 - 626 - 626A4 - 629 - 630 - 630A4 - 630A5 - 631 - 632 - 635 - 636 - 636A4 - 636A6 - 636A7 - 636A8 - 637 - 640 - 640A4 - 642 - 644 - 646 - 646A4 - 646A5 - 648 - 648A4 - 649 - 650 - 652 - 653 - 654 - 655 - 656 - 657 - 657A0 - 657A4 - 657A5 - 658 - 659 - 660 - 662 - 663 - 663A4 - 664 - 666 - 667 - 668 - 671 - 671A4 - 672 - 673 - 674 - 674A4 - 674A5 - 675 - 676 - 678 - 679 - 687 - 688 - 689 - 689A4 - 691 - 691A4 - 692 - 693 - 695 - 757 - - 982 - - - - - ${edis.tracking.trackingContextRoot} - - - - - U.S. Government Computer System - ~ ~ - U. S. government systems are intended to be used by authorized government network users for viewing and - retrieving information only, except as otherwise explicitly authorized for official business and limited - personal use in accordance with policy. Information from these systems resides on and transmits through computer - systems and networks funded by the government. All access or use constitutes understanding and acceptance that - there is no reasonable expectation of privacy in the use of Government networks or systems. - ~ ~ - The data and documents on this system include Federal records that contain sensitive information protected by - various Federal statutes, including the Privacy Act, 5 U.S.C. Section 552a, and veterans' records - confidentiality statutes such as 38 U.S.C. Sections 5701 and 7332. Access to the data and records is on a - need-to-know basis only. - ~ ~ - All access or use of this system constitutes user understanding and acceptance of these terms and constitutes - unconditional consent to review and action including (but not limited to) monitoring, recording, copying, - auditing, inspecting, investigating, restricting access, blocking, tracking, disclosing to authorized personnel, - or any other authorized actions by all authorized government and law enforcement personnel. - ~ ~ - Unauthorized user attempts or acts to (1) access, upload, change, or delete information on this system, (2) - modify this system, (3) deny access to this system, (4) accrue resources for unauthorized use or (5) otherwise - misuse this system are strictly prohibited. Such attempts or acts are subject to action that may result in - criminal, civil, or administrative penalties. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/java/tracking-server-main/src/main/resources/applicationContext-dao.xml b/java/tracking-server-main/src/main/webapp/WEB-INF/config/data-access-config.xml similarity index 100% rename from java/tracking-server-main/src/main/resources/applicationContext-dao.xml rename to java/tracking-server-main/src/main/webapp/WEB-INF/config/data-access-config.xml diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/config/security-config.xml b/java/tracking-server-main/src/main/webapp/WEB-INF/config/security-config.xml new file mode 100644 index 0000000..68dd6e4 --- /dev/null +++ b/java/tracking-server-main/src/main/webapp/WEB-INF/config/security-config.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/config/web-application-config.xml b/java/tracking-server-main/src/main/webapp/WEB-INF/config/web-application-config.xml new file mode 100644 index 0000000..2715cd7 --- /dev/null +++ b/java/tracking-server-main/src/main/webapp/WEB-INF/config/web-application-config.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/java/tracking-server-main/src/main/webapp/WEB-INF/dispatcher-servlet.xml index b515d59..3c92953 100644 --- a/java/tracking-server-main/src/main/webapp/WEB-INF/dispatcher-servlet.xml +++ b/java/tracking-server-main/src/main/webapp/WEB-INF/dispatcher-servlet.xml @@ -18,7 +18,20 @@ - + + + + + + + + + + + + + + @@ -30,6 +43,10 @@ + + + + @@ -38,7 +55,7 @@ - + diff --git a/java/tracking-server-main/src/main/webapp/about.jsp b/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/about.jsp similarity index 100% rename from java/tracking-server-main/src/main/webapp/about.jsp rename to java/tracking-server-main/src/main/webapp/WEB-INF/jsp/about.jsp diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/login.jsp b/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/login.jsp new file mode 100644 index 0000000..55fe144 --- /dev/null +++ b/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/login.jsp @@ -0,0 +1,93 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> +<%@ include file="/WEB-INF/jsp/taglibs.jsp" %> + + + + <fmt:message key="login.title"/> + " type="image/x-icon"/> + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + +
+ + + +
+ + + +
+ + +
+
+ + diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/taglibs.jsp new file mode 100644 index 0000000..248b47a --- /dev/null +++ b/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/taglibs.jsp @@ -0,0 +1 @@ +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %><%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> \ No newline at end of file diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xml b/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xml deleted file mode 100644 index fb99b46..0000000 --- a/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - EDIS Tracking Board - - - - 402 - 405 - 423 - 433 - 436 - 437 - 438 - 442 - 447 - 454 - 459 - 460 463 - 501 - 502 - 503 - 504 - 506 - 508 - 509 - 509A0 - 512 - 512A5 - 515 - 516 - 517 - 518 - 519 - 520 - 520A0 - 521 - 523 - 523A4 - 523A5 - 524 - 526 - 528 - 528A4 - 528A5 - 528A6 - 528A7 - 528A8 - 529 - 531 - 534 - 537 - 538 - 539 - 540 - 541 - 542 - 544 - 546 - 548 - 549 - 549A4 - 550 - 552 - 553 - 554 - 556 - 557 - 558 - 561 - 561A4 - 562 - 564 - 565 - 568 - 568A4 - 570 - 573 - 573A4 - 575 - 578 - 580 - 581 - 583 - 585 - 586 - 589 - 589A4 - 589A5 - 589A6 - 589A7 - 590 - 593 - 595 - 596 - 596A4 - 598 - 600 - 603 - 605 - 607 - 608 - 610 - 610A4 - 612 - 612A4 - 613 - 614 - 618 - 619 - 619A4 - 620 - 620A4 - 621 - 623 - 626 - 626A4 - 629 - 630 - 630A4 - 630A5 - 631 - 632 - 635 - 636 - 636A4 - 636A6 - 636A7 - 636A8 - 637 - 640 - 640A4 - 642 - 644 - 646 - 646A4 - 646A5 - 648 - 648A4 - 649 - 650 - 652 - 653 - 654 - 655 - 656 - 657 - 657A0 - 657A4 - 657A5 - 658 - 659 - 660 - 662 - 663 - 663A4 - 664 - 666 - 667 - 668 - 671 - 671A4 - 672 - 673 - 674 - 674A4 - 674A5 - 675 - 676 - 678 - 679 - 687 - 688 - 689 - 689A4 - 691 - 691A4 - 692 - 693 - 695 - 757 - - 982 - - - - - ${edis.tracking.trackingContextRoot} - - - - - U.S. Government Computer System - ~ ~ - U. S. government systems are intended to be used by authorized government network users for viewing and - retrieving information only, except as otherwise explicitly authorized for official business and limited - personal use in accordance with policy. Information from these systems resides on and transmits through computer - systems and networks funded by the government. All access or use constitutes understanding and acceptance that - there is no reasonable expectation of privacy in the use of Government networks or systems. - ~ ~ - The data and documents on this system include Federal records that contain sensitive information protected by - various Federal statutes, including the Privacy Act, 5 U.S.C. Section 552a, and veterans' records - confidentiality statutes such as 38 U.S.C. Sections 5701 and 7332. Access to the data and records is on a - need-to-know basis only. - ~ ~ - All access or use of this system constitutes user understanding and acceptance of these terms and constitutes - unconditional consent to review and action including (but not limited to) monitoring, recording, copying, - auditing, inspecting, investigating, restricting access, blocking, tracking, disclosing to authorized personnel, - or any other authorized actions by all authorized government and law enforcement personnel. - ~ ~ - Unauthorized user attempts or acts to (1) access, upload, change, or delete information on this system, (2) - modify this system, (3) deny access to this system, (4) accrue resources for unauthorized use or (5) otherwise - misuse this system are strictly prohibited. Such attempts or acts are subject to action that may result in - criminal, civil, or administrative penalties. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xsd b/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xsd deleted file mode 100644 index c877499..0000000 --- a/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/views.xml b/java/tracking-server-main/src/main/webapp/WEB-INF/views.xml index 6d52a28..41c6564 100644 --- a/java/tracking-server-main/src/main/webapp/WEB-INF/views.xml +++ b/java/tracking-server-main/src/main/webapp/WEB-INF/views.xml @@ -26,6 +26,14 @@
+ + + + + + + + diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/web.xml b/java/tracking-server-main/src/main/webapp/WEB-INF/web.xml index 7547aae..0225005 100644 --- a/java/tracking-server-main/src/main/webapp/WEB-INF/web.xml +++ b/java/tracking-server-main/src/main/webapp/WEB-INF/web.xml @@ -17,11 +17,14 @@ contextConfigLocation - - classpath*:/applicationContext-dao.xml - + /WEB-INF/config/web-application-config.xml + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + characterEncodingFilter org.springframework.web.filter.CharacterEncodingFilter @@ -34,7 +37,7 @@ noCacheFilter gov.va.med.edp.web.servlet.filter.ResponseHeaderFilter - + Cache-Control no-store, must-revalidate @@ -44,50 +47,10 @@ - - org.springframework.web.util.IntrospectorCleanupListener - - - - org.springframework.web.context.ContextLoaderListener - - - - gov.va.med.authentication.kernel.KaajeeSessionAttributeListener - - - - gov.va.med.authentication.kernel.KaajeeHttpSessionListener - - - - gov.va.med.edp.web.servlet.listener.TimeOutIntegrationSessionAttributeListener - - - - KaajeeInit - gov.va.med.authentication.kernel.InitKaajeeServlet - - kaajee-config-file-location - /WEB-INF/kaajeeConfig.xml - - 3 - - - - LoginController - gov.va.med.authentication.kernel.LoginController - - - weblogic - - - - - dispatcher - org.springframework.web.servlet.DispatcherServlet - 1 - + + springSecurityFilterChain + /* + characterEncodingFilter @@ -104,7 +67,7 @@ /tracking.html - + noCacheFilter /board.html @@ -114,10 +77,27 @@ /logout.html - - LoginController - /LoginController - + + org.springframework.web.util.IntrospectorCleanupListener + + + + org.springframework.web.context.ContextLoaderListener + + + + org.springframework.security.ui.session.HttpSessionEventPublisher + + + + gov.va.med.edp.web.servlet.listener.TimeOutIntegrationSessionAttributeListener + + + + dispatcher + org.springframework.web.servlet.DispatcherServlet + 1 + dispatcher @@ -131,17 +111,7 @@ dispatcher - tracking.html - - - - dispatcher - board.html - - - - dispatcher - logout.html + *.html @@ -157,60 +127,60 @@ /error500.jsp - - - ED Tracking Board XML Services - *.xml - GET - POST - - - AUTHENTICATED_KAAJEE_USER - - - NONE - - + + + + + + + + + + + + + + - - - ED Tracking Board Flex Client - *.swf - tracking.html - board.html - GET - - - AUTHENTICATED_KAAJEE_USER - - - NONE - - + + + + + + + + + + + + + + + - - - ED Tracking Board Debug Screen - debug.jsp - GET - - - AUTHENTICATED_KAAJEE_USER - - - NONE - - + + + + + + + + + + + + + - - FORM - - login/login.jsp - login/loginerror.jsp - - - - - AUTHENTICATED_KAAJEE_USER - + + + + + + + + + + + diff --git a/java/tracking-server-main/src/main/webapp/WEB-INF/weblogic.xml b/java/tracking-server-main/src/main/webapp/WEB-INF/weblogic.xml deleted file mode 100644 index d9e9b33..0000000 --- a/java/tracking-server-main/src/main/webapp/WEB-INF/weblogic.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - CookieName - edJSESSIONID - - - PersistentStoreType - replicated_if_clustered - - - - true - - ${edis.tracking.trackingContextRoot} - diff --git a/java/tracking-server-main/src/main/webapp/login/SessionTimeout.jsp b/java/tracking-server-main/src/main/webapp/login/SessionTimeout.jsp deleted file mode 100644 index 9105ca7..0000000 --- a/java/tracking-server-main/src/main/webapp/login/SessionTimeout.jsp +++ /dev/null @@ -1,14 +0,0 @@ - -<%@ page language="java" %> - - -Login Session Time out Error - - -

Your session expired during login, please try again by restarting

-

the login process by using your original bookmark, shortcut or URL destination

- \ No newline at end of file diff --git a/java/tracking-server-main/src/main/webapp/login/images/HealtheVetVistaSmallBlue.jpg b/java/tracking-server-main/src/main/webapp/login/images/HealtheVetVistaSmallBlue.jpg deleted file mode 100644 index ca3bef4..0000000 Binary files a/java/tracking-server-main/src/main/webapp/login/images/HealtheVetVistaSmallBlue.jpg and /dev/null differ diff --git a/java/tracking-server-main/src/main/webapp/login/images/HealtheVetVistaSmallWhite.jpg b/java/tracking-server-main/src/main/webapp/login/images/HealtheVetVistaSmallWhite.jpg deleted file mode 100644 index bbee66a..0000000 Binary files a/java/tracking-server-main/src/main/webapp/login/images/HealtheVetVistaSmallWhite.jpg and /dev/null differ diff --git a/java/tracking-server-main/src/main/webapp/login/javascript/login.js b/java/tracking-server-main/src/main/webapp/login/javascript/login.js deleted file mode 100644 index 5084b2f..0000000 --- a/java/tracking-server-main/src/main/webapp/login/javascript/login.js +++ /dev/null @@ -1,173 +0,0 @@ -/** - * This JavaScript file contains functions that are needed for login. - * @author Infrastructure & Security Service - * @version 1.0.1.002 - */ - -function preserveRadioGroup (evt) { - this.checked = this.storedChecked; - var rgb = this.form[this.name]; - if (!rgb.length && rgb.storedChecked) - rgb.checked = true; - else - for (var b = 0; b < rgb.length; b++) - rgb[b].checked = rgb[b].storedChecked ? true : false; -} - -function disableRadioGroup (radioGroup) { - if (!radioGroup.disabled) { - radioGroup.disabled = true; - if (document.all || document.getElementById) { - if (!radioGroup.length) - radioGroup.disabled = true; - else - for (var b = 0; b < radioGroup.length; b++) - radioGroup[b].disabled = true; - } - else { - if (!radioGroup.length) { - radioGroup.storedChecked = radioGroup.checked; - radioGroup.oldOnClick = radioGroup.onclick; - radioGroup.onclick = preserveRadioGroup; - } - else - for (var b = 0; b < radioGroup.length; b++) { - radioGroup[b].storedChecked = radioGroup[b].checked; - radioGroup[b].oldOnClick = radioGroup[b].onclick; - radioGroup[b].onclick = preserveRadioGroup; - } - } - } -} - -function enableRadioGroup (radioGroup) { - if (radioGroup.disabled) { - radioGroup.disabled = false; - if (document.all || document.getElementById) { - if (!radioGroup.length) - radioGroup.disabled = false; - else - for (var b = 0; b < radioGroup.length; b++) - radioGroup[b].disabled = false; - } - else { - if (!radioGroup.length) { - radioGroup.onclick = radioGroup.oldOnClick; - } - else - for (var b = 0; b < radioGroup.length; b++) { - radioGroup[b].onclick = radioGroup[b].oldOnClick; - } - } - } -} - -function isblank(s) { - slen = s.length; - for (var i = 0; i < slen; i++) { - var c = s.charAt(i); - if ((c != ' ') && (c != '\n') && (c != '')) return false; - } - return true; -} - -function disableObj(obj) { - obj.disabled = true; -} - -function enableObj(obj) { - obj.disabled = false; -} - -function checkHF(myForm,mySelect,myRadioButtonGroup,myHiddenObj1,myHiddenObj2,myHiddenObj3) { - disableInstitutionObj(myForm,mySelect,myRadioButtonGroup,myHiddenObj1,myHiddenObj2) - if (myHiddenObj3.value == "number") { - reSortSelectOptions(myForm,mySelect,"value"); - } - else if (myHiddenObj3.value == "name") { - reSortSelectOptions(myForm,mySelect,"text"); - } -} - -function disableInstitutionObj(myForm,mySelect,myRadioButtonGroup,myHiddenObj1,myHiddenObj2) { - if (myHiddenObj1.value == "true") disableObj(mySelect); - if ((myHiddenObj1.value == "true") || (myHiddenObj2.value == "true")) { - disableRadioGroup(myRadioButtonGroup); - } -} - -function enableInstitutionObj(myForm,mySelect,myRadioButtonGroup,myHiddenObj1,myHiddenObj2) { - myHiddenObj1.value = "false"; - myHiddenObj2.value = "false"; - enableObj(mySelect); - enableRadioGroup(myRadioButtonGroup); -} - -function hasOptions(obj) { - if (obj!=null && obj.options!=null) { return true; } - return false; -} - -function sortSelect(obj,sortBy) { - var o = new Array(); - if (!hasOptions(obj)) { return false; } - for (var i=0; i (b.text+"")) { return 1; } - return 0; - } - ); - } - else if (sortBy == "value") { - o = o.sort( - function(a,b) { - if ((a.value+"") < (b.value+"")) { return -1; } - if ((a.value+"") > (b.value+"")) { return 1; } - return 0; - } - ); - } - else { - alert("\nError encountered while sorting institutions!!!"); - } - - for (var i=0; i -<%@ page language="java" session = "false" %> - -<%@ page import="gov.va.med.authentication.kernel.ConfigurationVO, - gov.va.med.authentication.kernel.LoginController, - weblogic.servlet.security.ServletAuthentication;"%> - -<% -// Turn off cache so that a user cannot navigate back to the login page after post-login -response.setHeader("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1 -response.setHeader("Pragma","no-cache"); //HTTP 1.0 -response.setDateHeader ("Expires", 0); //prevents caching at the proxy server -%> - - - - - - -Login Page - - - - - - - -<% -/* -It could be argued that using code within JSP is not a good thing, but for such a small app it's -completely acceptable. If we were working with an HTML designer, the separation would be good. But then -JSTL would be needed and with that we'd introduce some version of that as a dependency, which is preferably -avoided given because we're embedded, we force these dependencies on the containing application as well. -*/ -ConfigurationVO kaajeeEnv = ConfigurationVO.getInstance(); - -/* -Here if the protocol is 'http', I redirected the user to the same page using 'https' protocol. -*/ - if(request.getParameter("relogin")!=null){ - HttpSession hSess = request.getSession(false); - if(hSess == null) { - StringBuffer sbsession = new StringBuffer(request.getContextPath()); - sbsession.append("/login/SessionTimeout.jsp"); - response.sendRedirect(sbsession.toString()); - return; - } - } - -HttpSession hSess = request.getSession(true); - -String desiredSchema = "https"; //or http -String usingSchema = request.getScheme(); -if(kaajeeEnv.getHTTPSPortLis() != null ) { -if(!desiredSchema.equals(usingSchema)) { - - StringBuffer sburl = request.getRequestURL(); - java.net.URL url = new java.net.URL(sburl.toString()); - hSess = request.getSession(true); - Integer portValue = new Integer(url.getPort()); - hSess.setAttribute("portnumber",portValue); - - String urlString = desiredSchema+"://"+ url.getHost() +":"+kaajeeEnv.getHTTPSPortLis()+url.getPath(); - response.sendRedirect(response.encodeRedirectURL(urlString)); - return; - } -} - -%> - -
- - - - - - - -
- - -
System Announcements:
<%= kaajeeEnv.getIntroductoryText() %>
- - - - - - - - - - <% - //1. Initialize values - String kaajeeDefaultInstitutionValue = ""; - String kaajeeDisableInstitutionComponentsValue = ""; - String kaajeeSortStationByValue = ""; - String kaajeeDisableSortStationByValue = ""; - boolean kaajeeDefaultInstitutionParamFound = false; - boolean kaajeeDisableInstitutionParamFound = false; - boolean kaajeeSortStationByParamFound = false; - boolean kaajeeDisableSortStationByParamFound = false; - //2. Get targetURL and parse out parameters - String targetURL = ServletAuthentication.getTargetURLForFormAuthentication(request.getSession()); - if (targetURL == null) { - StringBuffer sbNavErrorPg = new StringBuffer(request.getContextPath()); - sbNavErrorPg.append("/login/navigationerror.jsp"); - response.sendRedirect(sbNavErrorPg.toString()); - return; - } - int paramPos = targetURL.indexOf('?'); - String paramList = (paramPos > -1) ? targetURL.substring(paramPos + 1, targetURL.length()) : ""; - String[] paramArray = paramList.split("\u0026"); //split on '&' char - for (int i=0; i < paramArray.length; i++) { - String[] tempArray=paramArray[i].split("\u003D"); //split on '=' char - if (tempArray[0].indexOf("kaajeeDefaultInstitution") != -1) { - kaajeeDefaultInstitutionValue = tempArray[1]; - kaajeeDefaultInstitutionParamFound = true; - } else { - if (tempArray[0].indexOf("kaajeeDisableInstitutionComponents") != -1) { - kaajeeDisableInstitutionComponentsValue = tempArray[1]; - kaajeeDisableInstitutionParamFound = true; - } else { - if (tempArray[0].indexOf("kaajeeSortStationBy") != -1) { - kaajeeSortStationByValue = tempArray[1]; - kaajeeSortStationByParamFound = true; - } else { - if (tempArray[0].indexOf("kaajeeDisableSortStationBy") != -1) { - kaajeeDisableSortStationByValue = tempArray[1]; - kaajeeDisableSortStationByParamFound = true; - } - } - } - } - if ((kaajeeDefaultInstitutionParamFound) && (kaajeeDisableInstitutionParamFound) && (kaajeeSortStationByParamFound) && (kaajeeDisableSortStationByParamFound)) break; - } - // - //3. Get default login institution and sorting preference if any from cookies - boolean sortCookieFound = false; - boolean instCookieFound = false; - String defaultSortInstBy=""; - String defaultInst=""; - String cookieDefaultSortInstitutionByString = LoginController.COOKIE_DEFAULT_SORT_INSTITUTION_BY_STRING; - String cookieDefaultDivisionString = LoginController.COOKIE_DEFAULT_DIVISION_STRING; - Cookie[] cookies = request.getCookies(); - if (cookies != null) { - for (int i=0;i 0) ? - (kaajeeSortStationByValue.equals("number") ? "checked" : "") : - ((defaultSortInstBy.equals("")) || - (defaultSortInstBy.equals("number")) ? "checked" : "")); - String radioButton2CheckValue = ((kaajeeSortStationByValue.trim().length() > 0) ? - (kaajeeSortStationByValue.equals("name") ? "checked" : "") : - ((defaultSortInstBy.equals("name")) ? "checked" : "")); - %> - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Login: <%= kaajeeEnv.getHostApplicationName() %>

Health e Vet Vista logo - - - - - - - - - -
Access Code: 
Verify Code:
- name=sortInstBy value="number" onclick="reSortSelectOptions(this.form,this.form.institution,'value')">Sort by Station Number * name=sortInstBy value="name" onclick="reSortSelectOptions(this.form,this.form.institution,'text')">Sort by Station Name * -
>
>
>
Institution: - - *  
 
 
  
* Persistent Cookie Used (more - information). 
-
- - \ No newline at end of file diff --git a/java/tracking-server-main/src/main/webapp/login/loginCookieInfo.htm b/java/tracking-server-main/src/main/webapp/login/loginCookieInfo.htm deleted file mode 100644 index f13ded8..0000000 --- a/java/tracking-server-main/src/main/webapp/login/loginCookieInfo.htm +++ /dev/null @@ -1,44 +0,0 @@ - - - - -Login Persistent Cookie Information - - -

Login Persistent Cookie Information

-

The login module uses a persistent cookie to store the institution you select at login. -

This information is used at the next login, to pre-select the same institution for the next login.

-

Given that the list of institutions may be quite long for some applications, the goal of using the -persistent cookie is to save you time by pre-selecting the most likely institution choice, which for most -users would be the previously selected login. This is similar to the Windows login, which saves your last -domain used for login, and pre-selects that domain at the next login. -

In addition to the above persistent cookie, the login module uses another persistent cookie to store -the user's preference for sorting institutions in the Institution Drop Down box of the login page. -

The cookies contains the following information: -

    -
  • name: gov.va.med.authentication.kernel.defaultDivision -
  • value: station number used for the previous login -
  • expiry time: 180 days -
  • name: gov.va.med.authentication.kernel.defaultSortInstitutionBy -
  • value: sort order of name or number used for the previous refresh -
  • expiry time: 180 days -
- -

Thin Client/Terminal Server users:

-

Please note that persistent cookies may not be of much use on Terminal Servers. -

The reason is that many Terminal Servers may have been configured to use roaming profiles that may -not retain as part of the user profile cookies and temporary internet files upon the user logout -and disconnect.

-

In such cases, the recommendation is to create on each Terminal Server shortcuts and save them -on the desktop and/or quick launch bar. These shortcuts should have the desired target URLs plus any -desired KAAJEE supported parameters. For further details regarding how to use these KAAJEE supported -parameters in order to pre-select the desired institution and institution sorting preference, -please refer to the KAAJEE documentation. - -

Close Window

- - \ No newline at end of file diff --git a/java/tracking-server-main/src/main/webapp/login/loginerror.jsp b/java/tracking-server-main/src/main/webapp/login/loginerror.jsp deleted file mode 100644 index 86d7787..0000000 --- a/java/tracking-server-main/src/main/webapp/login/loginerror.jsp +++ /dev/null @@ -1,13 +0,0 @@ - -<%@ page language="java" %> - - -Forms Authentication Error - -

Forms authentication login failed.

-

Try login again.

- \ No newline at end of file diff --git a/java/tracking-server-main/src/main/webapp/login/loginerrordisplay.jsp b/java/tracking-server-main/src/main/webapp/login/loginerrordisplay.jsp deleted file mode 100644 index 9e95a77..0000000 --- a/java/tracking-server-main/src/main/webapp/login/loginerrordisplay.jsp +++ /dev/null @@ -1,31 +0,0 @@ - -<%@ page language="java" %> - - -Login Error - -<% - -String stringurl = ""; - String errorMessage = (String) session.getAttribute("gov.va.med.authentication.kernel.errormessage"); - if (errorMessage == null) errorMessage = ""; - -%> - -

There was a login error detected by the login system:

- -

<%= errorMessage %>

-
-<% session.removeAttribute("gov.va.med.authentication.kernel.errormessage"); - session = request.getSession(false); - stringurl = request.getContextPath()+"/login/login.jsp"+"?relogin=true"; - - - -%> -

Try login again.

- diff --git a/java/tracking-server-main/src/main/webapp/login/navigationerror.jsp b/java/tracking-server-main/src/main/webapp/login/navigationerror.jsp deleted file mode 100644 index bc7d720..0000000 --- a/java/tracking-server-main/src/main/webapp/login/navigationerror.jsp +++ /dev/null @@ -1,14 +0,0 @@ - -<%@ page language="java" %> - - -Navigation Error - - -

You navigated inappropriately to this page.

-

The login process should only be invoked via the consuming application by using your original bookmark, shortcut or URL destination

- \ No newline at end of file diff --git a/java/tracking-server-vista/pom.xml b/java/tracking-server-vista/pom.xml index aa26138..9ec4193 100644 --- a/java/tracking-server-vista/pom.xml +++ b/java/tracking-server-vista/pom.xml @@ -45,6 +45,24 @@ jaxen jaxen 1.1.1 + + + xerces + xmlParserAPIs + + + xerces + xercesImpl + + + xml-apis + xml-apis + + + xom + xom + +
org.springframework.security @@ -52,16 +70,16 @@ ${spring.security.version} - javax.servlet - servlet-api - ${servlet.version} - provided + javax.servlet + servlet-api + ${servlet.version} + provided - javax.resource - connector - 1.0 - provided + javax.resource + connector + 1.0 + provided org.slf4j