Changeset 1252 for EDIS/trunk/java/tracking-server-main/src
- Timestamp:
- Sep 13, 2011, 3:02:13 AM (13 years ago)
- Location:
- EDIS/trunk/java/tracking-server-main/src
- Files:
-
- 15 added
- 6 deleted
- 4 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
EDIS/trunk/java/tracking-server-main/src/main/resources/strings.properties
r1227 r1252 2 2 app.version=${project.version} 3 3 app.buildtime=BUILD_TIME_PLACEHOLDER 4 copyright.year=20 085 copyright.organization.url=http://www. va.gov6 copyright.organization= Department of Veterans Affairs4 copyright.year=2011 5 copyright.organization.url=http://www.worldvista.org 6 copyright.organization=WorldVistA 7 7 help.contextRoot=${edis.tracking.helpContextRoot} 8 8 logged.out=You have been logged out. 9 9 login.again=Log in again. 10 11 login.title=Emergency Department Integration Software 12 label.access=Access Code 13 label.verify=Verify Code 14 label.facility=Facility 15 button.login=Sign In 16 button.logout=Sign out 17 18 errors.verify.mismatch=Access/Verify code pair mismatch -
EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/dispatcher-servlet.xml
r1227 r1252 19 19 <bean id="handlerMapping" class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping"/> 20 20 21 <bean id="viewResolver" class="org.springframework.web.servlet.view.XmlViewResolver"/> 21 <!-- view names in views.xml --> 22 <bean id="viewResolver" class="org.springframework.web.servlet.view.XmlViewResolver"> 23 <property name="order" value="0"/> 24 </bean> 25 26 <!-- if not found in views.xml default to looking for a JSP --> 27 <bean id="internalResourceViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> 28 <property name="order" value="1"/> 29 <property name="prefix" value="/WEB-INF/jsp/"/> 30 <property name="suffix" value=".jsp"/> 31 </bean> 32 33 <!-- controllers with bean name mappings --> 34 <bean name="/about.html" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/> 22 35 23 36 <bean name="/tracking.html" class="gov.va.med.edp.web.controller.ClientVersionSynchronizationController"> … … 31 44 </bean> 32 45 46 <bean name="/login.html" class="gov.va.med.edp.web.controller.LoginController"> 47 <property name="vistaAccounts" ref="vistaAccounts"/> 48 </bean> 49 33 50 <bean name="/logout.html" class="gov.va.med.edp.web.controller.LogoutController"/> 34 51 … … 39 56 <bean name="/board.xml" class="gov.va.med.edp.web.controller.TrackingController"> 40 57 <property name="trackingDao" ref="bigBoardDao"/> 41 <property name="serverPackageVersionDao" ref="serverPackageVersionDao"/>58 <property name="serverPackageVersionDao" ref="serverPackageVersionDao"/> 42 59 </bean> 43 60 -
EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/views.xml
r1227 r1252 27 27 </bean> 28 28 29 <bean id="about" class="org.springframework.web.servlet.view.JstlView"> 30 <property name="url" value="/WEB-INF/jsp/about.jsp"/> 31 </bean> 32 33 <bean id="login" class="org.springframework.web.servlet.view.JstlView"> 34 <property name="url" value="/WEB-INF/jsp/login.jsp"/> 35 </bean> 36 29 37 <bean id="logout" class="org.springframework.web.servlet.view.JstlView"> 30 38 <property name="url" value="/WEB-INF/jsp/logout.jsp"/> -
EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/web.xml
r1227 r1252 18 18 <context-param> 19 19 <param-name>contextConfigLocation</param-name> 20 <param-value> 21 classpath*:/applicationContext-dao.xml 22 </param-value> 20 <param-value>/WEB-INF/config/web-application-config.xml</param-value> 23 21 </context-param> 22 23 <filter> 24 <filter-name>springSecurityFilterChain</filter-name> 25 <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> 26 </filter> 24 27 25 28 <filter> … … 35 38 <filter-name>noCacheFilter</filter-name> 36 39 <filter-class>gov.va.med.edp.web.servlet.filter.ResponseHeaderFilter</filter-class> 37 40 <init-param> 38 41 <param-name>Cache-Control</param-name> 39 42 <param-value>no-store, must-revalidate</param-value> … … 45 48 </filter> 46 49 47 <listener> 48 <listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class> 49 </listener> 50 51 <listener> 52 <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> 53 </listener> 54 55 <listener> 56 <listener-class>gov.va.med.authentication.kernel.KaajeeSessionAttributeListener</listener-class> 57 </listener> 58 59 <listener> 60 <listener-class>gov.va.med.authentication.kernel.KaajeeHttpSessionListener</listener-class> 61 </listener> 62 63 <listener> 64 <listener-class>gov.va.med.edp.web.servlet.listener.TimeOutIntegrationSessionAttributeListener</listener-class> 65 </listener> 66 67 <servlet> 68 <servlet-name>KaajeeInit</servlet-name> 69 <servlet-class>gov.va.med.authentication.kernel.InitKaajeeServlet</servlet-class> 70 <init-param> 71 <param-name>kaajee-config-file-location</param-name> 72 <param-value>/WEB-INF/kaajeeConfig.xml</param-value> 73 </init-param> 74 <load-on-startup>3</load-on-startup> 75 </servlet> 76 77 <servlet> 78 <servlet-name>LoginController</servlet-name> 79 <servlet-class>gov.va.med.authentication.kernel.LoginController</servlet-class> 80 <run-as> 81 <!-- In this example, weblogic is the boot user name (i.e., weblogic console user name) --> 82 <role-name>weblogic</role-name> 83 </run-as> 84 </servlet> 85 86 <servlet> 87 <servlet-name>dispatcher</servlet-name> 88 <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> 89 <load-on-startup>1</load-on-startup> 90 </servlet> 50 <filter-mapping> 51 <filter-name>springSecurityFilterChain</filter-name> 52 <url-pattern>/*</url-pattern> 53 </filter-mapping> 91 54 92 55 <filter-mapping> … … 105 68 </filter-mapping> 106 69 107 70 <filter-mapping> 108 71 <filter-name>noCacheFilter</filter-name> 109 72 <url-pattern>/board.html</url-pattern> … … 115 78 </filter-mapping> 116 79 117 <servlet-mapping> 118 <servlet-name>LoginController</servlet-name> 119 <url-pattern>/LoginController</url-pattern> 120 </servlet-mapping> 80 <listener> 81 <listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class> 82 </listener> 83 84 <listener> 85 <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> 86 </listener> 87 88 <listener> 89 <listener-class>org.springframework.security.ui.session.HttpSessionEventPublisher</listener-class> 90 </listener> 91 92 <listener> 93 <listener-class>gov.va.med.edp.web.servlet.listener.TimeOutIntegrationSessionAttributeListener</listener-class> 94 </listener> 95 96 <servlet> 97 <servlet-name>dispatcher</servlet-name> 98 <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> 99 <load-on-startup>1</load-on-startup> 100 </servlet> 121 101 122 102 <servlet-mapping> … … 132 112 <servlet-mapping> 133 113 <servlet-name>dispatcher</servlet-name> 134 <url-pattern>tracking.html</url-pattern> 135 </servlet-mapping> 136 137 <servlet-mapping> 138 <servlet-name>dispatcher</servlet-name> 139 <url-pattern>board.html</url-pattern> 140 </servlet-mapping> 141 142 <servlet-mapping> 143 <servlet-name>dispatcher</servlet-name> 144 <url-pattern>logout.html</url-pattern> 114 <url-pattern>*.html</url-pattern> 145 115 </servlet-mapping> 146 116 … … 158 128 </error-page> 159 129 160 < security-constraint>161 <web-resource-collection>162 <web-resource-name>ED Tracking Board XML Services</web-resource-name>163 <url-pattern>*.xml</url-pattern>164 <http-method>GET</http-method>165 <http-method>POST</http-method>166 </web-resource-collection>167 <auth-constraint>168 <role-name>AUTHENTICATED_KAAJEE_USER</role-name>169 </auth-constraint>170 <user-data-constraint>171 <transport-guarantee>NONE</transport-guarantee>172 </user-data-constraint>173 < /security-constraint>130 <!--<security-constraint>--> 131 <!--<web-resource-collection>--> 132 <!--<web-resource-name>ED Tracking Board XML Services</web-resource-name>--> 133 <!--<url-pattern>*.xml</url-pattern>--> 134 <!--<http-method>GET</http-method>--> 135 <!--<http-method>POST</http-method>--> 136 <!--</web-resource-collection>--> 137 <!--<auth-constraint>--> 138 <!--<role-name>AUTHENTICATED_KAAJEE_USER</role-name>--> 139 <!--</auth-constraint>--> 140 <!--<user-data-constraint>--> 141 <!--<transport-guarantee>NONE</transport-guarantee>--> 142 <!--</user-data-constraint>--> 143 <!--</security-constraint>--> 174 144 175 < security-constraint>176 <web-resource-collection>177 <web-resource-name>ED Tracking Board Flex Client</web-resource-name>178 <url-pattern>*.swf</url-pattern>179 <url-pattern>tracking.html</url-pattern>180 <url-pattern>board.html</url-pattern>181 <http-method>GET</http-method>182 </web-resource-collection>183 <auth-constraint>184 <role-name>AUTHENTICATED_KAAJEE_USER</role-name>185 </auth-constraint>186 <user-data-constraint>187 <transport-guarantee>NONE</transport-guarantee>188 </user-data-constraint>189 < /security-constraint>145 <!--<security-constraint>--> 146 <!--<web-resource-collection>--> 147 <!--<web-resource-name>ED Tracking Board Flex Client</web-resource-name>--> 148 <!--<url-pattern>*.swf</url-pattern>--> 149 <!--<url-pattern>tracking.html</url-pattern>--> 150 <!--<url-pattern>board.html</url-pattern>--> 151 <!--<http-method>GET</http-method>--> 152 <!--</web-resource-collection>--> 153 <!--<auth-constraint>--> 154 <!--<role-name>AUTHENTICATED_KAAJEE_USER</role-name>--> 155 <!--</auth-constraint>--> 156 <!--<user-data-constraint>--> 157 <!--<transport-guarantee>NONE</transport-guarantee>--> 158 <!--</user-data-constraint>--> 159 <!--</security-constraint>--> 190 160 191 < security-constraint>192 <web-resource-collection>193 <web-resource-name>ED Tracking Board Debug Screen</web-resource-name>194 <url-pattern>debug.jsp</url-pattern>195 <http-method>GET</http-method>196 </web-resource-collection>197 <auth-constraint>198 <role-name>AUTHENTICATED_KAAJEE_USER</role-name>199 </auth-constraint>200 <user-data-constraint>201 <transport-guarantee>NONE</transport-guarantee>202 </user-data-constraint>203 < /security-constraint>161 <!--<security-constraint>--> 162 <!--<web-resource-collection>--> 163 <!--<web-resource-name>ED Tracking Board Debug Screen</web-resource-name>--> 164 <!--<url-pattern>debug.jsp</url-pattern>--> 165 <!--<http-method>GET</http-method>--> 166 <!--</web-resource-collection>--> 167 <!--<auth-constraint>--> 168 <!--<role-name>AUTHENTICATED_KAAJEE_USER</role-name>--> 169 <!--</auth-constraint>--> 170 <!--<user-data-constraint>--> 171 <!--<transport-guarantee>NONE</transport-guarantee>--> 172 <!--</user-data-constraint>--> 173 <!--</security-constraint>--> 204 174 205 < login-config>206 <auth-method>FORM</auth-method>207 <form-login-config>208 <form-login-page>login/login.jsp</form-login-page>209 <form-error-page>login/loginerror.jsp</form-error-page>210 </form-login-config>211 < /login-config>212 213 < security-role>214 <role-name>AUTHENTICATED_KAAJEE_USER</role-name>215 < /security-role>175 <!--<login-config>--> 176 <!--<auth-method>FORM</auth-method>--> 177 <!--<form-login-config>--> 178 <!--<form-login-page>login/login.jsp</form-login-page>--> 179 <!--<form-error-page>login/loginerror.jsp</form-error-page>--> 180 <!--</form-login-config>--> 181 <!--</login-config>--> 182 <!----> 183 <!--<security-role>--> 184 <!--<role-name>AUTHENTICATED_KAAJEE_USER</role-name>--> 185 <!--</security-role>--> 216 186 </web-app>
Note:
See TracChangeset
for help on using the changeset viewer.