[jboss-cvs] JBossAS SVN: r66165 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-10-16 03:55:00 -0400 (Tue, 16 Oct 2007)
New Revision: 66165

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
Log:
Default the locking policy

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-16 07:52:03 UTC (rev 66164)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationMetaData.java	2007-10-16 07:55:00 UTC (rev 66165)
@@ -123,7 +123,7 @@
    private String webClassLoader = "org.jboss.web.WebClassLoader";
    
    /** The locking policy */
-   private String lockingPolicy;
+   private String lockingPolicy = "org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock";
    
    /** The InstancePool configuration */
    private Element containerPoolConf;
@@ -440,6 +440,7 @@
     * @param lockingPolicy the lockingPolicy.
     * @throws IllegalArgumentException for a null lockingPolicy
     */
+   @XmlElement(defaultValue="org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock")
    public void setLockingPolicy(String lockingPolicy)
    {
       if (lockingPolicy == null)

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-16 07:52:03 UTC (rev 66164)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java	2007-10-16 07:55:00 UTC (rev 66165)
@@ -1014,6 +1014,11 @@
       ContainerConfigurationMetaData configuration = jBossMetaData.getContainerConfiguration(prefix + "Name");
       assertNotNull(configuration);
       assertEquals(prefix + "Name", configuration.getContainerName());
+      String policy = configuration.getLockingPolicy();
+      if(policy.startsWith("org.jboss"))
+         assertEquals("org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock", policy);
+      else
+         assertEquals(prefix+"LockingPolicy", policy);
       return configuration;
    }
    
@@ -1068,7 +1073,7 @@
       assertNull(configuration.getInstanceCache());
       assertNull(configuration.getPersistenceManager());
       assertEquals("org.jboss.web.WebClassLoader", configuration.getWebClassLoader());
-      assertNull(configuration.getLockingPolicy());
+      assertEquals("org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock", configuration.getLockingPolicy());
       assertNull(configuration.getSecurityDomain());
       assertFalse(configuration.isCallLogging());
       assertFalse(configuration.isSyncOnCommitOnly());