You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/01/16 12:16:29 UTC
svn commit: r1724958 - in /ofbiz/branches/release15.12: ./
applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
specialpurpose/solr/webapp/solr/WEB-INF/web.xml
Author: deepak
Date: Sat Jan 16 11:16:29 2016
New Revision: 1724958
URL: http://svn.apache.org/viewvc?rev=1724958&view=rev
Log:
Applied fix from trunk for revision: 1724957
===
OFBIZ-(6655) Add session tracking mode and make cookie secure for scrum and solr component. Also fix the Invalid content was found starting with element 'description' for manufacturing component.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/solr/webapp/solr/WEB-INF/web.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 11:16:29 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954
+/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957
Modified: ofbiz/branches/release15.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=1724958&r1=1724957&r2=1724958&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Sat Jan 16 11:16:29 2016
@@ -74,9 +74,9 @@ under the License.
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
+ <description>Main Control Servlet</description>
<display-name>ControlServlet</display-name>
<servlet-name>ControlServlet</servlet-name>
- <description>Main Control Servlet</description>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified: ofbiz/branches/release15.12/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml?rev=1724958&r1=1724957&r2=1724958&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml Sat Jan 16 11:16:29 2016
@@ -17,48 +17,52 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
- <web-app>
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
<display-name>Apache OFBiz - scrum Component</display-name>
<description>scrum Component of the Apache OFBiz Project
</description>
<context-param>
- <param-name>localDispatcherName</param-name>
- <param-value>scrum</param-value>
<description>A unique name used to identify/recognize the local
dispatcher for the Service Engine</description>
+ <param-name>localDispatcherName</param-name>
+ <param-value>scrum</param-value>
</context-param>
<context-param>
- <param-name>entityDelegatorName</param-name>
- <param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in
entityengine.xml</description>
+ <param-name>entityDelegatorName</param-name>
+ <param-value>default</param-value>
</context-param>
<context-param>
- <param-name>mainDecoratorLocation</param-name>
- <param-value>component://scrum/widget/demotest/DemotestScreen.xml
- </param-value>
<description>The location of the main-decorator screen to use for this
webapp; referred to as a context variable in screen def XML files.
</description>
+ <param-name>mainDecoratorLocation</param-name>
+ <param-value>component://scrum/widget/demotest/DemotestScreen.xml
+ </param-value>
</context-param>
<context-param>
- <param-name>widgetVerbose</param-name>
- <param-value>false</param-value>
<description>Enable widget boundary comments. See
org.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().
</description>
+ <param-name>widgetVerbose</param-name>
+ <param-value>false</param-value>
</context-param>
<context-param>
+ <description>Remove unnecessary whitespace from HTML output.</description>
<param-name>compressHTML</param-name>
<param-value>false</param-value>
- <description>Remove unnecessary whitespace from HTML output.
- </description>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -100,9 +104,9 @@ under the License.
-->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -113,6 +117,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
@@ -120,4 +129,4 @@ under the License.
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
</welcome-file-list>
- </web-app>
\ No newline at end of file
+</web-app>
\ No newline at end of file
Modified: ofbiz/branches/release15.12/specialpurpose/solr/webapp/solr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/solr/webapp/solr/WEB-INF/web.xml?rev=1724958&r1=1724957&r2=1724958&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/solr/webapp/solr/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/solr/webapp/solr/WEB-INF/web.xml Sat Jan 16 11:16:29 2016
@@ -15,7 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app>
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
<display-name>Apache OFBiz - Solr Component</display-name>
<description>Solr Component of the Apache OFBiz Project</description>
@@ -172,6 +177,11 @@
<session-config>
<session-timeout>2</session-timeout>
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<mime-mapping>