[jboss-cvs] JBossAS SVN: r102830 - in projects/metadata/web/trunk/src/main: resources/dtd and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 23 18:04:10 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-03-23 18:04:09 -0400 (Tue, 23 Mar 2010)
New Revision: 102830
Added:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/ReplicationConfig60.java
Modified:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss60WebMetaData.java
projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_4_0.dtd
projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_4_2.dtd
projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_5_0.dtd
projects/metadata/web/trunk/src/main/resources/schema/jboss-web_5_1.xsd
projects/metadata/web/trunk/src/main/resources/schema/jboss-web_6_0.xsd
Log:
[JBMETA-274] Remove FIELD replication-granularity configuration
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss60WebMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss60WebMetaData.java 2010-03-23 21:10:17 UTC (rev 102829)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss60WebMetaData.java 2010-03-23 22:04:09 UTC (rev 102830)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.web.jboss;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
@@ -46,4 +47,20 @@
public class JBoss60WebMetaData extends JBossWebMetaData
{
private static final long serialVersionUID = 1;
+
+ // Use the AS 6 ReplicationConfig type
+ @XmlElement(name="replication-config", type=ReplicationConfig60.class)
+ @Override
+ public ReplicationConfig getReplicationConfig()
+ {
+ return super.getReplicationConfig();
+ }
+
+ @Override
+ public void setReplicationConfig(ReplicationConfig replicationConfig)
+ {
+ super.setReplicationConfig(replicationConfig);
+ }
+
+
}
Added: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/ReplicationConfig60.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/ReplicationConfig60.java (rev 0)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/ReplicationConfig60.java 2010-03-23 22:04:09 UTC (rev 102830)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.metadata.web.jboss;
+
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Overrides superclass to remove elements from XML binding, e.g.
+ * replicationFieldBatchMode.
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision$
+ */
+ at XmlType(name="replication-configType", propOrder={"cacheName", "replicationTrigger", "replicationGranularity",
+ "useJK", "maxUnreplicatedInterval", "snapshotMode", "snapshotInterval", "sessionNotificationPolicy"})
+public class ReplicationConfig60 extends ReplicationConfig
+{
+
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -4550670443463444120L;
+
+}
Modified: projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_4_0.dtd
===================================================================
--- projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_4_0.dtd 2010-03-23 21:10:17 UTC (rev 102829)
+++ projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_4_0.dtd 2010-03-23 22:04:09 UTC (rev 102830)
@@ -335,6 +335,12 @@
attributes in the session, plus some session data, like lastAccessTime. For sessions
carrying large amounts of data, parts of which are infrequently accessed,
this option can increase replication performance.
+
+ The third option is useful if the classes stored in the session have been bytecode
+ enhanced for use by JBoss PojoCache. If they have been, the session management layer
+ will detect field level changes within objects stored to the session, and will
+ replicate those changes. Note however, that the FIELD option has been removed
+ in JBoss AS 6.
Examples:
<replication-granularity>SESSION</replication-granularity>
Modified: projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_4_2.dtd
===================================================================
--- projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_4_2.dtd 2010-03-23 21:10:17 UTC (rev 102829)
+++ projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_4_2.dtd 2010-03-23 22:04:09 UTC (rev 102830)
@@ -342,6 +342,12 @@
attributes in the session, plus some session data, like lastAccessTime. For sessions
carrying large amounts of data, parts of which are infrequently accessed,
this option can increase replication performance.
+
+ The third option is useful if the classes stored in the session have been bytecode
+ enhanced for use by JBoss PojoCache. If they have been, the session management layer
+ will detect field level changes within objects stored to the session, and will
+ replicate those changes. Note however, that the FIELD option has been removed
+ in JBoss AS 6.
Examples:
<replication-granularity>SESSION</replication-granularity>
Modified: projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_5_0.dtd
===================================================================
--- projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_5_0.dtd 2010-03-23 21:10:17 UTC (rev 102829)
+++ projects/metadata/web/trunk/src/main/resources/dtd/jboss-web_5_0.dtd 2010-03-23 22:04:09 UTC (rev 102830)
@@ -420,7 +420,8 @@
The third option is useful if the classes stored in the session have been bytecode
enhanced for use by JBoss PojoCache. If they have been, the session management layer
will detect field level changes within objects stored to the session, and will
- replicate those changes.
+ replicate those changes. Note however, that the FIELD option has been removed
+ in JBoss AS 6.
Examples:
<replication-granularity>SESSION</replication-granularity>
Modified: projects/metadata/web/trunk/src/main/resources/schema/jboss-web_5_1.xsd
===================================================================
--- projects/metadata/web/trunk/src/main/resources/schema/jboss-web_5_1.xsd 2010-03-23 21:10:17 UTC (rev 102829)
+++ projects/metadata/web/trunk/src/main/resources/schema/jboss-web_5_1.xsd 2010-03-23 22:04:09 UTC (rev 102830)
@@ -320,7 +320,8 @@
The third option is useful if the classes stored in the session have been bytecode
enhanced for use by JBoss PojoCache. If they have been, the session management layer
will detect field level changes within objects stored to the session, and will
- replicate those changes.
+ replicate those changes. Note however, that the FIELD option has been removed
+ in JBoss AS 6.
Examples:
<replication-granularity>SESSION</replication-granularity>
Modified: projects/metadata/web/trunk/src/main/resources/schema/jboss-web_6_0.xsd
===================================================================
--- projects/metadata/web/trunk/src/main/resources/schema/jboss-web_6_0.xsd 2010-03-23 21:10:17 UTC (rev 102829)
+++ projects/metadata/web/trunk/src/main/resources/schema/jboss-web_6_0.xsd 2010-03-23 22:04:09 UTC (rev 102830)
@@ -223,7 +223,6 @@
<xsd:element name="cache-name" type="jboss:cache-nameType" minOccurs="0"/>
<xsd:element name="replication-trigger" type="jboss:replication-triggerType" minOccurs="0"/>
<xsd:element name="replication-granularity" type="jboss:replication-granularityType" minOccurs="0"/>
- <xsd:element name="replication-field-batch-mode" type="jboss:replication-field-batch-modeType" minOccurs="0"/>
<xsd:element name="use-jk" type="jboss:use-jkType" minOccurs="0"/>
<xsd:element name="max-unreplicated-interval" type="jboss:max-unreplicated-intervalType" minOccurs="0"/>
<xsd:element name="snapshot-mode" type="jboss:snapshot-modeType" minOccurs="0"/>
@@ -314,7 +313,6 @@
Possible values are:
1 - "SESSION" (default)
2 - "ATTRIBUTE"
- 3 - "FIELD"
The first option indicates that replication is done per session instance, i.e. when
the session is considered modified, the whole session object will be serialized
@@ -325,17 +323,13 @@
carrying large amounts of data, parts of which are infrequently accessed,
this option can increase replication performance.
- The third option is useful if the classes stored in the session have been bytecode
- enhanced for use by JBoss PojoCache. If they have been, the session management layer
- will detect field level changes within objects stored to the session, and will
- replicate those changes.
+ A third option, "FIELD" was available in AS 4.x and AS 5.x, but it
+ is not supported by AS 6.
Examples:
<replication-granularity>SESSION</replication-granularity>
or
<replication-granularity>ATTRIBUTE</replication-granularity>
- or
- <replication-granularity>FIELD</replication-granularity>
]]>
</xsd:documentation>
@@ -344,44 +338,10 @@
<xsd:restriction base="javaee:string">
<xsd:enumeration value="SESSION"/>
<xsd:enumeration value="ATTRIBUTE"/>
- <xsd:enumeration value="FIELD"/>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
- <xsd:complexType name="replication-field-batch-modeType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- Determine whether to batch the replication when the granularity level is set to FIELD.
- Default is true.
-
- If this is set to 'true', that means we will replicate the pojo changes only during the
- http request is finished. To use this, the JBossCacheAop transaction manager class will
- need to be configured as BatchModeTransactionManager such that a user can still have
- UserTransaction inside the http request. However, note that the cache will not particiapte
- in the UserTransaction in this case.
-
- If you want cache to participate in the UserTransaction, you can configure the transaction
- manager class to JBossTransactionManager and set this option to 'false'. The result is for
- those session attribute changes that are not under transaction will replicate instantaneously,
- while those particiate under transaction will replicate only when the transaction is
- completed.
-
- Examples:
- <replication-field-batch-mode>TRUE</replication-field-batch-mode>
- or
- <replication-field-batch-mode>FALSE</replication-field-batch-mode>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="javaee:generic-booleanType"/>
- </xsd:simpleContent>
- </xsd:complexType>
-
<xsd:complexType name="use-jkType">
<xsd:annotation>
<xsd:documentation>
More information about the jboss-cvs-commits
mailing list