Ignite-67 GridWebSessionFilter properties fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ebcf9c04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ebcf9c04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ebcf9c04 Branch: refs/heads/ignite-67 Commit: ebcf9c04aad5b5cb32d13ef97d885f22be8c2d9d Parents: adf3908 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 16:34:39 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 16:34:39 2015 +0300 ---------------------------------------------------------------------- examples/config/servlet/WEB-INF/web.xml | 2 +- .../cache/websession/GridWebSessionFilter.java | 24 +++++++++----------- .../GridServletContextListenerStartup.java | 10 ++++---- .../internal/websession/WebSessionSelfTest.java | 8 +++---- .../websession/WebSessionServerStart.java | 2 +- 5 files changed, 21 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebcf9c04/examples/config/servlet/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/examples/config/servlet/WEB-INF/web.xml b/examples/config/servlet/WEB-INF/web.xml index 603f74b..12b3c37 100644 --- a/examples/config/servlet/WEB-INF/web.xml +++ b/examples/config/servlet/WEB-INF/web.xml @@ -26,7 +26,7 @@ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; version="3.0"> <context-param> - <param-name>GridGainConfigurationFilePath</param-name> + <param-name>IgniteConfigurationFilePath</param-name> <param-value>config/default-config.xml</param-value> </context-param> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebcf9c04/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java index 6839380..282dd7d 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java @@ -28,8 +28,6 @@ import javax.cache.*; import javax.cache.expiry.*; import javax.servlet.*; import javax.servlet.http.*; -import java.io.*; -import java.util.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; @@ -80,17 +78,17 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; * <th>Default</th> * </tr> * <tr> - * <td>GridGainWebSessionsGridName</td> + * <td>IgniteWebSessionsGridName</td> * <td>Name of the grid that contains cache for web session storage.</td> * <td>{@code null} (default grid)</td> * </tr> * <tr> - * <td>GridGainWebSessionsCacheName</td> + * <td>IgniteWebSessionsCacheName</td> * <td>Name of the cache for web session storage.</td> * <td>{@code null} (default cache)</td> * </tr> * <tr> - * <td>GridGainWebSessionsMaximumRetriesOnFail</td> + * <td>IgniteWebSessionsMaximumRetriesOnFail</td> * <td> * Valid for {@code ATOMIC} caches only. Maximum number of retries for session updates in case * node leaves topology and update fails. If retry is enabled, @@ -109,17 +107,17 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; * <filter-name>GridGainWebSessionsFilter</filter-name> * <filter-class>org.apache.ignite.cache.websession.GridWebSessionFilter</filter-class> * <init-param> - * <param-name>GridGainWebSessionsGridName</param-name> + * <param-name>IgniteWebSessionsGridName</param-name> * <param-value>WebGrid</param-value> * </init-param> * <init-param> - * <param-name>GridGainWebSessionsCacheName</param-name> + * <param-name>IgniteWebSessionsCacheName</param-name> * <param-value>WebCache</param-value> * </init-param> * * <!-- Valid for ATOMIC caches only. --> * <init-param> - * <param-name>GridGainWebSessionsMaximumRetriesOnFail</param-name> + * <param-name>IgniteWebSessionsMaximumRetriesOnFail</param-name> * <param-value>10</param-value> * </init-param> * </filter> @@ -139,13 +137,13 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridWebSessionFilter implements Filter { /** Web sessions caching grid name parameter name. */ - public static final String WEB_SES_GRID_NAME_PARAM = "GridGainWebSessionsGridName"; + public static final String WEB_SES_NAME_PARAM = "IgniteWebSessionsGridName"; /** Web sessions caching cache name parameter name. */ - public static final String WEB_SES_CACHE_NAME_PARAM = "GridGainWebSessionsCacheName"; + public static final String WEB_SES_CACHE_NAME_PARAM = "IgniteWebSessionsCacheName"; /** Web sessions caching retry on fail parameter name (valid for ATOMIC */ - public static final String WEB_SES_MAX_RETRIES_ON_FAIL_NAME_PARAM = "GridGainWebSessionsMaximumRetriesOnFail"; + public static final String WEB_SES_MAX_RETRIES_ON_FAIL_NAME_PARAM = "IgniteWebSessionsMaximumRetriesOnFail"; /** Default retry on fail flag value. */ public static final int DFLT_MAX_RETRIES_ON_FAIL = 3; @@ -176,8 +174,8 @@ public class GridWebSessionFilter implements Filter { ctx = cfg.getServletContext(); String gridName = U.firstNotNull( - cfg.getInitParameter(WEB_SES_GRID_NAME_PARAM), - ctx.getInitParameter(WEB_SES_GRID_NAME_PARAM)); + cfg.getInitParameter(WEB_SES_NAME_PARAM), + ctx.getInitParameter(WEB_SES_NAME_PARAM)); String cacheName = U.firstNotNull( cfg.getInitParameter(WEB_SES_CACHE_NAME_PARAM), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebcf9c04/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java index 69c294c..0945fad 100644 --- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java +++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java @@ -26,8 +26,6 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import javax.servlet.*; -import java.net.*; -import java.util.*; /** * This class defines GridGain startup based on servlet context listener. @@ -40,7 +38,7 @@ import java.util.*; * </listener> * * <context-param> - * <param-name>GridGainConfigurationFilePath</param-name> + * <param-name>IgniteConfigurationFilePath</param-name> * <param-value>config/default-config.xml</param-value> * </context-param> * </pre> @@ -70,7 +68,7 @@ import java.util.*; * </listener> * * <context-param> - * <param-name>GridGainConfigurationFilePath</param-name> + * <param-name>IgniteConfigurationFilePath</param-name> * <param-value>config/default-config.xml</param-value> * </context-param> * </pre> @@ -86,7 +84,7 @@ import java.util.*; */ public class GridServletContextListenerStartup implements ServletContextListener { /** Configuration file path parameter name. */ - public static final String GRIDGAIN_CFG_FILE_PATH_PARAM = "GridGainConfigurationFilePath"; + public static final String IGNITE_CFG_FILE_PATH_PARAM = "IgniteConfigurationFilePath"; /** Names of started grids. */ private final Collection<String> gridNames = new ArrayList<>(); @@ -95,7 +93,7 @@ public class GridServletContextListenerStartup implements ServletContextListener @Override public void contextInitialized(ServletContextEvent evt) { ServletContext ctx = evt.getServletContext(); - String cfgFile = ctx.getInitParameter(GRIDGAIN_CFG_FILE_PATH_PARAM); + String cfgFile = ctx.getInitParameter(IGNITE_CFG_FILE_PATH_PARAM); Collection<IgniteConfiguration> cfgs; GridSpringResourceContext rsrcCtx = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebcf9c04/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java index 7b99774..845a95a 100644 --- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java @@ -224,10 +224,10 @@ public class WebSessionSelfTest extends GridCommonAbstractTest { WebAppContext ctx = new WebAppContext(U.resolveGridGainPath("modules/core/src/test/webapp").getAbsolutePath(), "/ggtest"); - ctx.setInitParameter("GridGainConfigurationFilePath", cfg); - ctx.setInitParameter("GridGainWebSessionsGridName", gridName); - ctx.setInitParameter("GridGainWebSessionsCacheName", getCacheName()); - ctx.setInitParameter("GridGainWebSessionsMaximumRetriesOnFail", "100"); + ctx.setInitParameter("IgniteConfigurationFilePath", cfg); + ctx.setInitParameter("IgniteWebSessionsGridName", gridName); + ctx.setInitParameter("IgniteWebSessionsCacheName", getCacheName()); + ctx.setInitParameter("IgniteWebSessionsMaximumRetriesOnFail", "100"); ctx.addServlet(new ServletHolder(servlet), "/*"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebcf9c04/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java index 0e04844..f30c345 100644 --- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java @@ -56,7 +56,7 @@ public class WebSessionServerStart { "/ggtest"); ctx.setInitParameter("cfgFilePath", "/examples/config/spring-cache.xml"); - ctx.setInitParameter("GridGainWebSessionsCacheName", "partitioned"); + ctx.setInitParameter("IgniteWebSessionsCacheName", "partitioned"); ctx.addServlet(new ServletHolder(servlet), "/*");
