[jboss-cvs] JBossAS SVN: r65783 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 3 00:58:39 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-03 00:58:39 -0400 (Wed, 03 Oct 2007)
New Revision: 65783
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
Log:
Add validation of the container interceptors, cache and pool conf.
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationMetaData.java 2007-10-03 03:11:34 UTC (rev 65782)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationMetaData.java 2007-10-03 04:58:39 UTC (rev 65783)
@@ -110,8 +110,6 @@
/** Store not flushed */
private boolean storeNotFlushed = true;
- // TODO DOM container interceptors
-
/** The instance pool */
private String instancePool;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-03 03:11:34 UTC (rev 65782)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-03 04:58:39 UTC (rev 65783)
@@ -70,6 +70,7 @@
import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -91,7 +92,35 @@
return schemaResolverForClass(JBoss50MetaData.class);
//return AbstractJavaEEMetaDataTest.initResolverJavaEE(JBoss50MetaData.class);
}
-
+ static Element getElement(String name, Element parent)
+ {
+ NodeList elements = parent.getElementsByTagName(name);
+ Element element = (Element) elements.item(0);
+ return element;
+ }
+ static String getElementText(String name, Element parent)
+ {
+ Element element = getElement(name, parent);
+ NodeList children = element.getChildNodes();
+ String result = "";
+ for (int i = 0; i < children.getLength(); i++)
+ {
+ if (children.item(i).getNodeType() == Node.TEXT_NODE || children.item(i).getNodeType() == Node.CDATA_SECTION_NODE)
+ {
+ result += children.item(i).getNodeValue();
+ }
+ else if (children.item(i).getNodeType() == Node.COMMENT_NODE)
+ {
+ // Ignore comment nodes
+ }
+ else
+ {
+ result += children.item(i).getFirstChild();
+ }
+ }
+ return result.trim();
+ }
+
public JBoss5xEverythingUnitTestCase(String name)
{
super(name);
@@ -104,8 +133,8 @@
public void testEverything() throws Exception
{
- enableTrace("org.jboss.xb");
- enableTrace("org.jboss.xb.builder");
+ //enableTrace("org.jboss.xb");
+ //enableTrace("org.jboss.xb.builder");
JBoss50MetaData jbossMetaData = unmarshal();
assertEverything(jbossMetaData);
}
@@ -469,82 +498,6 @@
assertNull(session.getJndiRefs());
}
-/* private void assertFullSessionBean(String prefix, ApplicationMetaData application, boolean first)
- {
- SessionMetaData session = assertJBossSessionBean(prefix, application);
-
- assertEquals(prefix + "JndiName", session.getJndiName());
- assertEquals(prefix + "LocalJndiName", session.getLocalJndiName());
- assertEquals(prefix + "ConfigurationName", session.getConfigurationName());
- assertEquals(prefix + "SecurityProxy", session.getSecurityProxy());
-
- if (first)
- {
- assertTrue(session.isCallByValue());
- assertTrue(session.getExceptionRollback());
- assertTrue(session.getTimerPersistence());
- assertTrue(session.isClustered());
- }
- else
- {
- assertFalse(session.isCallByValue());
- assertFalse(session.getExceptionRollback());
- assertFalse(session.getTimerPersistence());
- assertFalse(session.isClustered());
- }
-
- assertInvokerBindings(prefix, session, session.getInvokerBindings());
-
- assertEnvironment(prefix, session, false);
-
- assertSecurityIdentity(prefix, "SecurityIdentity", session.getSecurityIdentityMetaData(), false);
-
- assertClusterConfig(prefix, session.getClusterConfigMetaData(), true);
-
- assertMethodAttributes(prefix, session);
-
- assertDepends(prefix, 2, session.getDepends());
-
- assertIORSecurityConfig(prefix, session.getIorSecurityConfigMetaData());
-
- // TODO webservice port-component
-
- assertSecurityIdentity(prefix, "EjbTimeoutIdentity", session.getEjbTimeoutIdentity(), false);
- }
-*/
-/* private void assertNullSessionBean(String prefix, ApplicationMetaData application)
- {
- SessionMetaData session = assertJBossSessionBean(prefix, application);
-
- String ejbName = session.getEjbName();
- assertEquals(session.getEjbName(), session.getJndiName());
- String localName = "local/" + ejbName + '@' + System.identityHashCode(ejbName);
- assertEquals(localName, session.getLocalJndiName());
- assertEquals(ContainerConfigurationMetaData.STATELESS, session.getConfigurationName());
- assertNull(session.getSecurityProxy());
-
- assertFalse(session.isCallByValue());
- assertFalse(session.getExceptionRollback());
- assertTrue(session.getTimerPersistence());
- assertFalse(session.isClustered());
-
- assertDefaultInvoker(InvokerBindingMetaData.STATELESS, session);
-
- assertNullEnvironment(session);
-
- assertNull(session.getSecurityIdentityMetaData());
-
- assertDefaultMethodAttributes(ejbName, session);
-
- assertEmpty(session.getDepends());
-
- assertNull(session.getIorSecurityConfigMetaData());
-
- // TODO webservice port-component
-
- assertNull(session.getEjbTimeoutIdentity());
- }
-*/
private JBossEntityBeanMetaData assertJBossEntityBean(String prefix, JBossMetaData jbossMetaData)
{
JBossEntityBeanMetaData ejb = assertJBossEnterpriseBean(prefix, jbossMetaData, JBossEntityBeanMetaData.class);
@@ -847,79 +800,7 @@
assertNull(mdb.getAopDomainName());
assertNull(mdb.getJndiRefs());
}
-
-/* private void assertFullMessageDrivenBean(String prefix, ApplicationMetaData application, boolean first)
- {
- MessageDrivenMetaData mdb = assertJBossMessageDrivenBean(prefix, application);
- assertEquals(prefix + "DestinationJndiName", mdb.getDestinationJndiName());
- assertEquals(prefix + "LocalJndiName", mdb.getLocalJndiName());
- assertEquals(prefix + "User", mdb.getUser());
- assertEquals(prefix + "Password", mdb.getPasswd());
- assertEquals(prefix + "ClientId", mdb.getClientId());
- assertEquals(prefix + "SubscriptionId", mdb.getSubscriptionId());
- assertEquals(prefix + "RAR", mdb.getResourceAdapterName());
- assertEquals(prefix + "ConfigurationName", mdb.getConfigurationName());
- assertEquals(prefix + "SecurityProxy", mdb.getSecurityProxy());
-
- if (first)
- {
- assertTrue(mdb.getExceptionRollback());
- assertTrue(mdb.getTimerPersistence());
- }
- else
- {
- assertFalse(mdb.getExceptionRollback());
- assertFalse(mdb.getTimerPersistence());
- }
-
- assertInvokerBindings(prefix, mdb, mdb.getInvokerBindings());
-
- assertEnvironment(prefix, mdb, false);
-
- assertSecurityIdentity(prefix, "SecurityIdentity", mdb.getSecurityIdentityMetaData(), false);
-
- assertSecurityIdentity(prefix, "EjbTimeoutIdentity", mdb.getEjbTimeoutIdentity(), false);
-
- assertMethodAttributes(prefix, mdb);
-
- assertDepends(prefix, 2, mdb.getDepends());
-
- assertIORSecurityConfig(prefix, mdb.getIorSecurityConfigMetaData());
- }
-*/
-/* private void assertNullMessageDrivenBean(String prefix, ApplicationMetaData application)
- {
- MessageDrivenMetaData mdb = assertJBossMessageDrivenBean(prefix, application);
-
- assertNull(mdb.getDestinationJndiName());
- String ejbName = mdb.getEjbName();
- String localName = "local/" + ejbName + '@' + System.identityHashCode(ejbName);
- assertEquals(localName, mdb.getLocalJndiName());
- assertNull(mdb.getUser());
- assertNull(mdb.getPasswd());
- assertNull(mdb.getClientId());
- assertNull(mdb.getSubscriptionId());
- assertNull(mdb.getResourceAdapterName());
- assertEquals(ContainerConfigurationMetaData.MESSAGE_INFLOW_DRIVEN, mdb.getConfigurationName());
- assertNull(mdb.getSecurityProxy());
-
- assertFalse(mdb.getExceptionRollback());
- assertTrue(mdb.getTimerPersistence());
-
- assertNullEnvironment(mdb);
-
- assertDefaultMethodAttributes(prefix, mdb);
-
- assertNull(mdb.getSecurityIdentityMetaData());
-
- assertNull(mdb.getEjbTimeoutIdentity());
-
- assertEmpty(mdb.getDepends());
-
- assertNull(mdb.getIorSecurityConfigMetaData());
- }
-*/
private void fixUpContainerConfigurations(JBossMetaData jbossMetaData)
{
ContainerConfigurationsMetaData configurations = jbossMetaData.getContainerConfigurations();
@@ -1016,9 +897,12 @@
assertFalse(configuration.isStoreNotFlushed());
}
assertInvokerProxyBindingNames(prefix, 2, configuration.getInvokerProxyBindingNames());
- // TODO DOM container interceptors
- // TODO DOM container cache conf
- // TODO DOM container pool conf
+ Element interceptors = configuration.getContainerInterceptors();
+ assertContainerInterceptors(prefix, interceptors);
+ Element cacheConf = configuration.getContainerCacheConf();
+ assertContainerCacheConf(prefix, cacheConf);
+ Element poolConf = configuration.getContainerPoolConf();
+ assertContainerPoolConf(prefix, poolConf);
assertEquals(CommitOption.D, configuration.getCommitOption());
assertEquals(10000, configuration.getOptiondRefreshRateMillis());
assertClusterConfig(prefix, configuration.getClusterConfig(), true);
@@ -1043,82 +927,71 @@
assertFalse(configuration.isEjbStoreOnClean());
assertTrue(configuration.isStoreNotFlushed());
assertNull(configuration.getInvokerProxyBindingNames());
- // TODO DOM container interceptors
- // TODO DOM container cache conf
- // TODO DOM container pool conf
+ assertNull(configuration.getContainerInterceptors());
+ assertNull(configuration.getContainerPoolConf());
+ assertNull(configuration.getContainerCacheConf());
assertEquals(CommitOption.A, configuration.getCommitOption());
assertEquals(30000, configuration.getOptiondRefreshRateMillis());
assertNull(configuration.getClusterConfig());
assertNull(configuration.getDepends());
}
-
-/* private ConfigurationMetaData assertContainerConfiguration(String prefix, ApplicationMetaData application)
+
+ /**
+ * Validate the container-configuration/container-interceptors config
+ * @param prefix
+ * @param config
+ */
+ private void assertContainerInterceptors(String prefix, Element config)
{
- ConfigurationMetaData configuration = application.getConfigurationMetaDataByName(prefix + "Name");
- assertNotNull(configuration);
- assertEquals(prefix + "Name", configuration.getName());
- return configuration;
- }
-*/
-/* private void assertFullContainerConfiguration(String prefix, ApplicationMetaData application, boolean first)
- {
- ConfigurationMetaData configuration = assertContainerConfiguration(prefix, application);
- assertEquals(prefix + "InstancePool", configuration.getInstancePool());
- assertEquals(prefix + "InstanceCache", configuration.getInstanceCache());
- assertEquals(prefix + "PersistenceManager", configuration.getPersistenceManager());
- assertEquals(prefix + "WebClassLoader", configuration.getWebClassLoader());
- assertEquals(prefix + "LockingPolicy", configuration.getLockClass());
- assertEquals(prefix + "SecurityDomain", configuration.getSecurityDomain());
- if (first)
+ assertNotNull(config);
+ NodeList interceptors = config.getElementsByTagName("interceptor");
+ assertEquals("interceptors count is 5", 5, interceptors.getLength());
+ for(int n = 0; n < interceptors.getLength(); n ++)
{
- assertTrue(configuration.getCallLogging());
- assertTrue(configuration.getSyncOnCommitOnly());
- assertTrue(configuration.isInsertAfterEjbPostCreate());
- assertTrue(configuration.isEjbStoreForClean());
- assertTrue(configuration.isStoreNotFlushed());
+ Element interceptor = (Element) interceptors.item(n);
+ String tx = interceptor.getAttribute("transaction");
+ String text = interceptor.getTextContent();
+ String expected;
+ if (tx.length() == 0)
+ expected = prefix+".Interceptor"+(n+1);
+ else if (tx.equals("Container"))
+ expected = prefix+".Interceptor"+(n+1)+"c";
+ else
+ expected = prefix+".Interceptor"+(n+1)+"b";
+ assertEquals(expected, text);
}
- else
- {
- assertFalse(configuration.getCallLogging());
- assertFalse(configuration.getSyncOnCommitOnly());
- assertFalse(configuration.isInsertAfterEjbPostCreate());
- assertFalse(configuration.isEjbStoreForClean());
- assertFalse(configuration.isStoreNotFlushed());
- }
- assertInvokerProxyBindingNames(prefix, 2, configuration.getInvokers());
- // TODO DOM container interceptors
- // TODO DOM container cache conf
- // TODO DOM container pool conf
- assertEquals(ConfigurationMetaData.D_COMMIT_OPTION, configuration.getCommitOption());
- assertEquals(10000, configuration.getOptionDRefreshRate());
- assertClusterConfig(prefix, configuration.getClusterConfigMetaData(), true);
- assertDepends(prefix, 2, configuration.getDepends());
}
-*/
-/* private void assertNullContainerConfiguration(String prefix, ApplicationMetaData application)
+ /**
+ * Validate the container-configuration/container-cache-conf
+ * @param prefix
+ * @param config
+ */
+ private void assertContainerCacheConf(String prefix, Element config)
{
- ConfigurationMetaData configuration = assertContainerConfiguration(prefix, application);
- assertNull(configuration.getInstancePool());
- assertNull(configuration.getInstanceCache());
- assertNull(configuration.getPersistenceManager());
- assertNull(configuration.getWebClassLoader());
- assertNull(configuration.getLockClass());
- assertNull(configuration.getSecurityDomain());
- assertFalse(configuration.getCallLogging());
- assertFalse(configuration.getSyncOnCommitOnly());
- assertFalse(configuration.isInsertAfterEjbPostCreate());
- assertFalse(configuration.isEjbStoreForClean());
- assertTrue(configuration.isStoreNotFlushed());
- assertInvokerProxyBindingNames(null, 0, configuration.getInvokers());
- // TODO DOM container interceptors
- // TODO DOM container cache conf
- // TODO DOM container pool conf
- assertEquals(ConfigurationMetaData.A_COMMIT_OPTION, configuration.getCommitOption());
- assertEquals(30000, configuration.getOptionDRefreshRate());
- assertNull(configuration.getClusterConfigMetaData());
- assertEmpty(configuration.getDepends());
+ assertNotNull(config);
+ assertEquals(prefix+".Policy", getElementText("cache-policy", config));
+ Element policyConf = getElement("cache-policy-conf", config);
+ assertNotNull(policyConf);
+ assertEquals("50", getElementText("min-capacity", policyConf));
+ assertEquals("1000000", getElementText("max-capacity", policyConf));
+ assertEquals("1800", getElementText("remover-period", policyConf));
+ assertEquals("1800", getElementText("max-bean-life", policyConf));
+ assertEquals("300", getElementText("overager-period", policyConf));
+ assertEquals("600", getElementText("max-bean-age", policyConf));
+ assertEquals("400", getElementText("resizer-period", policyConf));
+ assertEquals("60", getElementText("max-cache-miss-period", policyConf));
+ assertEquals("1", getElementText("min-cache-miss-period", policyConf));
+ assertEquals("0.75", getElementText("cache-load-factor", policyConf));
}
-*/
+
+ private void assertContainerPoolConf(String prefix, Element config)
+ {
+ assertNotNull(prefix+" container-pool-conf", config);
+ String id = config.getAttribute("id");
+ assertEquals(prefix+"-pool-conf", id);
+ assertEquals("100", getElementText("MaximumSize", config));
+ }
+
private void assertInvokerProxyBindingNames(String prefix, int size, Collection<String> names)
{
assertNotNull(names);
@@ -1219,27 +1092,6 @@
}
}
-/* private void assertInvokerProxyBindings(Iterator<org.jboss.metadata.InvokerProxyBindingMetaData> bindings)
- {
- assertNotNull(bindings);
- int count = 1;
- while (bindings.hasNext())
- {
- assertInvokerProxyBinding("invokerProxyBinding" + count, bindings.next());
- ++count;
- }
- assertEquals(3, count);
- }
-*/
-/* private void assertInvokerProxyBinding(String prefix, org.jboss.metadata.InvokerProxyBindingMetaData binding)
- {
- assertNotNull(binding);
- assertEquals(prefix + "Name", binding.getName());
- assertEquals(prefix + "InvokerMBean", binding.getInvokerMBean());
- assertEquals(prefix + "ProxyFactory", binding.getProxyFactory());
- // TODO DOM invoker-proxy-config
- }
-*/
private void assertInvokerBindings(String prefix, InvokerBindingsMetaData bindings)
{
assertId(prefix + "InvokerBindings", bindings);
@@ -1264,30 +1116,6 @@
// TODO LAST ejb-ref - needs a seperate test
}
-/* private void assertInvokerBindings(String prefix, BeanMetaData bean, Iterator<String> names)
- {
- assertNotNull(names);
- int count = 1;
- while (names.hasNext())
- {
- String name = names.next();
- assertInvokerBinding(prefix + "Invoker" + count, count, bean, name);
- ++count;
- }
- assertEquals(3, count);
- }
-*/
-/* private void assertInvokerBinding(String prefix, int count, BeanMetaData bean, String name)
- {
- assertEquals(prefix + "Name", name);
- assertEquals(prefix + "JndiName", bean.getInvokerBinding(name));
- }
-*/
-/* private void assertDefaultInvoker(String name, BeanMetaData bean)
- {
- assertEquals(bean.getJndiName(), bean.getInvokerBinding(name));
- }
-*/
private void assertResourceManagers(ResourceManagersMetaData resources)
{
assertNotNull(resources);
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-10-03 03:11:34 UTC (rev 65782)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-10-03 04:58:39 UTC (rev 65783)
@@ -2701,8 +2701,32 @@
<invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
<invoker-mbean>invokerProxyBinding2InvokerMBean</invoker-mbean>
<proxy-factory>invokerProxyBinding2ProxyFactory</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors>
+ <home>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor1.2</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor2.2</interceptor>
+ <interceptor call-by-value="false">org.jboss.proxy.ejb.HomeInterceptorcbvf3.2</interceptor>
+ <interceptor call-by-value="true">org.jboss.proxy.ejb.HomeInterceptorcbvt4.2</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.proxy.ejb.BeanInterceptor1.2</interceptor>
+ <interceptor>org.jboss.proxy.ejb.BeanInterceptor2.2</interceptor>
+ <interceptor call-by-value="false">org.jboss.proxy.ejb.BeanInterceptorcbvf3.2</interceptor>
+ <interceptor call-by-value="true">org.jboss.proxy.ejb.BeanInterceptorcbvt4.2</interceptor>
+ </bean>
+ <list-entity>
+ <interceptor>org.jboss.proxy.ejb.EntityInterceptor1.2</interceptor>
+ <interceptor>org.jboss.proxy.ejb.EntityInterceptor2.2</interceptor>
+ <interceptor call-by-value="false">org.jboss.proxy.ejb.EntityInterceptorcbvf3.2</interceptor>
+ <interceptor call-by-value="true">org.jboss.proxy.ejb.EntityInterceptorcbvt4.2</interceptor>
+ </list-entity>
+ </client-interceptors>
+ </proxy-factory-config>
+ <!-- Unknown element to test duplicate wildcards -->
+ <wildcard />
</invoker-proxy-binding>
- </invoker-proxy-bindings>
+ </invoker-proxy-bindings>
<container-configurations id="container-configurations-id">
<jee:description>en-container-configurations-desc</jee:description>
@@ -2724,29 +2748,21 @@
<call-ejb-store-on-clean>true</call-ejb-store-on-clean>
<store-not-flushed>true</store-not-flushed>
<container-interceptors>
- <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+ <interceptor>containerConfiguration1.Interceptor1</interceptor>
+ <interceptor>containerConfiguration1.Interceptor2</interceptor>
<!-- CMT -->
- <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+ <interceptor transaction="Container">containerConfiguration1.Interceptor3c</interceptor>
<!-- BMT -->
- <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
- <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
- <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
- </container-interceptors>
-
+ <interceptor transaction="Bean">containerConfiguration1.Interceptor4b</interceptor>
+ <interceptor>containerConfiguration1.Interceptor5</interceptor>
+ </container-interceptors>
<instance-pool>containerConfiguration1InstancePool</instance-pool>
<instance-cache>containerConfiguration1InstanceCache</instance-cache>
<persistence-manager>containerConfiguration1PersistenceManager</persistence-manager>
<web-class-loader>containerConfiguration1WebClassLoader</web-class-loader>
<locking-policy>containerConfiguration1LockingPolicy</locking-policy>
- <!-- TODO container cache conf -->
<container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
+ <cache-policy>containerConfiguration1.Policy</cache-policy>
<cache-policy-conf>
<min-capacity>50</min-capacity>
<max-capacity>1000000</max-capacity>
@@ -2759,13 +2775,11 @@
<min-cache-miss-period>1</min-cache-miss-period>
<cache-load-factor>0.75</cache-load-factor>
</cache-policy-conf>
- </container-cache-conf>
+ </container-cache-conf>
+ <container-pool-conf id="containerConfiguration1-pool-conf">
+ <MaximumSize>100</MaximumSize>
+ </container-pool-conf>
- <!-- TODO container pool conf -->
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- </container-pool-conf>
-
<commit-option>D</commit-option>
<optiond-refresh-rate>10</optiond-refresh-rate>
<security-domain>containerConfiguration1SecurityDomain</security-domain>
@@ -2793,14 +2807,38 @@
<insert-after-ejb-post-create>false</insert-after-ejb-post-create>
<call-ejb-store-on-clean>false</call-ejb-store-on-clean>
<store-not-flushed>false</store-not-flushed>
- <!-- TODO container-interceptors -->
+ <container-interceptors>
+ <interceptor>containerConfiguration2.Interceptor1</interceptor>
+ <interceptor>containerConfiguration2.Interceptor2</interceptor>
+ <!-- CMT -->
+ <interceptor transaction="Container">containerConfiguration2.Interceptor3c</interceptor>
+ <!-- BMT -->
+ <interceptor transaction="Bean">containerConfiguration2.Interceptor4b</interceptor>
+ <interceptor>containerConfiguration2.Interceptor5</interceptor>
+ </container-interceptors>
<instance-pool>containerConfiguration2InstancePool</instance-pool>
<instance-cache>containerConfiguration2InstanceCache</instance-cache>
<persistence-manager>containerConfiguration2PersistenceManager</persistence-manager>
<web-class-loader>containerConfiguration2WebClassLoader</web-class-loader>
<locking-policy>containerConfiguration2LockingPolicy</locking-policy>
- <!-- TODO container cache conf -->
- <!-- TODO container pool conf -->
+ <container-cache-conf>
+ <cache-policy>containerConfiguration2.Policy</cache-policy>
+ <cache-policy-conf>
+ <min-capacity>50</min-capacity>
+ <max-capacity>1000000</max-capacity>
+ <remover-period>1800</remover-period>
+ <max-bean-life>1800</max-bean-life>
+ <overager-period>300</overager-period>
+ <max-bean-age>600</max-bean-age>
+ <resizer-period>400</resizer-period>
+ <max-cache-miss-period>60</max-cache-miss-period>
+ <min-cache-miss-period>1</min-cache-miss-period>
+ <cache-load-factor>0.75</cache-load-factor>
+ </cache-policy-conf>
+ </container-cache-conf>
+ <container-pool-conf id="containerConfiguration2-pool-conf">
+ <MaximumSize>100</MaximumSize>
+ </container-pool-conf>
<commit-option>D</commit-option>
<optiond-refresh-rate>10</optiond-refresh-rate>
<security-domain>containerConfiguration2SecurityDomain</security-domain>
More information about the jboss-cvs-commits
mailing list