diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java
index 7a32bc7fb4cae9c6545871879b7b85873bd2f4fb..abd4f86ded6c8c15c6faa18aafed299b80530b00 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java
@@ -58,10 +58,10 @@ public class Experiment extends CloneableEntity
@Size(max = 2000)
@Column(name = "description")
private String description;
- @Column(name = "start_date")
+ @Column(name = "start_date", columnDefinition="TIMESTAMP WITH TIME ZONE")
@Temporal(TemporalType.TIMESTAMP)
private Date startDate;
- @Column(name = "end_date")
+ @Column(name = "end_date", columnDefinition="TIMESTAMP WITH TIME ZONE")
@Temporal(TemporalType.TIMESTAMP)
private Date endDate;
@ManyToMany(mappedBy = "experimentList")
diff --git a/src/java/DmWebPortal/src/java/resources.properties b/src/java/DmWebPortal/src/java/resources.properties
index 860aa8901f2248ef0eb11c1d0b7bf683f3b73da2..8e894af5dbbcdff5701aef870cd0d9b3b511f3d7 100644
--- a/src/java/DmWebPortal/src/java/resources.properties
+++ b/src/java/DmWebPortal/src/java/resources.properties
@@ -1,5 +1,6 @@
-DatePattern=MM/dd/yyyy HH:mm:ss
-
+DatePattern=MM/dd/yyyy
+DateTimePattern=MM/dd/yyyy hh:mm aaa
+DateTimeZonePattern=MM/dd/yyyy hh:mm aaa z
PersistenceErrorOccured=A persistence error occurred.
Previous=Previous
Next=Next
diff --git a/src/java/DmWebPortal/web/WEB-INF/web.xml b/src/java/DmWebPortal/web/WEB-INF/web.xml
index b142afb352865785bd6b3d50de0d75ede9420a90..fe8af3cc30c8171c5e7682e34709eec4d21c4a6f 100644
--- a/src/java/DmWebPortal/web/WEB-INF/web.xml
+++ b/src/java/DmWebPortal/web/WEB-INF/web.xml
@@ -25,12 +25,20 @@
<exception-type>javax.faces.application.ViewExpiredException</exception-type>
<location>/login.xhtml</location>
</error-page>
-<!-- <navigation-rule>
- <from-view-id>/views/policyType/view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>/views/policyType/view</from-outcome>
- <to-view-id>/views/policyProperty/view.xhtml</to-view-id>
- <redirect />
- </navigation-case>
-</navigation-rule>-->
+ <security-constraint>
+ <display-name>Restrict Private Files</display-name>
+ <web-resource-collection>
+ <web-resource-name>Restricted Files</web-resource-name>
+ <url-pattern>/templates/*</url-pattern>
+ <url-pattern>/views/allowedPolicyValue/private/*</url-pattern>
+ <url-pattern>/views/common/*</url-pattern>
+ <url-pattern>/views/experiment/private/*</url-pattern>
+ <url-pattern>/views/experimentType/private/*</url-pattern>
+ <url-pattern>/views/policyProperty/private/*</url-pattern>
+ <url-pattern>/views/policyType/private/*</url-pattern>
+ <url-pattern>/views/roleType/private/*</url-pattern>
+ <url-pattern>/views/userInfo/private/*</url-pattern>
+ <url-pattern>/views/userSystemRole/private/*</url-pattern>
+ </web-resource-collection>
+ </security-constraint>
</web-app>
diff --git a/src/java/DmWebPortal/web/views/experiment/private/experimentCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentCreatePanelGrid.xhtml
index a284905a387fc83b72f824fa68dc2caa2027ae0f..f1183eff8a14923d1f7c0fe864ffb57c5b0aee12 100644
--- a/src/java/DmWebPortal/web/views/experiment/private/experimentCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/private/experimentCreatePanelGrid.xhtml
@@ -27,10 +27,10 @@
<h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>
<h:outputLabel for="startDate" value="Start Date"/>
- <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}" />
+ <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
<h:outputLabel for="endDate" value="End Date" />
- <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}" />
+ <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
</p:panelGrid>
diff --git a/src/java/DmWebPortal/web/views/experiment/private/experimentEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentEditPanelGrid.xhtml
index e0ebffb46baf87838db41f3de02e1e72cd805233..880a70c75c1c0c960a2ffaf2071135a10174f2a1 100644
--- a/src/java/DmWebPortal/web/views/experiment/private/experimentEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/private/experimentEditPanelGrid.xhtml
@@ -19,10 +19,10 @@
<h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>
<h:outputLabel for="startDate" value="Start Date" styleClass="entityDataLabel"/>
- <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}"/>
+ <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
<h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
- <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}"/>
+ <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
</p:panelGrid>
diff --git a/src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml
index a62946a8faca221148c2e471a263651eca7450f7..8783af2ae87600e92adda9cf266df52e75bace39 100644
--- a/src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml
@@ -41,7 +41,7 @@
filterBy="#{experimentObject.startDate}" filterMatchMode="contains" >
<h:outputText value="#{experimentObject.startDate}">
- <f:convertDateTime pattern="#{resources.DatePattern}" type="date" />
+ <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago"/>
</h:outputText>
</p:column>
@@ -49,7 +49,7 @@
filterBy="#{experimentObject.endDate}" filterMatchMode="contains" >
<h:outputText value="#{experimentObject.endDate}">
- <f:convertDateTime pattern="#{resources.DatePattern}" type="date" />
+ <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago"/>
</h:outputText>
</p:column>
diff --git a/src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml
index 6b2d01d12f7d9e4a8a07f216d0f82b636e643a60..0e5fe46f420e4d6b654fa9d294a514959af9a3c6 100644
--- a/src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml
@@ -21,13 +21,13 @@
<h:outputLabel for="startDate" value="Start Date" styleClass="entityDataLabel"/>
<h:outputText id="startDate" value="#{experimentObject.startDate}" styleClass="entityDataText">
- <f:convertDateTime pattern="#{resources.DatePattern}" type="date" />
+ <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago" />
</h:outputText>
<h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
<h:outputText id="endDate" value="#{experimentObject.endDate}" styleClass="entityDataText">
- <f:convertDateTime pattern="#{resources.DatePattern}" type="date" />
+ <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago" />
</h:outputText>
</p:panelGrid>