[infinispan-commits] Infinispan SVN: r369 - in trunk/core/src: main/java/org/infinispan/config/parsing and 6 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Jun 2 07:00:50 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-06-02 07:00:50 -0400 (Tue, 02 Jun 2009)
New Revision: 369
Modified:
trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java
trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
trunk/core/src/main/resources/config-samples/all.xml
trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd
trunk/core/src/main/resources/xslt/jbc3x2infinispan4x.xslt
trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java
trunk/core/src/test/java/org/infinispan/config/parsing/Jbc2InfinispanTransformerTest.java
trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
trunk/core/src/test/resources/configs/named-cache-test.xml
Log:
Removed unused cfg options
Modified: trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java 2009-06-02 11:00:50 UTC (rev 369)
@@ -41,8 +41,6 @@
private String replicationQueueScheduledExecutorFactoryClass = DefaultScheduledExecutorFactory.class.getName();
private TypedProperties replicationQueueScheduledExecutorProperties = EMPTY_PROPERTIES;
private String marshallerClass = VersionAwareMarshaller.class.getName(); // the default
- private int objectInputStreamPoolSize = 50; // defaults
- private int objectOutputStreamPoolSize = 50; // defaults
private String transportClass = null; // this defaults to a non-clustered cache.
private TypedProperties transportProperties = EMPTY_PROPERTIES;
private Configuration defaultConfiguration;
@@ -173,24 +171,6 @@
this.marshallerClass = marshallerClass;
}
- public int getObjectInputStreamPoolSize() {
- return objectInputStreamPoolSize;
- }
-
- public void setObjectInputStreamPoolSize(int objectInputStreamPoolSize) {
- testImmutability("objectInputStreamPoolSize");
- this.objectInputStreamPoolSize = objectInputStreamPoolSize;
- }
-
- public int getObjectOutputStreamPoolSize() {
- return objectOutputStreamPoolSize;
- }
-
- public void setObjectOutputStreamPoolSize(int objectOutputStreamPoolSize) {
- testImmutability("objectOutputStreamPoolSize");
- this.objectOutputStreamPoolSize = objectOutputStreamPoolSize;
- }
-
public String getTransportClass() {
return transportClass;
}
@@ -342,8 +322,6 @@
GlobalConfiguration that = (GlobalConfiguration) o;
- if (objectInputStreamPoolSize != that.objectInputStreamPoolSize) return false;
- if (objectOutputStreamPoolSize != that.objectOutputStreamPoolSize) return false;
if (marshallVersion != that.marshallVersion) return false;
if (asyncListenerExecutorFactoryClass != null ? !asyncListenerExecutorFactoryClass.equals(that.asyncListenerExecutorFactoryClass) : that.asyncListenerExecutorFactoryClass != null)
return false;
@@ -387,8 +365,6 @@
result = 31 * result + (replicationQueueScheduledExecutorFactoryClass != null ? replicationQueueScheduledExecutorFactoryClass.hashCode() : 0);
result = 31 * result + (replicationQueueScheduledExecutorProperties != null ? replicationQueueScheduledExecutorProperties.hashCode() : 0);
result = 31 * result + (marshallerClass != null ? marshallerClass.hashCode() : 0);
- result = 31 * result + objectInputStreamPoolSize;
- result = 31 * result + objectOutputStreamPoolSize;
result = 31 * result + (transportClass != null ? transportClass.hashCode() : 0);
result = 31 * result + (transportProperties != null ? transportProperties.hashCode() : 0);
result = 31 * result + (defaultConfiguration != null ? defaultConfiguration.hashCode() : 0);
Modified: trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java 2009-06-02 11:00:50 UTC (rev 369)
@@ -404,12 +404,6 @@
tmp = getAttributeValue(e, "version");
if (existsAttribute(tmp)) configuration.setMarshallVersion(tmp);
-
- tmp = getAttributeValue(e, "objectInputStreamPoolSize");
- if (existsAttribute(tmp)) configuration.setObjectInputStreamPoolSize(getInt(tmp));
-
- tmp = getAttributeValue(e, "objectOutputStreamPoolSize");
- if (existsAttribute(tmp)) configuration.setObjectOutputStreamPoolSize(getInt(tmp));
}
}
Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2009-06-02 11:00:50 UTC (rev 369)
@@ -269,7 +269,7 @@
public Address getAddress() {
if (address == null && channel != null) {
- address = new JGroupsAddress(channel.getLocalAddress());
+ address = new JGroupsAddress(channel.getAddress());
}
return address;
}
Modified: trunk/core/src/main/resources/config-samples/all.xml
===================================================================
--- trunk/core/src/main/resources/config-samples/all.xml 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/main/resources/config-samples/all.xml 2009-06-02 11:00:50 UTC (rev 369)
@@ -43,8 +43,7 @@
</transport>
<!-- Again, sensible defaults are used here if this is omitted. -->
- <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"
- objectInputStreamPoolSize="100" objectOutputStreamPoolSize="100"/>
+ <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
<!--
Used to register JVM shutdown hooks.
Modified: trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd
===================================================================
--- trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd 2009-06-02 11:00:50 UTC (rev 369)
@@ -30,8 +30,6 @@
</xs:complexType>
<xs:complexType name="sharedSerializationType">
- <xs:attribute name="objectInputStreamPoolSize" type="tns:positiveNumber"/>
- <xs:attribute name="objectOutputStreamPoolSize" type="tns:positiveNumber"/>
<xs:attribute name="version" type="xs:string"/>
<xs:attribute name="marshallerClass" type="xs:string"/>
</xs:complexType>
Modified: trunk/core/src/main/resources/xslt/jbc3x2infinispan4x.xslt
===================================================================
--- trunk/core/src/main/resources/xslt/jbc3x2infinispan4x.xslt 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/main/resources/xslt/jbc3x2infinispan4x.xslt 2009-06-02 11:00:50 UTC (rev 369)
@@ -95,22 +95,6 @@
</xsl:element>
-
- <xsl:element name="serialization">
- <xsl:attribute name="marshallerClass">org.infinispan.marshall.VersionAwareMarshaller</xsl:attribute>
- <xsl:attribute name="version">1.0</xsl:attribute>
- <xsl:if test="serialization[@objectInputStreamPoolSize]">
- <xsl:attribute name="objectInputStreamPoolSize">
- <xsl:value-of select="serialization/@objectInputStreamPoolSize"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="serialization[@objectOutputStreamPoolSize]">
- <xsl:attribute name="objectOutputStreamPoolSize">
- <xsl:value-of select="serialization/@objectOutputStreamPoolSize"/>
- </xsl:attribute>
- </xsl:if>
- </xsl:element>
-
<xsl:if test="shutdown[@hookBehavior]">
<xsl:element name="shutdown">
<xsl:attribute name="hookBehavior">
@@ -154,7 +138,6 @@
<xsl:if
test="not(starts-with(transaction/@transactionManagerLookupClass,'org.jboss.cache'))">
<xsl:message terminate="no">WARNING! Custom 'transactionManagerLookupClass' is being used. This cannot be automatically transformed.</xsl:message>
- <!-- TODO Custom 'transactionManagerLookupClass' is being used. This cannot be automatically transformed. -->
</xsl:if>
<xsl:attribute name="transactionManagerLookupClass">
<xsl:value-of
Modified: trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java 2009-06-02 11:00:50 UTC (rev 369)
@@ -1,6 +1,6 @@
package org.infinispan.config.parsing;
- import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.config.GlobalConfiguration;
import org.infinispan.executors.DefaultExecutorFactory;
import org.infinispan.executors.DefaultScheduledExecutorFactory;
import org.infinispan.marshall.VersionAwareMarshaller;
@@ -77,8 +77,7 @@
public void testMarshalling() throws Exception {
XmlConfigurationParserImpl parser = new XmlConfigurationParserImpl();
- String xml = "<serialization marshallerClass=\"org.infinispan.marshall.jboss.JBossMarshaller\" version=\"9.2\"\n" +
- " objectInputStreamPoolSize=\"100\" objectOutputStreamPoolSize=\"100\"/>";
+ String xml = "<serialization marshallerClass=\"org.infinispan.marshall.jboss.JBossMarshaller\" version=\"9.2\" />";
Element e = XmlConfigHelper.stringToElement(xml);
GlobalConfiguration gc = new GlobalConfiguration();
@@ -86,8 +85,6 @@
assert gc.getMarshallerClass().equals(JBossMarshaller.class.getName());
assert gc.getMarshallVersionString().equals("9.2");
- assert gc.getObjectInputStreamPoolSize() == 100;
- assert gc.getObjectOutputStreamPoolSize() == 100;
}
public void testMarshallingDefaults() throws Exception {
@@ -100,8 +97,6 @@
assert gc.getMarshallerClass().equals(VersionAwareMarshaller.class.getName());
assert gc.getMarshallVersionString().equals("4.0");
- assert gc.getObjectInputStreamPoolSize() == 50;
- assert gc.getObjectOutputStreamPoolSize() == 50;
}
public void testAsyncListenerExecutor() throws Exception {
Modified: trunk/core/src/test/java/org/infinispan/config/parsing/Jbc2InfinispanTransformerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/Jbc2InfinispanTransformerTest.java 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/Jbc2InfinispanTransformerTest.java 2009-06-02 11:00:50 UTC (rev 369)
@@ -56,8 +56,6 @@
assert globalConfig.getAsyncListenerExecutorProperties().get("maxThreads").equals("123");
assert globalConfig.getAsyncListenerExecutorProperties().get("queueSize").equals("1020000");
assert !defaultConfig.isInvocationBatchingEnabled();
- assert globalConfig.getObjectInputStreamPoolSize() == 12;
- assert globalConfig.getObjectOutputStreamPoolSize() == 14;
assert globalConfig.getMarshallerClass().equals(VersionAwareMarshaller.class.getName());
assert defaultConfig.isUseLazyDeserialization();
assert globalConfig.getClusterName().equals("JBossCache-cluster");
@@ -113,7 +111,7 @@
Thread.currentThread().setContextClassLoader(delegatingCl);
String[] testFiles = {"buddy-replication.xml", "cacheloader-enabled.xml", "eviction-enabled.xml",
"external-jgroups-file.xml",
- "invalidation-async.xml","total-replication.xml"};
+ "invalidation-async.xml", "total-replication.xml"};
for (String name : testFiles) {
String fileName = getFileName(name);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified: trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java 2009-06-02 11:00:50 UTC (rev 369)
@@ -38,8 +38,6 @@
assert gc.getMarshallerClass().equals("org.infinispan.marshall.VersionAwareMarshaller");
assert gc.getMarshallVersionString().equals("1.0");
- assert gc.getObjectOutputStreamPoolSize() == 100;
- assert gc.getObjectInputStreamPoolSize() == 100;
Configuration defaultConfiguration = parser.parseDefaultConfiguration();
Modified: trunk/core/src/test/resources/configs/named-cache-test.xml
===================================================================
--- trunk/core/src/test/resources/configs/named-cache-test.xml 2009-06-02 10:43:38 UTC (rev 368)
+++ trunk/core/src/test/resources/configs/named-cache-test.xml 2009-06-02 11:00:50 UTC (rev 369)
@@ -23,8 +23,7 @@
<transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport"/>
- <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"
- objectInputStreamPoolSize="100" objectOutputStreamPoolSize="100"/>
+ <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
<globalJmxStatistics enabled="false" jmxDomain="funky_domain"
mBeanServerLookup="org.infinispan.jmx.PerThreadMBeanServerLookup"
allowDuplicateDomains="true"/>
More information about the infinispan-commits
mailing list