[jboss-cvs] JBossAS SVN: r74548 - in projects/metadata/trunk/src: main/resources/dtd and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 13 15:21:15 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-06-13 15:21:15 -0400 (Fri, 13 Jun 2008)
New Revision: 74548
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/PassivationConfig.java
projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml
Log:
[JBMETA-54] Remove FIELD granularity pojo passivation configs from jboss-web.xml
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/PassivationConfig.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/PassivationConfig.java 2008-06-13 18:40:18 UTC (rev 74547)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/PassivationConfig.java 2008-06-13 19:21:15 UTC (rev 74548)
@@ -40,10 +40,6 @@
private Integer passivationMinIdleTime;
private Integer passivationMaxIdleTime;
-
- private Integer maxObjects;
-
- private Integer objectMaxIdleTime;
/**
* Gets the max time (seconds) the session must be idle after which it's
@@ -98,69 +94,5 @@
{
this.useSessionPassivation = useSessionPassivation;
}
-
- /**
- * Gets the maximum number of cached {@link ReplicationGranularity.FIELD}
- * session attribute objects before the session management
- * layer should begin passivating them to persistent storage.
- *
- * @return the maximum number of objects, or <code>null</code>
- */
- public Integer getMaxObjects()
- {
- return maxObjects;
- }
-
- /**
- * Sets the maximum number of cached {@link ReplicationGranularity.FIELD}
- * session attribute objects before the session management
- * layer should begin passivating them to persistent storage.
- *
- * @param maxObjects the maximum number of objects. Note that if a complex
- * object graph is passed to setAttribute(), the number of
- * cached objects is increased by the number of objects in
- * the graph, not by 1. Primitive objects
- * (i.e. java.lang.String, java.lang.Number) included
- * within a complex object graph do not increase the total.
- * If set to <code>null</code> or a value less than one,
- * the number of objects is not considered.
- */
- public void setMaxObjects(Integer maxObjects)
- {
- this.maxObjects = maxObjects;
- }
-
- /**
- * Gets the maximum time (in seconds) cached
- * {@link ReplicationGranularity.FIELD} session
- * attribute objects can remain unaccessed before the session management
- * layer should begin passivating them to persistent storage. Only
- * relevant if {@link ReplicationGranularity.FIELD} is used.
- *
- * @return the maximum idle time, or <code>null</code>. A value less than
- * <code>1</code> means object idle time should not be considered.
- */
- public Integer getObjectMaxIdleTime()
- {
- return objectMaxIdleTime;
- }
-
- /**
- * Sets the maximum time (in seconds) cached
- * {@link ReplicationGranularity.FIELD} session
- * attribute objects can remain unaccessed before the session management
- * layer should begin passivating them to persistent storage. Only
- * relevant if {@link ReplicationGranularity.FIELD} is used.
- *
- * @param objectIdleTime the maximum idle time. A value of <code>null</code>
- * or less than <code>1</code> means object idle time
- * should not be considered.
- */
- public void setObjectMaxIdleTime(Integer objectMaxIdleTime)
- {
- this.objectMaxIdleTime = objectMaxIdleTime;
- }
-
-
}
Modified: projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd 2008-06-13 18:40:18 UTC (rev 74547)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd 2008-06-13 19:21:15 UTC (rev 74548)
@@ -304,7 +304,7 @@
<!--
Clustering only: HTTP Session passivation configuration. (optional tags)
-->
-<!ELEMENT passivation-config (use-session-passivation?, passivation-min-idle-time, passivation-max-idle-time, max-objects?, object-max-idle-time?)>
+<!ELEMENT passivation-config (use-session-passivation?, passivation-min-idle-time, passivation-max-idle-time)>
<!--
Clustering only: Determines whether the web application should use session passivation or not
@@ -344,59 +344,18 @@
-->
<!ELEMENT passivation-max-idle-time (#PCDATA)>
-<!-- Clustering only, and only if replication-granularity is FIELD:
- Determines the maximum number of cached session attribute objects
- (i.e. objects stored in the webapp's sessions by calling
- HttpSession.setAttribute(String, Object)) before the session management
- layer should begin passivating objects to persistent storage. Objects
- are passivated using an LRU algorithm. Note that if a complex object graph
- is passed to setAttribute(), the number of cached objects is increased by
- the number of objects in the graph, not by 1. Primitive objects
- (i.e. java.lang.String, java.lang.Number) included within a complex object
- graph do not increase the total.
-
- FIELD replication granularity supports sharing references to objects
- between sessions. As a result, passivation of objects stored in a session
- is not done when the session itself is passivated. Instead, with FIELD
- replication granularity, passivation of session objects is controlled via
- this element and the object-max-idle-time element.
-
- A value of less than 1 disables passivation of session attribute objects
- based on the number of objects. The default is -1.
--->
-<!ELEMENT max-objects (#PCDATA)>
-
-<!-- Clustering only, and only if replication-granularity is FIELD:
- Determines the maximum time (in seconds) cached session attribute objects
- (i.e. objects stored in the webapp's sessions by calling
- HttpSession.setAttribute(String, Object)) can remain unaccessed before the
- session management layer should begin passivating them to persistent storage.
- Objects are passivated using an LRU algorithm.
-
- FIELD replication granularity supports sharing references to objects
- between sessions. As a result, passivation of objects stored in a session
- is not done when the session itself is passivated. Instead, with FIELD
- replication granularity, passivation of session objects is controlled via
- this element and the max-objects element.
-
- A value of less than 1 disables passivation of session attribute objects
- based on idle time. The default is -1.
--->
-<!ELEMENT object-max-idle-time (#PCDATA)>
-
<!--
HTTP Session clustering configuration (optional tags)
-->
<!ELEMENT replication-config (cache-name?, replication-trigger?, replication-granularity, replication-field-batch-mode?, use-jk?, snapshot-mode?, snapshot-interval?)>
<!--
- Clustering only: ObjectName of the PojoCacheJmxWrapper instance that should
- be used for storing distributable sessions and replicating them around the
+ Clustering only: Name of the JBoss Cache or PojoCache configuration that
+ should be used for storing distributable sessions and replicating them around the
cluster.
Default value if not explicitly set is the overall web container default
- as set in the deployers/jbossweb.deployer service. By default that is set
- to "jboss.cache:service=TomcatClusteringCache".
+ as set in the deployers/jbossweb.deployer service.
-->
<!ELEMENT cache-name (#PCDATA)>
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java 2008-06-13 18:40:18 UTC (rev 74547)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java 2008-06-13 19:21:15 UTC (rev 74548)
@@ -90,10 +90,6 @@
assertEquals(2, passConfig.getPassivationMinIdleTime().intValue());
assertNotNull(passConfig.getPassivationMaxIdleTime());
assertEquals(5, passConfig.getPassivationMaxIdleTime().intValue());
- assertNotNull(passConfig.getMaxObjects());
- assertEquals(2, passConfig.getMaxObjects().intValue());
- assertNotNull(passConfig.getObjectMaxIdleTime());
- assertEquals(5, passConfig.getObjectMaxIdleTime().intValue());
}
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml 2008-06-13 18:40:18 UTC (rev 74547)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml 2008-06-13 19:21:15 UTC (rev 74548)
@@ -20,8 +20,6 @@
<use-session-passivation>true</use-session-passivation>
<passivation-min-idle-time>2</passivation-min-idle-time>
<passivation-max-idle-time>5</passivation-max-idle-time>
- <max-objects>2</max-objects>
- <object-max-idle-time>5</object-max-idle-time>
</passivation-config>
</jboss-web>
More information about the jboss-cvs-commits
mailing list