+ <fmt:message key="app.name"/> +

Index: /EDIS/trunk/java/tracking-help/src/main/webapp/WEB-INF/web.xml =================================================================== --- /EDIS/trunk/java/tracking-help/src/main/webapp/WEB-INF/web.xml (revision 1251) +++ /EDIS/trunk/java/tracking-help/src/main/webapp/WEB-INF/web.xml (revision 1252) @@ -1,4 +1,5 @@ - - - EDIS Tracking Server Help + + + EDIS Tracking Server Help Index: /EDIS/trunk/java/tracking-parent/pom.xml =================================================================== --- /EDIS/trunk/java/tracking-parent/pom.xml (revision 1251) +++ /EDIS/trunk/java/tracking-parent/pom.xml (revision 1252) @@ -255,4 +255,5 @@ org.codehaus.mojo cobertura-maven-plugin + 2.5.1 @@ -278,8 +279,9 @@ - 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 Index: /EDIS/trunk/java/tracking-server-bigboard/pom.xml =================================================================== --- /EDIS/trunk/java/tracking-server-bigboard/pom.xml (revision 1251) +++ /EDIS/trunk/java/tracking-server-bigboard/pom.xml (revision 1252) @@ -59,12 +59,4 @@ - src/main/webapp/WEB-INF - - weblogic.xml - - true - WEB-INF - - ${edis.tracking.build.swf.directory} / @@ -125,85 +117,8 @@ - - - - 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 Index: /EDIS/trunk/java/tracking-server-bigboard/src/main/webapp/WEB-INF/web.xml =================================================================== --- /EDIS/trunk/java/tracking-server-bigboard/src/main/webapp/WEB-INF/web.xml (revision 1251) +++ /EDIS/trunk/java/tracking-server-bigboard/src/main/webapp/WEB-INF/web.xml (revision 1252) @@ -98,29 +98,29 @@ - - - ED Tracking Board Flex Client - *.swf - *.html - *.xml - *.jsp - *.csv - GET - POST - - - SSL_AUTHENTICATED_USERS - - - NONE - - + + + + + + + + + + + + + + + + + + - - CLIENT-CERT - + + + - - SSL_AUTHENTICATED_USERS - + + + Index: IS/trunk/java/tracking-server-bigboard/src/main/webapp/WEB-INF/weblogic.xml =================================================================== --- /EDIS/trunk/java/tracking-server-bigboard/src/main/webapp/WEB-INF/weblogic.xml (revision 1251) +++ (revision ) @@ -1,44 +1,0 @@ - - - - - - - - - - - CookieName - - edisboardJSESSIONID - - - - - - PersistentStoreType - - replicated_if_clustered - - - - - - - - true - - - - ${edis.tracking.boardContextRoot} - - - - SSL_AUTHENTICATED_USERS - - SSL_AUTHENTICATED_USERS - - - - - Index: /EDIS/trunk/java/tracking-server-main/pom.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/pom.xml (revision 1251) +++ /EDIS/trunk/java/tracking-server-main/pom.xml (revision 1252) @@ -36,4 +36,21 @@ + ch.qos.logback + logback-classic + 0.9.29 + runtime + + + javax.resource + connector + 1.0 + + + javax.servlet + servlet-api + ${servlet.version} + provided + + javax.servlet jstl @@ -64,15 +81,7 @@ 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} @@ -88,4 +97,5 @@ maven-antrun-plugin + 1.2 @@ -155,49 +165,23 @@ + + 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 Index: /EDIS/trunk/java/tracking-server-main/src/jetty/logback.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/jetty/logback.xml (revision 1252) +++ /EDIS/trunk/java/tracking-server-main/src/jetty/logback.xml (revision 1252) @@ -0,0 +1,20 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + + Index: /EDIS/trunk/java/tracking-server-main/src/main/java/gov/va/med/edp/web/controller/LoginController.java =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/java/gov/va/med/edp/web/controller/LoginController.java (revision 1252) +++ /EDIS/trunk/java/tracking-server-main/src/main/java/gov/va/med/edp/web/controller/LoginController.java (revision 1252) @@ -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; + } +} Index: IS/trunk/java/tracking-server-main/src/main/resources/application.properties =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/resources/application.properties (revision 1251) +++ (revision ) @@ -1,9 +1,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 Index: IS/trunk/java/tracking-server-main/src/main/resources/applicationContext-dao.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/resources/applicationContext-dao.xml (revision 1251) +++ (revision ) @@ -1,9 +1,0 @@ - - - - - - - - Index: /EDIS/trunk/java/tracking-server-main/src/main/resources/strings.properties =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/resources/strings.properties (revision 1251) +++ /EDIS/trunk/java/tracking-server-main/src/main/resources/strings.properties (revision 1252) @@ -2,8 +2,17 @@ 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. + +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 Index: /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/data-access-config.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/data-access-config.xml (revision 1252) +++ /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/data-access-config.xml (revision 1252) @@ -0,0 +1,9 @@ + + + + + + + + Index: /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/security-config.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/security-config.xml (revision 1252) +++ /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/security-config.xml (revision 1252) @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/web-application-config.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/web-application-config.xml (revision 1252) +++ /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/web-application-config.xml (revision 1252) @@ -0,0 +1,8 @@ + + + + + Index: /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/dispatcher-servlet.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/dispatcher-servlet.xml (revision 1251) +++ /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/dispatcher-servlet.xml (revision 1252) @@ -19,5 +19,18 @@ - + + + + + + + + + + + + + + @@ -31,4 +44,8 @@ + + + + @@ -39,5 +56,5 @@ - + Index: /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/about.jsp =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/about.jsp (revision 1252) +++ /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/about.jsp (revision 1252) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> + + + + + <fmt:message key="app.name"/> + + + +

+ +

Built:

+ +

+ Copyright - "> +

+ + Index: /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/login.jsp (revision 1252) +++ /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/login.jsp (revision 1252) @@ -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"/> + + + +

+ + + + + + + + + + + + + + + + + + + + + + + +

+ + +
+ + + +	+ +
+ + + +	+ +
+ + + +	+ +
+	+ +

+ + Index: /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/taglibs.jsp =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/taglibs.jsp (revision 1252) +++ /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/jsp/taglibs.jsp (revision 1252) @@ -0,0 +1,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" %> Index: IS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xml (revision 1251) +++ (revision ) @@ -1,469 +1,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. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: IS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xsd =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/kaajeeConfig.xsd (revision 1251) +++ (revision ) @@ -1,84 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/views.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/views.xml (revision 1251) +++ /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/views.xml (revision 1252) @@ -27,4 +27,12 @@ + + + + + + Index: /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/web.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/web.xml (revision 1251) +++ /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/web.xml (revision 1252) @@ -18,8 +18,11 @@ contextConfigLocation - - classpath*:/applicationContext-dao.xml - + /WEB-INF/config/web-application-config.xml + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + @@ -35,5 +38,5 @@ noCacheFilter gov.va.med.edp.web.servlet.filter.ResponseHeaderFilter - +

Cache-Control

no-store, must-revalidate @@ -45,48 +48,8 @@ - - 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 + /* + @@ -105,5 +68,5 @@ - +

noCacheFilter

/board.html @@ -115,8 +78,25 @@ - - 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 +

@@ -132,15 +112,5 @@ dispatcher - tracking.html - - - - dispatcher - board.html - - - - dispatcher - logout.html + *.html @@ -158,59 +128,59 @@ - - - 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 - + + + + + + + + + + + Index: IS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/weblogic.xml =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/weblogic.xml (revision 1251) +++ (revision ) @@ -1,36 +1,0 @@ - - - - - - - - - - - CookieName - - edJSESSIONID - - - - - - PersistentStoreType - - replicated_if_clustered - - - - - - - - true - - - - ${edis.tracking.trackingContextRoot} - - - Index: IS/trunk/java/tracking-server-main/src/main/webapp/about.jsp =================================================================== --- /EDIS/trunk/java/tracking-server-main/src/main/webapp/about.jsp (revision 1251) +++ (revision ) @@ -1,25 +1,0 @@ -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> - - - - - <fmt:message key="app.name"/> - - - -

- -

Built:

- -

- Copyright - "> -

- - Index: /EDIS/trunk/java/tracking-server-vista/pom.xml =================================================================== --- /EDIS/trunk/java/tracking-server-vista/pom.xml (revision 1251) +++ /EDIS/trunk/java/tracking-server-vista/pom.xml (revision 1252) @@ -46,4 +46,22 @@ jaxen 1.1.1 + + + xerces + xmlParserAPIs + + + xerces + xercesImpl + + + xml-apis + xml-apis + + + xom + xom + +

@@ -53,14 +71,14 @@ - 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