Yaniv Dary has uploaded a new change for review.
Change subject: packaging: updated customizations to match 5.5.0 GA
......................................................................
packaging: updated customizations to match 5.5.0 GA
Change-Id: Id055510466b857998e22076fa9bfd79f5d51425a
Signed-off-by: Yaniv Dary <yd...@redhat.com>
---
M server-customizations/WEB-INF/applicationContext-security-web.xml
M server-customizations/WEB-INF/applicationContext.xml
M server-customizations/WEB-INF/classes/jasperreports.properties
M server-customizations/WEB-INF/decorators/decorator.jsp
M server-customizations/WEB-INF/decorators/minimalDecorator.jsp
M server-customizations/WEB-INF/web.xml
6 files changed, 195 insertions(+), 69 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/36/21236/1
diff --git a/server-customizations/WEB-INF/applicationContext-security-web.xml
b/server-customizations/WEB-INF/applicationContext-security-web.xml
index e821bed..ed48c28 100644
--- a/server-customizations/WEB-INF/applicationContext-security-web.xml
+++ b/server-customizations/WEB-INF/applicationContext-security-web.xml
@@ -18,11 +18,11 @@
CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
PATTERN_TYPE_APACHE_ANT
/xmla=httpSessionContextIntegrationFilter,${bean.loggingFilter},${bean.basicProcessingFilter},JIAuthenticationSynchronizer,anonymousProcessingFilter,basicAuthExceptionTranslationFilter,filterInvocationInterceptor
-
/services/**=httpSessionContextIntegrationFilter,${bean.loggingFilter},${bean.portletAuthenticationProcessingFilter},
delegatingBasicProcessingFilter,${bean.passwordExpirationProcessingFilter},anonymousProcessingFilter,wsBasicAuthExceptionTranslationFilter,filterInvocationInterceptor
-
/rest/login=httpSessionContextIntegrationFilter,${bean.loggingFilter},
encryptionFilter,delegatingAuthenticationRestProcessingFilter,anonymousProcessingFilter,filterInvocationInterceptor
-
/rest/**=httpSessionContextIntegrationFilter,${bean.loggingFilter},${bean.portletAuthenticationProcessingFilter},delegatingBasicProcessingFilter,${bean.passwordExpirationProcessingFilter},anonymousProcessingFilter,wsBasicAuthExceptionTranslationFilter,filterInvocationInterceptor
-
/rest_v2/**=httpSessionContextIntegrationFilter,encryptionFilter,textOnlyResponseWebAppSecurityFilter,jsCsrfGuardFilter,${bean.loggingFilter},${bean.userPreferencesFilter},${bean.authenticationProcessingFilter},${bean.userPreferencesFilter},${bean.basicProcessingFilter},requestParameterAuthenticationFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,restExceptionTranslationFilter,filterInvocationInterceptor
-
/**=httpSessionContextIntegrationFilter,encryptionFilter,multipartRequestWrapperFilter,webAppSecurityFilter,jsCsrfGuardFilter,${bean.loggingFilter},${bean.userPreferencesFilter},delegatingAuthenticationProcessingFilter,${bean.userPreferencesFilter},EngineSimplePreAuthFilter,delegatingRequestParameterAuthenticationFilter,anonymousProcessingFilter,delegatingExceptionTranslationFilter,filterInvocationInterceptor,switchUserProcessingFilter,iPadSupportFilter
+
/services/**=httpSessionContextIntegrationFilter,${bean.loggingFilter},${bean.portletAuthenticationProcessingFilter},
delegatingBasicProcessingFilter,${bean.passwordExpirationProcessingFilter},JIAuthenticationSynchronizer,anonymousProcessingFilter,wsBasicAuthExceptionTranslationFilter,filterInvocationInterceptor
+
/rest/login=httpSessionContextIntegrationFilter,${bean.loggingFilter},
encryptionFilter,delegatingAuthenticationRestProcessingFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,filterInvocationInterceptor
+
/rest/**=httpSessionContextIntegrationFilter,${bean.loggingFilter},${bean.portletAuthenticationProcessingFilter},delegatingBasicProcessingFilter,${bean.passwordExpirationProcessingFilter},JIAuthenticationSynchronizer,anonymousProcessingFilter,wsBasicAuthExceptionTranslationFilter,filterInvocationInterceptor
+
/rest_v2/**=httpSessionContextIntegrationFilter,encryptionFilter,textOnlyResponseWebAppSecurityFilter,jsCsrfGuardFilter,${bean.loggingFilter},${bean.userPreferencesFilter},${bean.authenticationProcessingFilter},${bean.userPreferencesFilter},delegatingBasicProcessingFilter,delegatingRequestParameterAuthenticationFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,restExceptionTranslationFilter,filterInvocationInterceptor
+
/**=httpSessionContextIntegrationFilter,encryptionFilter,multipartRequestWrapperFilter,webAppSecurityFilter,jsCsrfGuardFilter,${bean.loggingFilter},${bean.userPreferencesFilter},delegatingAuthenticationProcessingFilter,${bean.userPreferencesFilter},EngineSimplePreAuthFilter,delegatingRequestParameterAuthenticationFilter,JIAuthenticationSynchronizer,anonymousProcessingFilter,delegatingExceptionTranslationFilter,filterInvocationInterceptor,switchUserProcessingFilter,iPadSupportFilter
</value>
</property>
</bean>
@@ -335,19 +335,33 @@
/jrpxml/**=ROLE_USER,ROLE_ADMINISTRATOR
/heartbeatinfo.html=ROLE_USER,ROLE_ADMINISTRATOR
/rest/**=ROLE_USER,ROLE_ADMINISTRATOR
- /rest_v2/users/**=ROLE_ADMINISTRATOR
- /rest_v2/roles/**=ROLE_ADMINISTRATOR
- /rest_v2/organizations/**=ROLE_ADMINISTRATOR
+ /rest_v2/jobs/**=ROLE_USER,ROLE_ADMINISTRATOR
/rest_v2/permissions/**=ROLE_USER,ROLE_ADMINISTRATOR
+ /rest_v2/reports/**=ROLE_USER,ROLE_ADMINISTRATOR
/rest_v2/resources/**=ROLE_USER,ROLE_ADMINISTRATOR
- /rest_v2/export/**=ROLE_SUPERUSER
- /rest_v2/import/**=ROLE_SUPERUSER
+ /rest_v2/reportexecutions/**=ROLE_USER,ROLE_ADMINISTRATOR
+
/rest_v2/serverinfo/**=ROLE_ANONYMOUS,ROLE_USER,ROLE_ADMINISTRATOR
+
/rest_v2/application.wadl=ROLE_ANONYMOUS,ROLE_USER,ROLE_ADMINISTRATOR
+
/rest_v2/application.wadl/xsd0.xsd=ROLE_ANONYMOUS,ROLE_USER,ROLE_ADMINISTRATOR
+ /rest_v2/bundles/**=ROLE_ANONYMOUS,ROLE_USER,ROLE_ADMINISTRATOR
+ /rest_v2/bundles/**=ROLE_ANONYMOUS,ROLE_USER,ROLE_ADMINISTRATOR
/404.html=ROLE_ANONYMOUS,ROLE_USER,ROLE_ADMINISTRATOR
/500.html=ROLE_ANONYMOUS,ROLE_USER,ROLE_ADMINISTRATOR
/reportgenerator.html=ROLE_USER,ROLE_ADMINISTRATOR
/viewreportcancel.html=ROLE_USER,ROLE_ADMINISTRATOR
/viewreportasynccancel.html=ROLE_USER,ROLE_ADMINISTRATOR
/viewreportpageupdatecheck.html=ROLE_USER,ROLE_ADMINISTRATOR
+ /bif/*=ROLE_ANONYMOUS,ROLE_USER,ROLE_ADMINISTRATOR
+ /bif/*/**=ROLE_USER,ROLE_ADMINISTRATOR
+ /getreportcomponents.html=ROLE_USER,ROLE_ADMINISTRATOR
+ /getrequirejsconfig.html=ROLE_USER,ROLE_ADMINISTRATOR
+ /runreportaction.html=ROLE_USER,ROLE_ADMINISTRATOR
+
+ <!--scheduler-->
+ /scheduler/jobsummary.html=ROLE_USER,ROLE_ADMINISTRATOR
+ /scheduler/jobdetails.html=ROLE_USER,ROLE_ADMINISTRATOR
+ /scheduler/main.html=ROLE_USER,ROLE_ADMINISTRATOR
+
</value>
</property>
</bean>
@@ -367,19 +381,7 @@
<property name="value">
<value>
/awsconfiguration.html=ROLE_SUPERUSER
- /*.html=ROLE_ADMINISTRATOR
- /*.jsp=ROLE_ADMINISTRATOR
- </value>
- </property>
- <property name="valueType" value="string"/>
- </bean>
-
- <!-- get these done last -->
- <bean
class="com.jaspersoft.jasperserver.api.common.util.spring.GenericBeanUpdater">
- <property name="definition" ref="setRolesForURL"/>
- <property name="order" value="1000000000"/>
- <property name="value">
- <value>
+ /rest_v2/**=ROLE_ADMINISTRATOR
/*.html=ROLE_ADMINISTRATOR
/*.jsp=ROLE_ADMINISTRATOR
</value>
@@ -428,7 +430,7 @@
<value>/flow.html?_flowId=designerOptionsFlow</value>
<value>/flow.html?_flowId=designerCacheFlow</value>
<value>/flow.html?_flowId=awsSettingsFlow</value>
- <value>/flow.html?_flowId=reportSchedulingFlow</value>
+
<value>/flow.html?_flowId=dashboardDesignerFlow</value>
<value>/log_settings.html</value>
<value>/flow.html?_flowId=createSLDatasourceFlow</value>
diff --git a/server-customizations/WEB-INF/applicationContext.xml
b/server-customizations/WEB-INF/applicationContext.xml
index 1154561..6b8da4c 100644
--- a/server-customizations/WEB-INF/applicationContext.xml
+++ b/server-customizations/WEB-INF/applicationContext.xml
@@ -20,6 +20,8 @@
<alias name="${bean.securityContextProvider}"
alias="concreteSecurityContextProvider"/>
<alias name="${bean.engineService}" alias="concreteEngineService"/>
+ <alias name="${bean.navigationActionModelSupport}"
alias="concreteNavigationActionModelSupport"/>
+ <alias name="fileVirtualizerFactory" alias="concreteVirtualizerFactory"/>
<util:properties id="springConfiguration"
location="${resource.root}/js.spring.properties" />
@@ -554,12 +556,7 @@
<property name="awsDataSourceServiceFactory"
ref="awsDataSourceServiceFactory"/>
</bean>
-
- <bean id="jndiFallbackResolver"
class="com.jaspersoft.jasperserver.api.metadata.common.util.JndiFallbackResolver">
- <property name="jndiFallbackProperties">
- <util:properties location="${resource.root}/js.jdbc.properties"/>
- </property>
- </bean>
+ <bean id="jndiFallbackResolver"
class="com.jaspersoft.jasperserver.api.metadata.common.util.JndiFallbackResolver"/>
<bean id="jndiJdbcDataSourceServiceFactory"
class="com.jaspersoft.jasperserver.api.engine.jasperreports.service.impl.JndiJdbcReportDataSourceServiceFactory"
@@ -907,29 +904,40 @@
<!-- i18n -->
<bean id="messageSource"
class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
<property name="useCodeAsDefaultMessage" value="true"/>
- <property name="cacheSeconds" value="-1"/>
+ <!-- Uncomment this line in order to enable runtime bundle loading -->
+ <!-- Warning : this cause performance impact -->
+ <!--<property name="cacheSeconds" value="1"/>-->
<property name="fallbackToSystemLocale" value="false"/>
- <property name="basenames">
+ <property name="basenames" ref="bundlePathsList"/>
+ </bean>
+
+ <alias name="${bean.bundlePathsList}" alias="bundlePathsList"/>
+
+ <bean id="bundlePathsListCe"
class="com.jaspersoft.jasperserver.api.common.util.spring.ArrayFactoryBean">
+ <property name="sourceList">
<list>
<value>${resource.root}/bundles/jasperserver_messages</value>
<value>${resource.root}/bundles/jasperserver_config</value>
<value>${resource.root}/bundles/jpivot_messages</value>
-
<value>${resource.root}/internal/jpivot_internal_messages</value>
- <value>${resource.root}/internal/jasperserver</value>
<value>${resource.root}/bundles/calendar</value>
<value>${resource.root}/bundles/jsexceptions_messages</value>
<value>${resource.root}/bundles/scheduling_ws</value>
<value>${resource.root}/bundles/ja-pro_messages</value>
-
<value>${resource.root}/internal/ja-pro_internal_messages</value>
<value>${resource.root}/bundles/ja_mondrian_messages</value>
<value>${resource.root}/bundles/mondrian_exception_messages</value>
<value>${resource.root}/bundles/security</value>
<value>${resource.root}/bundles/logger_descriptions</value>
<value>${resource.root}/bundles/jasperreports_messages</value>
+
+
<value>${resource.root}/internal/jpivot_internal_messages</value>
+ <value>${resource.root}/internal/jasperserver</value>
+
<value>${resource.root}/internal/ja-pro_internal_messages</value>
+
+
<value>${resource.root}/bundles/ScalableInputControlsBundle</value>
</list>
</property>
</bean>
-
+
<!-- JasperReportsContext -->
<bean id="jasperReportsContext"
class="net.sf.jasperreports.engine.SimpleJasperReportsContext">
<property name="extensions">
@@ -939,8 +947,74 @@
<ref bean="messageProviderFactory"/>
</list>
</entry>
+ <entry key="net.sf.jasperreports.repo.RepositoryService">
+ <list>
+ <ref bean="repoRepositoryService"/>
+ </list>
+ </entry>
+ <entry key="net.sf.jasperreports.web.WebLocaleResolver">
+ <list>
+ <bean
class="com.jaspersoft.jasperserver.war.common.ServerLocaleResolver"/>
+ </list>
+ </entry>
+ <entry
key="net.sf.jasperreports.web.util.RequirejsModuleMapping">
+ <list>
+ <bean
class="net.sf.jasperreports.web.util.RequirejsModuleMapping">
+ <constructor-arg value="jquery-1.10.2"/>
+ <constructor-arg
value="lib/amd-jquery-1.10.2"/>
+ <constructor-arg value="false"/>
+ </bean>
+ <bean
class="net.sf.jasperreports.web.util.RequirejsModuleMapping">
+ <constructor-arg
value="jquery.ui-1.10.3"/>
+ <constructor-arg
value="lib/amd-jqueryui-1.10.3"/>
+ <constructor-arg value="false"/>
+ </bean>
+ <bean
class="net.sf.jasperreports.web.util.RequirejsModuleMapping">
+ <constructor-arg
value="jqueryui-1.10.3-timepicker"/>
+ <constructor-arg
value="lib/amd-jqueryui-1.10.3-timepicker"/>
+ <constructor-arg value="false"/>
+ </bean>
+ <bean
class="net.sf.jasperreports.web.util.RequirejsModuleMapping">
+ <constructor-arg value="async"/>
+ <constructor-arg value="lib/async"/>
+ <constructor-arg value="false"/>
+ </bean>
+ <bean
class="net.sf.jasperreports.web.util.RequirejsModuleMapping">
+ <constructor-arg value="text"/>
+ <constructor-arg value="text"/>
+ <constructor-arg value="false"/>
+ </bean>
+ <!-- overwrite jr modules -->
+ <bean
class="net.sf.jasperreports.web.util.RequirejsModuleMapping">
+ <constructor-arg
value="jasperreports-loader"/>
+ <constructor-arg
value="report/jasperreports-loader"/>
+ <constructor-arg value="false"/>
+ </bean>
+ <bean
class="net.sf.jasperreports.web.util.RequirejsModuleMapping">
+ <constructor-arg
value="jasperreports-report-processor"/>
+ <constructor-arg
value="report/jasperreports-report-processor"/>
+ <constructor-arg value="false"/>
+ </bean>
+ </list>
+ </entry>
</map>
</property>
+ </bean>
+
+ <bean id="repoRepositoryService"
class="com.jaspersoft.jasperserver.api.engine.jasperreports.util.RepoRepositoryService">
+ <property name="persistenceServices">
+ <map>
+ <entry
key="net.sf.jasperreports.repo.InputStreamResource">
+ <bean
class="net.sf.jasperreports.repo.InputStreamPersistenceService"/>
+ </entry>
+ <entry key="net.sf.jasperreports.repo.ReportResource">
+ <bean
class="net.sf.jasperreports.repo.SerializedReportPersistenceService"/>
+ </entry>
+ <entry key="net.sf.jasperreports.data.DataAdapter">
+ <bean
class="net.sf.jasperreports.repo.CastorDataAdapterPersistenceService"/>
+ </entry>
+ </map>
+ </property>
</bean>
<bean id="messageProviderFactory"
class="com.jaspersoft.jasperserver.api.engine.jasperreports.util.MessageSourceMessageProviderFactory">
@@ -1064,10 +1138,6 @@
<property name="urlParameterReportLocale" value="reportLocale"/>
</bean>
- <bean id="localPageHyperlinkProducerFactory"
class="com.jaspersoft.jasperserver.war.action.hyperlinks.LocalPageHyperlinkProducerFactory">
- <property name="navigateToPageFunction" value="navigateToReportPage"/>
- </bean>
-
<bean id="localAnchorHyperlinkProducerFactory"
class="com.jaspersoft.jasperserver.war.action.hyperlinks.LocalAnchorHyperlinkProducerFactory">
<property name="jasperPrintNameRequestAttribute"
value="jasperPrintName"/>
<property name="flowControllerMapping" value="/flow.html"/>
@@ -1081,7 +1151,7 @@
<map>
<entry key="ReportExecution"
value-ref="${bean.reportExecutionHyperlinkProducer}"/>
<entry key="ReportInteraction"
value-ref="${bean.reportExecutionHyperlinkProducer}"/>
- <entry key="LocalPage"
value-ref="localPageHyperlinkProducerFactory"/>
+ <entry key="LocalPage"
value-ref="localAnchorHyperlinkProducerFactory"/>
<entry key="LocalAnchor"
value-ref="localAnchorHyperlinkProducerFactory"/>
</map>
</property>
@@ -1167,6 +1237,9 @@
<property name="tempFolderUri" value="/temp"/>
<property name="organizationsFolderUri" value="/organizations"/>
<property name="jdbcDriversFolderUri" value="/jdbc"/>
+
+ <property name="enableSaveToHostFS" value="false"/>
+
</bean>
<!-- report virtualizers -->
@@ -1231,8 +1304,8 @@
<!-- add a message catalog -->
<bean id="addMessageCatalog"
class="com.jaspersoft.jasperserver.api.common.util.spring.GenericBeanUpdaterDefinition">
<property name="order" value="10"/>
- <property name="beanName" value="messageSource"/>
- <property name="propertyName" value="basenames"/>
+ <property name="beanName" value="bundlePathsListCe"/>
+ <property name="propertyName" value="sourceList"/>
<property name="operation" value="append"/>
</bean>
diff --git a/server-customizations/WEB-INF/classes/jasperreports.properties
b/server-customizations/WEB-INF/classes/jasperreports.properties
index ae9ded9..8a4805a 100644
--- a/server-customizations/WEB-INF/classes/jasperreports.properties
+++ b/server-customizations/WEB-INF/classes/jasperreports.properties
@@ -51,12 +51,9 @@
#com.jaspersoft.jasperreports.export.html.type=xhtml
#com.jaspersoft.jasperreports.export.html.type=html
-# location of the web resources needed for the JR interactivy
-net.sf.jasperreports.web.resources.base.path=/reportresource?resource=
-
# date patterns for JR interactive components
#net.sf.jasperreports.components.date.pattern.key=date.format
#net.sf.jasperreports.components.calendar.date.pattern.key=calendar.date.format
-net.sf.jasperreports.web.report.resources.path=/reportresource
+net.sf.jasperreports.web.report.resources.path=/reportresource/reportresource
net.sf.jasperreports.web.request.parameter.resource.uri=resource
diff --git a/server-customizations/WEB-INF/decorators/decorator.jsp
b/server-customizations/WEB-INF/decorators/decorator.jsp
index e300bd7..7030889 100644
--- a/server-customizations/WEB-INF/decorators/decorator.jsp
+++ b/server-customizations/WEB-INF/decorators/decorator.jsp
@@ -50,8 +50,6 @@
-->
<%@ include file="decoratorCommonImports.jsp" %>
<decorator:head />
- <%--Online Help--%>
- <%@ include file="../jsp/modules/webHelp/webHelp.jsp" %>
</head>
<c:choose>
@@ -70,7 +68,7 @@
<div id="mainNavigation" class="menu horizontal primaryNav">
<ul id="navigationOptions" data-tab-index="2"
data-component-type="navigation">
<li id="main_home" tabIndex="-1" class="leaf"><p
class="wrap button"><span class="icon"></span><spring:message
code="menu.home"/></p></li>
- <c:if test="<%=
!com.jaspersoft.jasperserver.api.engine.common.service.impl.NavigationActionModelSupport.getInstance().banUserRole()
%>">
+ <c:if test='<%=
!((NavigationActionModelSupport)application.getAttribute("concreteNavigationActionModelSupport")).banUserRole()
%>'>
<li id="main_library" tabIndex="-1" class="leaf"><p
class="wrap button"><span class="icon"></span><spring:message
code="menu.library"/></p></li>
</c:if>
</ul>
@@ -157,7 +155,7 @@
<div id="mainNavigation" class="menu horizontal
primaryNav">
<ul id="navigationOptions" data-tab-index="2"
data-component-type="navigation">
<li id="main_home" tabIndex="-1"
class="leaf"><p class="wrap button"><span class="icon"></span><spring:message
code="menu.home"/></p></li>
- <c:if test="<%=
!com.jaspersoft.jasperserver.api.engine.common.service.impl.NavigationActionModelSupport.getInstance().banUserRole()
%>">
+ <c:if test='<%=
!((NavigationActionModelSupport)application.getAttribute("concreteNavigationActionModelSupport")).banUserRole()
%>'>
<li id="main_library" tabIndex="-1"
class="leaf"><p class="wrap button"><span class="icon"></span><spring:message
code="menu.library"/></p></li>
</c:if>
</ul>
diff --git a/server-customizations/WEB-INF/decorators/minimalDecorator.jsp
b/server-customizations/WEB-INF/decorators/minimalDecorator.jsp
index e350084..a104d95 100644
--- a/server-customizations/WEB-INF/decorators/minimalDecorator.jsp
+++ b/server-customizations/WEB-INF/decorators/minimalDecorator.jsp
@@ -53,7 +53,7 @@
<div id="mainNavigation" class="menu horizontal primaryNav">
<ul id="navigationOptions" data-tab-index="2"
data-component-type="navigation">
<li id="main_home" tabIndex="-1" class="leaf"><p class="wrap
button"><span class="icon"></span><spring:message code="menu.home"/></p></li>
- <c:if test="<%=
!com.jaspersoft.jasperserver.api.engine.common.service.impl.NavigationActionModelSupport.getInstance().banUserRole()
%>">
+ <c:if test='<%=
!((NavigationActionModelSupport)application.getAttribute("concreteNavigationActionModelSupport")).banUserRole()
%>'>
<li id="main_library" tabIndex="-1" class="leaf"><p
class="wrap button"><span class="icon"></span><spring:message
code="menu.library"/></p></li>
</c:if>
</ul>
@@ -69,8 +69,7 @@
<div id="systemMessageConsole" style="display:none;">
<p id="systemMessage"></p>
</div>
-
-<%--JavaScript which is common to all pages and requires JSTL access--%>
-<%@ include file="../jsp/modules/commonJSTLScripts.jsp" %>
+ <%--JavaScript which is common to all pages and requires JSTL access--%>
+ <%@ include file="../jsp/modules/commonJSTLScripts.jsp" %>
</body>
</html>
\ No newline at end of file
diff --git a/server-customizations/WEB-INF/web.xml
b/server-customizations/WEB-INF/web.xml
index c0dac0f..66dbeca 100644
--- a/server-customizations/WEB-INF/web.xml
+++ b/server-customizations/WEB-INF/web.xml
@@ -71,23 +71,37 @@
</listener>
<listener>
-
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+ <!-- SESSION REPLICATION -->
+ <!-- Replace the default spring listener with the Tolerant listener to
enable replication-->
+ <!--
listener-class>com.jaspersoft.jasperserver.core.util.TolerantRequestContextListener</listener-class-->
+
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener>
<listener>
<listener-class>org.springframework.security.ui.session.HttpSessionEventPublisher</listener-class>
</listener>
-
+
+ <!-- SSO - single sign out listener -->
+ <listener>
+
<listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
+ </listener>
+
<context-param>
<param-name>sessionPublishedBeans</param-name>
- <param-value>configurationBean,concreteHeartbeatBean</param-value>
+
<param-value>configurationBean,concreteHeartbeatBean,concreteNavigationActionModelSupport</param-value>
</context-param>
+ <!-- UNCOMMENT FOR SESSION REPLICATION -->
+ <!--filter>
+ <filter-name>ClusterFilter</filter-name>
+
<filter-class>com.jaspersoft.jasperserver.war.TolerantSessionFilter</filter-class>
+ </filter-->
+
<filter>
<filter-name>p3pFilter</filter-name>
<filter-class>com.jaspersoft.jasperserver.war.P3PFilter</filter-class>
</filter>
-
+
<filter>
<filter-name>characterEncodingProxyFilter</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
@@ -106,6 +120,16 @@
</init-param>
</filter>
+ <!-- SSO - single sign out filter -->
+ <filter>
+ <filter-name>CAS_Single_Sign_Out_Filter</filter-name>
+
<filter-class>org.jasig.cas.client.session.SingleSignOutFilter</filter-class>
+ <init-param>
+ <param-name>artifactParameterName</param-name>
+ <param-value>ticket</param-value>
+ </init-param>
+ </filter>
+
<filter>
<filter-name>securityFilter</filter-name>
<filter-class>org.springframework.security.util.FilterToBeanProxy</filter-class>
@@ -120,6 +144,14 @@
<filter-name>sitemesh</filter-name>
<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
</filter>
+
+ <!-- UNCOMMENT FOR SESSION REPLICATION -->
+ <!--filter-mapping>
+ <filter-name>ClusterFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <distributable/-->
+
<filter-mapping>
<filter-name>p3pFilter</filter-name>
@@ -136,6 +168,12 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <!-- SSO - single sign out filter mapping -->
+ <filter-mapping>
+ <filter-name>CAS_Single_Sign_Out_Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<filter-mapping>
<filter-name>securityFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -144,10 +182,10 @@
</filter-mapping>
<filter-mapping>
- <filter-name>sitemesh</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>ERROR</dispatcher>
- <dispatcher>FORWARD</dispatcher>
+ <filter-name>sitemesh</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
</filter-mapping>
<!-- Filter to help parse the file name and extension of uplaoded files-->
@@ -163,6 +201,7 @@
<filter>
<filter-name>JPivotController</filter-name>
+ <!--
<filter-class>com.jaspersoft.jasperserver.war.JPivotRequestFilter</filter-class>-->
<filter-class>com.tonbeller.wcf.controller.RequestFilter</filter-class>
<!-- to avoid double clicking problem in the OLAP view list
@@ -202,8 +241,12 @@
<filter-class>com.jaspersoft.jasperserver.war.StaticFilesCacheControlFilter</filter-class>
<init-param>
<param-name>urlEndsWith</param-name>
- <param-value>.js</param-value>
+ <param-value>.js .htm</param-value>
</init-param>
+ <!--<init-param>-->
+ <!--<param-name>urlStartsWith</param-name>-->
+ <!--<param-value>/rest_v2/bundles</param-value>-->
+ <!--</init-param>-->
<init-param>
<param-name>expiresAfterAccessInSecs</param-name>
<param-value>86400</param-value>
@@ -248,7 +291,10 @@
<servlet-name>jasperserver</servlet-name>
<url-pattern>/jrpxml/*</url-pattern>
</servlet-mapping>
-
+ <servlet-mapping>
+ <servlet-name>jasperserver</servlet-name>
+ <url-pattern>/bif/*</url-pattern>
+ </servlet-mapping>
<!--
<!– DWR support –>
<servlet>
@@ -391,6 +437,14 @@
<param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
<param-value>true</param-value>
</init-param>
+ <init-param>
+
<param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
+
<param-value>com.sun.jersey.api.container.filter.PostReplaceFilter</param-value>
+ </init-param>
+ <init-param>
+
<param-name>com.sun.jersey.config.property.WadlGeneratorConfig</param-name>
+
<param-value>com.jaspersoft.jasperserver.jaxrs.wadl.JasperServerWadlGeneratorConfig</param-value>
+ </init-param>
<!--Enable to log request/responces-->
<!--<init-param>-->
<!--<param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>-->
@@ -530,7 +584,7 @@
</security-constraint>
-->
- <context-param>
+ <context-param>
<param-name>Owasp.CsrfGuard.Config</param-name>
<param-value>WEB-INF/esapi/Owasp.CsrfGuard.properties</param-value>
</context-param>
@@ -539,7 +593,10 @@
<param-value>true</param-value>
</context-param>
<listener>
-
<listener-class>com.jaspersoft.jasperserver.api.security.JSCsrfGuardListener</listener-class>
+
<listener-class>org.owasp.csrfguard.CsrfGuardHttpSessionListener</listener-class>
+ </listener>
+ <listener>
+
<listener-class>org.owasp.csrfguard.CsrfGuardServletContextListener</listener-class>
</listener>
<servlet>
@@ -547,7 +604,7 @@
<servlet-class>com.jaspersoft.jasperserver.api.security.encryption.GetEncryptionKey</servlet-class>
</servlet>
- <servlet>
+ <servlet>
<servlet-name>JavaScriptServlet</servlet-name>
<servlet-class>org.owasp.csrfguard.servlet.JavaScriptServlet</servlet-class>
<init-param>
@@ -600,6 +657,6 @@
<extension>ico</extension>
<mime-type>image/x-icon</mime-type>
</mime-mapping>
-
+
</web-app>
--
To view, visit http://gerrit.ovirt.org/21236
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id055510466b857998e22076fa9bfd79f5d51425a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: ovirt-3.3.1
Gerrit-Owner: Yaniv Dary <yd...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
