Author: jason.greene(a)jboss.com Date: 2008-10-29 15:35:43 -0400 (Wed, 29 Oct 2008) New Revision: 7030 Modified: pojo/trunk/pom.xml pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java Log: Fix PCACHE-77 JMX/Parsing updates that get all tests passing Modified: pojo/trunk/pom.xml =================================================================== --- pojo/trunk/pom.xml 2008-10-29 19:06:26 UTC (rev 7029) +++ pojo/trunk/pom.xml 2008-10-29 19:35:43 UTC (rev 7030) @@ -6,7 +6,7 @@ <properties> <jbosscache-pojo-version>3.0.0-SNAPSHOT</jbosscache-pojo-version> <jbosscache-core-version>3.0.0-SNAPSHOT</jbosscache-core-version> - <jboss.aop.version>2.0.0.CR15</jboss.aop.version> + <jboss.aop.version>2.0.0.GA</jboss.aop.version> </properties> <parent> <groupId>org.jboss.cache</groupId> Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java 2008-10-29 19:06:26 UTC (rev 7029) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java 2008-10-29 19:35:43 UTC (rev 7030) @@ -125,9 +125,9 @@ { pCache_.attach(fqn_, value, field.getName(), target); } + + util_.inMemorySubstitution(target, field, value); } - - util_.inMemorySubstitution(target, field, value); } else if (invocation instanceof FieldReadInvocation) { Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java 2008-10-29 19:06:26 UTC (rev 7029) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java 2008-10-29 19:35:43 UTC (rev 7030) @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.Iterator; +import java.util.Properties; import java.util.Set; import javax.management.AttributeChangeNotification; @@ -41,13 +42,18 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.CacheException; import org.jboss.cache.CacheStatus; +import org.jboss.cache.buddyreplication.NextMemberBuddyLocator; import org.jboss.cache.config.BuddyReplicationConfig; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.ConfigurationException; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.RuntimeConfig; +import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig; +import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; import org.jboss.cache.config.parsing.JGroupsStackParser; +import org.jboss.cache.config.parsing.XmlConfigHelper; +import org.jboss.cache.config.parsing.XmlConfigurationParser2x; import org.jboss.cache.config.parsing.element.BuddyElementParser; import org.jboss.cache.config.parsing.element.EvictionElementParser; import org.jboss.cache.config.parsing.element.LoadersElementParser; @@ -62,6 +68,8 @@ import org.jgroups.ChannelFactory; import org.jgroups.jmx.JChannelFactoryMBean; import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; @@ -489,7 +497,7 @@ BuddyReplicationConfig brc = null; if (config != null) { - brc = buddyElementParser.parseBuddyElement(config); + brc = XmlConfigurationParser2x.parseBuddyReplicationConfig(config); } getConfiguration().setBuddyReplicationConfig(brc); this.buddyReplConfig = config; @@ -500,7 +508,7 @@ CacheLoaderConfig clc = null; if (cache_loader_config != null) { - clc = loadersElementParser.parseLoadersElement(cache_loader_config); + clc = XmlConfigurationParser2x.parseCacheLoaderConfig(cache_loader_config); } getConfiguration().setCacheLoaderConfig(clc); this.cacheLoaderConfig = cache_loader_config; @@ -550,7 +558,7 @@ EvictionConfig ec = null; if (config != null) { - ec = evictionElementParser.parseEvictionElement(config); + ec = XmlConfigurationParser2x.parseEvictionConfig(config); } getConfiguration().setEvictionConfig(ec); this.evictionConfig = config; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java 2008-10-29 19:06:26 UTC (rev 7029) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java 2008-10-29 19:35:43 UTC (rev 7030) @@ -46,10 +46,16 @@ import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.config.parsing.XmlConfigHelper; +import org.jboss.cache.eviction.FIFOAlgorithm; +import org.jboss.cache.eviction.FIFOAlgorithmConfig; import org.jboss.cache.eviction.FIFOConfiguration; import org.jboss.cache.eviction.FIFOPolicy; +import org.jboss.cache.eviction.LRUAlgorithm; +import org.jboss.cache.eviction.LRUAlgorithmConfig; import org.jboss.cache.eviction.LRUConfiguration; import org.jboss.cache.eviction.LRUPolicy; +import org.jboss.cache.eviction.MRUAlgorithm; +import org.jboss.cache.eviction.MRUAlgorithmConfig; import org.jboss.cache.eviction.MRUConfiguration; import org.jboss.cache.eviction.MRUPolicy; import org.jboss.cache.loader.FileCacheLoader; @@ -181,37 +187,33 @@ assertEquals("EvictionPolicyConfig", getEvictionPolicyConfig().toString(), wrapper.getEvictionPolicyConfig().toString()); EvictionConfig ec = c.getEvictionConfig(); - //assertEquals("EC queue size", 20000, ec.getDefaultEventQueueSize()); assertEquals("EC wakeup", 5, ec.getWakeupIntervalSeconds()); - assertEquals("EC default pol", LRUPolicy.class.getName(), ec.getDefaultEvictionPolicyClass()); - List<EvictionRegionConfig> ercs = ec.getEvictionRegionConfigs(); + //assertEquals("EC default pol", LRUPolicy.class.getName(), ec.getDefaultEvictionPolicyClass()); + assertEquals("EvictionPolicyConfig", getEvictionPolicyConfig().toString(), wrapper.getEvictionPolicyConfig().toString()); + EvictionConfig ec1 = c.getEvictionConfig(); + assertEquals("EC queue size", 1000, ec1.getDefaultEvictionRegionConfig().getEventQueueSize()); + assertEquals("EC wakeup", 5000, ec1.getWakeupInterval()); + assertEquals("EC default pol", LRUAlgorithm.class.getName(), ec1.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig().getEvictionAlgorithmClassName()); + List<EvictionRegionConfig> ercs = ec1.getEvictionRegionConfigs(); EvictionRegionConfig erc = ercs.get(0); - assertEquals("ERC0 name", "/_default_", erc.getRegionName()); - assertEquals("ERC0 queue size", 1000, erc.getEventQueueSize()); - LRUConfiguration lru = (LRUConfiguration) erc.getEvictionPolicyConfig(); - assertEquals("EPC0 pol", LRUPolicy.class.getName(), lru.getEvictionPolicyClass()); - assertEquals("EPC0 maxnodes", 5000, lru.getMaxNodes()); - assertEquals("EPC0 ttl", 1000, lru.getTimeToLiveSeconds()); - erc = ercs.get(1); assertEquals("ERC1 name", "/org/jboss/data", erc.getRegionName()); assertEquals("ERC1 queue size", 20000, erc.getEventQueueSize()); - FIFOConfiguration fifo = (FIFOConfiguration) erc.getEvictionPolicyConfig(); - assertEquals("EPC1 pol", FIFOPolicy.class.getName(), fifo.getEvictionPolicyClass()); + FIFOAlgorithmConfig fifo = (FIFOAlgorithmConfig) erc.getEvictionAlgorithmConfig(); + assertEquals("EPC1 pol", FIFOAlgorithm.class.getName(), fifo.getEvictionAlgorithmClassName()); assertEquals("EPC1 maxnodes", 5000, fifo.getMaxNodes()); - erc = ercs.get(2); + erc = ercs.get(1); assertEquals("ERC2 name", "/test", erc.getRegionName()); assertEquals("ERC2 queue size", 20000, erc.getEventQueueSize()); - MRUConfiguration mru = (MRUConfiguration) erc.getEvictionPolicyConfig(); - assertEquals("EPC2 pol", MRUPolicy.class.getName(), mru.getEvictionPolicyClass()); + MRUAlgorithmConfig mru = (MRUAlgorithmConfig) erc.getEvictionAlgorithmConfig(); + assertEquals("EPC2 pol", MRUAlgorithm.class.getName(), mru.getEvictionAlgorithmClassName()); assertEquals("EPC2 maxnodes", 10000, mru.getMaxNodes()); - erc = ercs.get(3); + erc = ercs.get(2); assertEquals("ERC3 name", "/maxAgeTest", erc.getRegionName()); assertEquals("ERC3 queue size", 20000, erc.getEventQueueSize()); - lru = (LRUConfiguration) erc.getEvictionPolicyConfig(); - assertEquals("EPC3 pol", LRUPolicy.class.getName(), lru.getEvictionPolicyClass()); + LRUAlgorithmConfig lru = (LRUAlgorithmConfig) erc.getEvictionAlgorithmConfig(); assertEquals("EPC3 maxnodes", 10000, lru.getMaxNodes()); - assertEquals("EPC3 maxage", 10, lru.getMaxAgeSeconds()); - assertEquals("EPC3 ttl", 8, lru.getTimeToLiveSeconds()); + assertEquals("EPC3 maxage", 10000, lru.getMaxAge()); + assertEquals("EPC3 ttl", 8000, lru.getTimeToLive()); } @@ -239,120 +241,134 @@ protected static Element getBuddyReplicationConfig() throws Exception { - String xmlStr = - " <buddy enabled=\"true\" poolName=\"testpool\" communicationTimeout=\"600000\">\n" + - " <dataGravitation auto=\"false\" removeOnFind=\"false\" searchBackupTrees=\"false\"/>\n" + - " <locator class=\"org.jboss.cache.buddyreplication.TestBuddyLocator\">\n" + - " <properties>\n" + - " numBuddies = 2\n" + - " </properties>\n" + - " </locator>\n" + - " </buddy>"; - return XmlConfigHelper.stringToElementInCoreNS(xmlStr); + String xmlString = "<config><buddyReplicationEnabled>true</buddyReplicationEnabled>\n" + + " <buddyCommunicationTimeout>600000</buddyCommunicationTimeout>\n" + + " <buddyLocatorClass>org.jboss.cache.buddyreplication.TestBuddyLocator</buddyLocatorClass>\n" + + " <buddyLocatorProperties>numBuddies = 2</buddyLocatorProperties>\n" + + " <buddyPoolName>testpool</buddyPoolName>" + + " <autoDataGravitation>false</autoDataGravitation>\n" + + " <dataGravitationRemoveOnFind>false</dataGravitationRemoveOnFind>\n" + + " <dataGravitationSearchBackupTrees>false</dataGravitationSearchBackupTrees>" + + "</config>"; + return XmlConfigHelper.stringToElement(xmlString); } protected static Element getCacheLoaderConfig() throws Exception { - String xmlStr = - " <loaders passivation=\"false\" shared=\"true\">\n" + - " <preload>\n" + - " <node fqn=\"/foo\"/>\n" + - " </preload>\n" + - " <loader class=\"org.jboss.cache.loader.FileCacheLoader\" async=\"false\" fetchPersistentState=\"true\"\n" + - " ignoreModifications=\"true\" purgeOnStartup=\"true\">\n" + - " <properties>\n" + - " location=/tmp\n " + - " </properties>\n" + - " <singletonStore enabled=\"true\" /> \n" + - " </loader>\n" + - " <loader class=\"org.jboss.cache.loader.jdbm.JdbmCacheLoader\" async=\"true\" fetchPersistentState=\"false\"\n" + - " ignoreModifications=\"false\" purgeOnStartup=\"false\">\n" + - " <properties>\n" + - " location=/home/bstansberry\n" + - " </properties>\n" + - " <singletonStore enabled=\"false\" /> \n" + - " </loader>\n" + - " </loaders>"; - return XmlConfigHelper.stringToElementInCoreNS(xmlStr); + String xml = "<config>\n" + + "<passivation>false</passivation>\n" + + "<preload>/foo</preload>\n" + + "<shared>true</shared>\n" + + "<cacheloader>\n" + + "<class>org.jboss.cache.loader.FileCacheLoader</class>\n" + + "<properties>" + + " location=/tmp\n" + + "</properties>\n" + + "<async>false</async>\n" + + "<fetchPersistentState>true</fetchPersistentState>\n" + + "<ignoreModifications>true</ignoreModifications>\n" + + "<purgeOnStartup>true</purgeOnStartup>\n" + + "<singletonStore>" + + "<enabled>true</enabled>" + + "</singletonStore>" + + "</cacheloader>\n" + + "<cacheloader>\n" + + "<class>org.jboss.cache.loader.jdbm.JdbmCacheLoader</class>\n" + + "<properties>" + + " location=/home/bstansberry\n" + + "</properties>\n" + + "<async>true</async>\n" + + "<fetchPersistentState>false</fetchPersistentState>\n" + + "<ignoreModifications>false</ignoreModifications>\n" + + "<purgeOnStartup>false</purgeOnStartup>\n" + + "<singletonStore>" + + "<enabled>false</enabled>" + + "</singletonStore>" + + "</cacheloader>\n" + + "</config>"; + return XmlConfigHelper.stringToElement(xml); } protected static Element getEvictionPolicyConfig() throws Exception { - String xmlStr = - " <eviction wakeUpInterval=\"5000\" defaultPolicyClass=\"org.jboss.cache.eviction.LRUPolicy\" defaultEventQueueSize=\"20000\">\n" + - " <default eventQueueSize=\"1000\">\n" + - " <attribute name=\"maxNodes\">5000</attribute>\n" + - " <attribute name=\"timeToLive\">1000000</attribute>\n" + - " </default>\n" + - "<region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.FIFOPolicy\">\n" + - " <attribute name=\"maxNodes\">5000</attribute>\n" + - "</region>\n" + - "<region name=\"/test/\" policyClass=\"org.jboss.cache.eviction.MRUPolicy\">\n" + - " <attribute name=\"maxNodes\">10000</attribute>\n" + - "</region>\n" + - "<region name=\"/maxAgeTest/\">\n" + - " <attribute name=\"maxNodes\">10000</attribute>\n" + - " <attribute name=\"timeToLiveSeconds\">8</attribute>\n" + - " <attribute name=\"maxAgeSeconds\">10</attribute>\n" + - "</region>\n" + - " </eviction>"; - return XmlConfigHelper.stringToElementInCoreNS(xmlStr); + String xml = "<config>\n" + + "<attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" + + "<attribute name=\"eventQueueSize\">20000</attribute>\n" + + "<attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" + + "<region name=\"/_default_\" eventQueueSize=\"1000\">\n" + + " <attribute name=\"maxNodes\">5000</attribute>\n" + + " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" + + "</region>\n" + + "<region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.FIFOPolicy\">\n" + + " <attribute name=\"maxNodes\">5000</attribute>\n" + + "</region>\n" + + "<region name=\"/test/\" policyClass=\"org.jboss.cache.eviction.MRUPolicy\">\n" + + " <attribute name=\"maxNodes\">10000</attribute>\n" + + "</region>\n" + + "<region name=\"/maxAgeTest/\">\n" + + " <attribute name=\"maxNodes\">10000</attribute>\n" + + " <attribute name=\"timeToLiveSeconds\">8</attribute>\n" + + " <attribute name=\"maxAgeSeconds\">10</attribute>\n" + + "</region>\n" + + " </config>\n"; + return XmlConfigHelper.stringToElement(xml); } protected static Element getClusterConfig() throws Exception - {String xml = - "<jgroupsConfig>\n" + - "<UDP mcast_addr=\"228.10.10.10\"\n" + - " mcast_port=\"45588\"\n" + - " tos=\"8\"\n" + - " ucast_recv_buf_size=\"20000000\"\n" + - " ucast_send_buf_size=\"640000\"\n" + - " mcast_recv_buf_size=\"25000000\"\n" + - " mcast_send_buf_size=\"640000\"\n" + - " loopback=\"false\"\n" + - " discard_incompatible_packets=\"true\"\n" + - " max_bundle_size=\"64000\"\n" + - " max_bundle_timeout=\"30\"\n" + - " use_incoming_packet_handler=\"true\"\n" + - " ip_ttl=\"2\"\n" + - " enable_bundling=\"false\"\n" + - " enable_diagnostics=\"true\"\n" + - " use_concurrent_stack=\"true\"\n" + - " thread_naming_pattern=\"pl\"\n" + - " thread_pool.enabled=\"true\"\n" + - " thread_pool.min_threads=\"1\"\n" + - " thread_pool.max_threads=\"25\"\n" + - " thread_pool.keep_alive_time=\"30000\"\n" + - " thread_pool.queue_enabled=\"true\"\n" + - " thread_pool.queue_max_size=\"10\"\n" + - " thread_pool.rejection_policy=\"Run\"\n" + - " oob_thread_pool.enabled=\"true\"\n" + - " oob_thread_pool.min_threads=\"1\"\n" + - " oob_thread_pool.max_threads=\"4\"\n" + - " oob_thread_pool.keep_alive_time=\"10000\"\n" + - " oob_thread_pool.queue_enabled=\"true\"\n" + - " oob_thread_pool.queue_max_size=\"10\"\n" + - " oob_thread_pool.rejection_policy=\"Run\"/>\n" + - " <PING timeout=\"2000\" num_initial_members=\"3\"/>\n" + - " <MERGE2 max_interval=\"30000\" min_interval=\"10000\"/>\n" + - " <FD_SOCK/>\n" + - " <FD timeout=\"10000\" max_tries=\"5\" shun=\"true\"/>\n" + - " <VERIFY_SUSPECT timeout=\"1500\"/>\n" + - " <pbcast.NAKACK max_xmit_size=\"60000\"\n" + - " use_mcast_xmit=\"false\" gc_lag=\"0\"\n" + - " retransmit_timeout=\"300,600,1200,2400,4800\"\n" + - " discard_delivered_msgs=\"true\"/>\n" + - " <UNICAST timeout=\"300,600,1200,2400,3600\"/>\n" + - " <pbcast.STABLE stability_delay=\"1000\" desired_avg_gossip=\"50000\"\n" + - " max_bytes=\"400000\"/>\n" + - " <pbcast.GMS print_local_addr=\"true\" join_timeout=\"5000\"\n" + - " join_retry_timeout=\"2000\" shun=\"false\"\n" + - " view_bundling=\"true\" view_ack_collection_timeout=\"5000\"/>\n" + - " <FRAG2 frag_size=\"60000\"/>\n" + - " <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=\"true\"/>\n" + - " <pbcast.FLUSH timeout=\"0\"/>\n" + - "</jgroupsConfig>"; -return XmlConfigHelper.stringToElementInCoreNS(xml); + { + String xml = + "<config>\n" + + " <UDP mcast_addr=\"228.10.10.10\"\n" + + " mcast_port=\"45588\"\n" + + " tos=\"8\"\n" + + " ucast_recv_buf_size=\"20000000\"\n" + + " ucast_send_buf_size=\"640000\"\n" + + " mcast_recv_buf_size=\"25000000\"\n" + + " mcast_send_buf_size=\"640000\"\n" + + " loopback=\"false\"\n" + + " discard_incompatible_packets=\"true\"\n" + + " max_bundle_size=\"64000\"\n" + + " max_bundle_timeout=\"30\"\n" + + " use_incoming_packet_handler=\"true\"\n" + + " ip_ttl=\"2\"\n" + + " enable_bundling=\"false\"\n" + + " enable_diagnostics=\"true\"\n" + + " use_concurrent_stack=\"true\"\n" + + " thread_naming_pattern=\"pl\"\n" + + " thread_pool.enabled=\"true\"\n" + + " thread_pool.min_threads=\"1\"\n" + + " thread_pool.max_threads=\"25\"\n" + + " thread_pool.keep_alive_time=\"30000\"\n" + + " thread_pool.queue_enabled=\"true\"\n" + + " thread_pool.queue_max_size=\"10\"\n" + + " thread_pool.rejection_policy=\"Run\"\n" + + " oob_thread_pool.enabled=\"true\"\n" + + " oob_thread_pool.min_threads=\"1\"\n" + + " oob_thread_pool.max_threads=\"4\"\n" + + " oob_thread_pool.keep_alive_time=\"10000\"\n" + + " oob_thread_pool.queue_enabled=\"true\"\n" + + " oob_thread_pool.queue_max_size=\"10\"\n" + + " oob_thread_pool.rejection_policy=\"Run\"/>\n" + + " <PING timeout=\"2000\" num_initial_members=\"3\"/>\n" + + " <MERGE2 max_interval=\"30000\" min_interval=\"10000\"/>\n" + + " <FD_SOCK/>\n" + + " <FD timeout=\"10000\" max_tries=\"5\" shun=\"true\"/>\n" + + " <VERIFY_SUSPECT timeout=\"1500\"/>\n" + + " <pbcast.NAKACK max_xmit_size=\"60000\"\n" + + " use_mcast_xmit=\"false\" gc_lag=\"0\"\n" + + " retransmit_timeout=\"300,600,1200,2400,4800\"\n" + + " discard_delivered_msgs=\"true\"/>\n" + + " <UNICAST timeout=\"300,600,1200,2400,3600\"/>\n" + + " <pbcast.STABLE stability_delay=\"1000\" desired_avg_gossip=\"50000\"\n" + + " max_bytes=\"400000\"/>\n" + + " <pbcast.GMS print_local_addr=\"true\" join_timeout=\"5000\"\n" + + " join_retry_timeout=\"2000\" shun=\"false\"\n" + + " view_bundling=\"true\" view_ack_collection_timeout=\"5000\"/>\n" + + " <FRAG2 frag_size=\"60000\"/>\n" + + " <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=\"true\"/>\n" + + " <pbcast.FLUSH timeout=\"0\"/>\n" + + "</config>"; + return XmlConfigHelper.stringToElement(xml); } class MockInvocationHandler implements InvocationHandler