[jboss-cvs] JBossAS SVN: r65776 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/javaee/jboss and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 2 17:55:12 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-02 17:55:12 -0400 (Tue, 02 Oct 2007)
New Revision: 65776
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/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/LoaderRepositoryMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/IgnoreDependencyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/SecurityRoleMetaData.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:
Update ContainerConfigurationMetaData property order and drop NonNullLinkedHashSet binding type usage
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-02 21:54:39 UTC (rev 65775)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationMetaData.java 2007-10-02 21:55:12 UTC (rev 65776)
@@ -24,7 +24,7 @@
import java.util.Set;
import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;
-import org.jboss.metadata.javaee.support.NonNullLinkedHashSet;
+import org.w3c.dom.Element;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
@@ -37,7 +37,17 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="container-configurationType")
+ at XmlType(name="container-configurationType",
+ propOrder={"descriptions", "containerName", "extendsName",
+ "callLogging", "invokerProxyBindingNames",
+ "syncOnCommitOnly", "insertAfterEjbPostCreate",
+ "ejbStoreOnClean", "storeNotFlushed", "instancePool",
+ "instanceCache", "persistenceManager",
+ "webClassLoader", "lockingPolicy",
+ "commitOption", "optiondRefreshRate", "securityDomain",
+ "clusterConfig", "depends",
+ "containerPoolConf", "containerCacheConf", "containerInterceptors"}
+)
public class ContainerConfigurationMetaData extends NamedMetaDataWithDescriptions
{
/** The standard CMP2 configuration */
@@ -117,15 +127,18 @@
/** The locking policy */
private String lockingPolicy;
- // TODO DOM container cache conf
-
- // TODO DOM container pool conf
-
+ /** The InstancePool configuration */
+ private Element containerPoolConf;
+ /** The InstanceCache configuration */
+ private Element containerCacheConf;
+ /** The ejb container interceptor stack configuration */
+ private Element containerInterceptorsConf;
+
/** The commit option */
private CommitOption commitOption = CommitOption.A;
/** The option d refresh rate in milliseconds */
- private long optionDRefreshRateMillis = 30000;
+ private long optiondRefreshRateMillis = 30000;
/** The security domain */
private String securityDomain;
@@ -256,6 +269,7 @@
*
* @param ejbStoreOnClean the ejbStoreOnClean.
*/
+ @XmlElement(name="call-ejb-store-on-clean")
public void setEjbStoreOnClean(boolean ejbStoreOnClean)
{
this.ejbStoreOnClean = ejbStoreOnClean;
@@ -444,27 +458,27 @@
}
/**
- * Get the optionDRefreshRateMillis.
+ * Get the optiondRefreshRateMillis.
*
- * @return the optionDRefreshRateMillis.
+ * @return the optiondRefreshRateMillis.
*/
public long getOptiondRefreshRateMillis()
{
- return optionDRefreshRateMillis;
+ return optiondRefreshRateMillis;
}
/**
- * Set the optionDRefreshRateMillis.
+ * Set the optiondRefreshRateMillis.
*
- * @param optionDRefreshRateMillis the optionDRefreshRateMillis.
+ * @param optiondRefreshRateMillis the optiondRefreshRateMillis.
* @throws IllegalArgumentException if the refresh rate is not positive
*/
@XmlTransient
- public void setOptiondRefreshRateMillis(long optionDRefreshRateMillis)
+ public void setOptiondRefreshRateMillis(long optiondRefreshRateMillis)
{
- if (optionDRefreshRateMillis <= 0)
- throw new IllegalArgumentException("optionD-refresh-rate must be positive got " + optionDRefreshRateMillis);
- this.optionDRefreshRateMillis = optionDRefreshRateMillis;
+ if (optiondRefreshRateMillis <= 0)
+ throw new IllegalArgumentException("optionD-refresh-rate must be positive got " + optiondRefreshRateMillis);
+ this.optiondRefreshRateMillis = optiondRefreshRateMillis;
}
/**
@@ -474,11 +488,11 @@
*/
public int getOptiondRefreshRate()
{
- return (int) optionDRefreshRateMillis / 1000;
+ return (int) optiondRefreshRateMillis / 1000;
}
/**
- * Set the optionDRefreshRateMillis in seconds.
+ * Set the optiondRefreshRateMillis in seconds.
*
* @param optionDRefreshRateSeconds the optionDRefreshRate in seconds
* @throws IllegalArgumentException if the refresh rate is not positive
@@ -490,6 +504,37 @@
setOptiondRefreshRateMillis(optionDRefreshRateSeconds * 1000);
}
+
+ public Element getContainerPoolConf()
+ {
+ return containerPoolConf;
+ }
+
+ public void setContainerPoolConf(Element containerPoolConf)
+ {
+ this.containerPoolConf = containerPoolConf;
+ }
+
+ public Element getContainerCacheConf()
+ {
+ return containerCacheConf;
+ }
+
+ public void setContainerCacheConf(Element containerCacheConf)
+ {
+ this.containerCacheConf = containerCacheConf;
+ }
+
+ public Element getContainerInterceptors()
+ {
+ return containerInterceptorsConf;
+ }
+
+ public void setContainerInterceptors(Element containerInterceptorsConf)
+ {
+ this.containerInterceptorsConf = containerInterceptorsConf;
+ }
+
/**
* Get the depends.
*
@@ -506,7 +551,7 @@
* @param depends the depends.
* @throws IllegalArgumentException for a null depends
*/
- @XmlElement(type=NonNullLinkedHashSet.class)
+ //@XmlElement(type=NonNullLinkedHashSet.class)
public void setDepends(Set<String> depends)
{
if (depends == null)
@@ -530,7 +575,7 @@
* @param invokerProxyBindingNames the invokerProxyBindingNames.
* @throws IllegalArgumentException for a null invokerProxyBindingNames
*/
- @XmlElement(name="invoker-proxy-binding-name", type=NonNullLinkedHashSet.class)
+ @XmlElement(name="invoker-proxy-binding-name"/*, type=NonNullLinkedHashSet.class*/)
public void setInvokerProxyBindingNames(Set<String> invokerProxyBindingNames)
{
if (invokerProxyBindingNames == null)
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-02 21:54:39 UTC (rev 65775)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-02 21:55:12 UTC (rev 65776)
@@ -456,7 +456,7 @@
* @param depends the depends.
* @throws IllegalArgumentException for a null depends
*/
- @XmlElement(type=NonNullLinkedHashSet.class)
+ @XmlElement(/*type=NonNullLinkedHashSet.class*/)
public void setDepends(Set<String> depends)
{
if (depends == null)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/LoaderRepositoryMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/LoaderRepositoryMetaData.java 2007-10-02 21:54:39 UTC (rev 65775)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/LoaderRepositoryMetaData.java 2007-10-02 21:55:12 UTC (rev 65776)
@@ -24,7 +24,6 @@
import java.util.Set;
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-import org.jboss.metadata.javaee.support.NonNullLinkedHashSet;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
@@ -100,7 +99,7 @@
* @param loaderRepositoryConfig the loaderRepositoryConfig.
* @throws IllegalArgumentException for a null loaderRepositoryConfig
*/
- @XmlElement(type=NonNullLinkedHashSet.class)
+ //@XmlElement(type=NonNullLinkedHashSet.class)
public void setLoaderRepositoryConfig(Set<LoaderRepositoryConfigMetaData> loaderRepositoryConfig)
{
if (loaderRepositoryConfig == null)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/IgnoreDependencyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/IgnoreDependencyMetaData.java 2007-10-02 21:54:39 UTC (rev 65775)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/IgnoreDependencyMetaData.java 2007-10-02 21:55:12 UTC (rev 65776)
@@ -61,7 +61,7 @@
* @param injectionTargets the injectionTargets.
* @throws IllegalArgumentException for a null injectionTargets
*/
- @XmlElement(name="injection-target", type=NonNullLinkedHashSet.class)
+ @XmlElement(name="injection-target"/*, type=NonNullLinkedHashSet.class*/)
public void setInjectionTargets(Set<ResourceInjectionTargetMetaData> injectionTargets)
{
if (injectionTargets == null)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java 2007-10-02 21:54:39 UTC (rev 65775)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java 2007-10-02 21:55:12 UTC (rev 65776)
@@ -27,7 +27,6 @@
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.javaee.support.NamedMetaData;
-import org.jboss.metadata.javaee.support.NonNullLinkedHashSet;
/**
* ResourceInjectionMetaData.
@@ -122,7 +121,7 @@
* @throws IllegalArgumentException for a null injectionTargets
*/
//@SchemaProperty(name="injection-target", impl=NonNullLinkedHashSet.class, mandatory=false)
- @XmlElement(name="injection-target", type=NonNullLinkedHashSet.class, required=false)
+ @XmlElement(name="injection-target", /*type=NonNullLinkedHashSet.class,*/ required=false)
public void setInjectionTargets(Set<ResourceInjectionTargetMetaData> injectionTargets)
{
if (injectionTargets == null)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/SecurityRoleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/SecurityRoleMetaData.java 2007-10-02 21:54:39 UTC (rev 65775)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/SecurityRoleMetaData.java 2007-10-02 21:55:12 UTC (rev 65776)
@@ -91,7 +91,7 @@
* @throws IllegalArgumentException for a null principals
*/
//@SchemaProperty(name="principal", mandatory=false, impl=NonNullLinkedHashSet.class)
- @XmlElement(name="principal", required=false, type=NonNullLinkedHashSet.class)
+ @XmlElement(name="principal", required=false/*, type=NonNullLinkedHashSet.class*/)
public void setPrincipals(Set<String> principals)
{
if (principals == 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-02 21:54:39 UTC (rev 65775)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-02 21:55:12 UTC (rev 65776)
@@ -104,8 +104,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);
}
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-02 21:54:39 UTC (rev 65775)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-10-02 21:55:12 UTC (rev 65776)
@@ -2721,7 +2721,7 @@
<invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2</invoker-proxy-binding-name>
<sync-on-commit-only>true</sync-on-commit-only>
<insert-after-ejb-post-create>true</insert-after-ejb-post-create>
- <ejb-store-on-clean>true</ejb-store-on-clean>
+ <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>
@@ -2791,7 +2791,7 @@
<invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name>
<sync-on-commit-only>false</sync-on-commit-only>
<insert-after-ejb-post-create>false</insert-after-ejb-post-create>
- <ejb-store-on-clean>false</ejb-store-on-clean>
+ <call-ejb-store-on-clean>false</call-ejb-store-on-clean>
<store-not-flushed>false</store-not-flushed>
<!-- TODO container-interceptors -->
<instance-pool>containerConfiguration2InstancePool</instance-pool>
More information about the jboss-cvs-commits
mailing list