[jboss-cvs] JBossAS SVN: r66442 - 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
Thu Oct 25 12:21:46 EDT 2007
Author: wolfc
Date: 2007-10-25 12:21:46 -0400 (Thu, 25 Oct 2007)
New Revision: 66442
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.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:
JBAS-4506: pool config
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-25 16:07:07 UTC (rev 66441)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-25 16:21:46 UTC (rev 66442)
@@ -155,7 +155,8 @@
/** The aop domain name */
private String aopDomainName;
- // TODO DOM pool config
+ /** The pool configuration */
+ private PoolConfigMetaData poolConfig;
/** The jndi refs */
private JndiRefsMetaData jndiRefs;
@@ -642,6 +643,11 @@
return result;
}
+ public void setPoolConfig(PoolConfigMetaData poolConfig)
+ {
+ this.poolConfig = poolConfig;
+ }
+
/**
* Get the default configuration name
*
@@ -919,6 +925,11 @@
return jndiEnvironmentRefsGroup.getPersistenceUnitRefs();
}
+ public PoolConfigMetaData getPoolConfig()
+ {
+ return poolConfig;
+ }
+
public LifecycleCallbacksMetaData getPostConstructs()
{
return jndiEnvironmentRefsGroup.getPostConstructs();
Copied: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java (from rev 66417, projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/PoolConfig.java)
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java 2007-10-25 16:21:46 UTC (rev 66442)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, 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.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlElement;
+
+
+/**
+ * Represents an <pool-config> element of the jboss.xml deployment descriptor
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class PoolConfigMetaData
+{
+ private String poolClass = null;
+ private Integer maxSize = null;
+ private Integer timeout = null;
+
+ public String getPoolClass()
+ {
+ return poolClass;
+ }
+
+ public void setPoolClass(String poolClass)
+ {
+ this.poolClass = poolClass;
+ }
+
+ @XmlElement(name="pool-max-size")
+ public Integer getMaxSize()
+ {
+ return maxSize;
+ }
+
+ public void setMaxSize(Integer maxSize)
+ {
+ this.maxSize = maxSize;
+ }
+
+ @XmlElement(name="pool-timeout")
+ public Integer getTimeout()
+ {
+ return timeout;
+ }
+
+ public void setTimeout(Integer timeout)
+ {
+ this.timeout = timeout;
+ }
+
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer(100);
+ sb.append("[");
+ sb.append("poolClass=").append(poolClass);
+ sb.append(", maxSize=").append(maxSize);
+ sb.append(", timeout=").append(timeout);
+ sb.append("]");
+ return sb.toString();
+ }
+
+}
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-25 16:07:07 UTC (rev 66441)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-25 16:21:46 UTC (rev 66442)
@@ -49,6 +49,7 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.jboss.PoolConfigMetaData;
import org.jboss.metadata.ejb.jboss.ResourceManagerMetaData;
import org.jboss.metadata.ejb.jboss.ResourceManagersMetaData;
import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
@@ -443,6 +444,8 @@
assertCacheConfig(prefix, num, session.getCacheConfig());
+ assertPoolConfig(prefix, session.getPoolConfig());
+
if (this.hasStandardJBoss)
{
ContainerConfigurationMetaData ccmd = session.determineContainerConfiguration();
@@ -1147,6 +1150,14 @@
assertEquals(prefix + "JndiName", messageDestinationMetaData.getMappedName());
}
+ private void assertPoolConfig(String prefix, PoolConfigMetaData poolConfig)
+ {
+ assertNotNull(prefix + " has no poolConfig", poolConfig);
+ assertEquals(prefix + "PoolClass", poolConfig.getPoolClass());
+ assertEquals(10, (int) poolConfig.getMaxSize());
+ assertEquals(11, (int) poolConfig.getTimeout());
+ }
+
@Override
protected void assertResourceGroup(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first, Mode mode)
{
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-25 16:07:07 UTC (rev 66441)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-10-25 16:21:46 UTC (rev 66442)
@@ -470,7 +470,11 @@
<persistence-manager>session1PersistenceManager</persistence-manager>
</cache-config>
- <!-- TODO pool config -->
+ <pool-config>
+ <pool-class>session1PoolClass</pool-class>
+ <pool-max-size>10</pool-max-size>
+ <pool-timeout>11</pool-timeout>
+ </pool-config>
<concurrent>true</concurrent>
@@ -913,7 +917,11 @@
<persistence-manager>session2PersistenceManager</persistence-manager>
</cache-config>
- <!-- TODO pool config -->
+ <pool-config>
+ <pool-class>session2PoolClass</pool-class>
+ <pool-max-size>10</pool-max-size>
+ <pool-timeout>11</pool-timeout>
+ </pool-config>
<concurrent>false</concurrent>
More information about the jboss-cvs-commits
mailing list