[jboss-cvs] JBossAS SVN: r81860 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/client/jboss and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Nov 30 17:12:21 EST 2008
Author: alex.loubyansky at jboss.com
Date: 2008-11-30 17:12:20 -0500 (Sun, 30 Nov 2008)
New Revision: 81860
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/ServiceReferenceHandlerChainsWrapper.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/jboss/LoaderRepositoryMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CacheInvalidationConfigMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/MessagePropertiesMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ActivationConfigMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ApplicationExceptionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AroundInvokeMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AssemblyDescriptorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/CMPFieldMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/CMRFieldMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EntityBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ExcludeListMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InitMethodMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MessageDrivenBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodPermissionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/NamedMethodMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMethodMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleSourceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationsMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RemoveMethodMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SessionBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/LifecycleCallbackMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponentRef.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionTargetMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceHandlerChainMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java
projects/metadata/trunk/src/main/resources/dtd/jboss-app_5_0.dtd
projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd
projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.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_testBaseData.xml
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_testEverythingDTD.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
Log:
JBMETA-142 adding propOrder to @XmlType, moved security-identity element in jboss-5 DTDs out of jndi env ref group elements, added module-order to jboss-app_5_0.dtd (which IMO shouldn't be there but there is a test)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/ServiceReferenceHandlerChainsWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/ServiceReferenceHandlerChainsWrapper.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/ServiceReferenceHandlerChainsWrapper.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -43,7 +43,7 @@
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name = "service-ref_handler-chainsType")
+ at XmlType(name = "service-ref_handler-chainsType", propOrder={"handlers"})
public class ServiceReferenceHandlerChainsWrapper extends ServiceReferenceHandlerChainsMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -44,7 +44,7 @@
namespace="",
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
- at XmlType(name="jboss-clientType", namespace="")
+ at XmlType(name="jboss-clientType", namespace="", propOrder={"jndiName", "jndiEnvironmentRefsGroup", "depends"})
public class JBossClient5DTDMetaData extends JBossClientMetaData
{
private static final long serialVersionUID = 1L;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -44,7 +44,8 @@
namespace=JavaEEMetaDataConstants.JBOSS_NS,
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
- at XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"callbackHandler", "metadataComplete",
+ "descriptionGroup", "jndiName", "jndiEnvironmentRefsGroup", "messageDestinations", "depends"})
public class JBossClient5MetaData extends JBossClientMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -44,7 +44,7 @@
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
@XmlType(name="application-clientType",
- namespace=JavaEEMetaDataConstants.J2EE_NS)
+ namespace=JavaEEMetaDataConstants.J2EE_NS, propOrder={"descriptionGroup", "jndiEnvironmentRefsGroup", "callbackHandler", "messageDestinations"})
public class ApplicationClient14DTDMetaData extends ApplicationClientMetaData
{
private static final long serialVersionUID = 1L;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -45,7 +45,7 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
@XmlType(name="application-clientType",
- namespace=JavaEEMetaDataConstants.J2EE_NS)
+ namespace=JavaEEMetaDataConstants.J2EE_NS, propOrder={"descriptionGroup", "jndiEnvironmentRefsGroup", "callbackHandler", "messageDestinations"})
public class ApplicationClient14MetaData extends ApplicationClientMetaData
{
private static final long serialVersionUID = 1L;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -45,7 +45,7 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
@XmlType(name="application-clientType",
- namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS, propOrder={"descriptionGroup", "jndiEnvironmentRefsGroup", "callbackHandler", "messageDestinations"})
public class ApplicationClient5MetaData extends ApplicationClientMetaData
{
private static final long serialVersionUID = 1L;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/jboss/LoaderRepositoryMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/jboss/LoaderRepositoryMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/jboss/LoaderRepositoryMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -36,7 +36,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="loader-repositoryType")
+ at XmlType(name="loader-repositoryType", propOrder={"loaderRepositoryConfig"})
public class LoaderRepositoryMetaData extends IdMetaDataImpl
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -41,7 +41,8 @@
namespace=JavaEEMetaDataConstants.JBOSS_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
@XmlType(name="jboss-appType",
- namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"moduleOrder", "securityDomain", "unauthenticatedPrincipal", "loaderRepository", "jmxName",
+ "libraryDirectory", "modules", "securityRoles"})
public class JBoss50AppMetaData extends JBossAppMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -41,7 +41,9 @@
namespace="",
elementFormDefault=XmlNsForm.UNSET)
@XmlType(name="jboss-appType",
- namespace="")
+ namespace="",
+ propOrder={"moduleOrder", "securityDomain", "unauthenticatedPrincipal", "loaderRepository", "jmxName", "libraryDirectory", "modules",
+ "securityRoles"})
public class JBoss50DTDAppMetaData extends JBossAppMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -48,7 +48,7 @@
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
@XmlType(name="applicationType",
- namespace="")
+ namespace="", propOrder={"descriptionGroup", "modules", "securityRoles"})
public class Ear13DTDMetaData extends EarMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -43,7 +43,7 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
@XmlType(name="applicationType",
- namespace=JavaEEMetaDataConstants.J2EE_NS)
+ namespace=JavaEEMetaDataConstants.J2EE_NS, propOrder={"descriptionGroup", "modules", "securityRoles"})
public class Ear14MetaData extends EarMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -28,7 +28,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="webType")
+ at XmlType(name="webType", propOrder={"webURI", "contextRoot"})
public class WebModuleMetaData extends AbstractModule
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CacheInvalidationConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CacheInvalidationConfigMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CacheInvalidationConfigMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="cache-invalidation-configType")
+ at XmlType(name="cache-invalidation-configType", propOrder={"invalidationGroupName", "invalidationManagerName"})
public class CacheInvalidationConfigMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -45,7 +45,9 @@
namespace="",
elementFormDefault=XmlNsForm.UNQUALIFIED,
normalizeSpace=true)
- at XmlType(name="jbossType", namespace="")
+ at XmlType(name="jbossType", namespace="", propOrder={"loaderRepository", "jmxName", "enforceEjbRestrictions", "securityDomain",
+ "excludeMissingMethods", "unauthenticatedPrincipal", "exceptionOnRollback", "webservices", "enterpriseBeans", "assemblyDescriptor",
+ "resourceManagers", "invokerProxyBindings", "containerConfigurations"})
public class JBoss50DTDMetaData extends JBossMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -45,12 +45,10 @@
namespace=JavaEEMetaDataConstants.JBOSS_NS,
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
-/*@XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"descriptionGroup", "loaderRepository",
+ at XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"descriptionGroup", "loaderRepository",
"jmxName", "enforceEjbRestrictions", "securityDomain", "excludeMissingMethods", "unauthenticatedPrincipal",
"exceptionOnRollback", "jndiBindingPolicy", "jaccContextID", "webservices", "enterpriseBeans", "assemblyDescriptor",
"resourceManagers"})
-*/
- at XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
public class JBoss50MetaData extends JBossMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -38,7 +38,10 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="jboss-entity-beanType")
+ at XmlType(name="jboss-entity-beanType", propOrder={"ejbName", "jndiName", "localJndiName", "callByValue", "readOnly",
+ "exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "jndiEnvironmentRefsGroup",
+ "securityIdentity", "methodAttributes", "clustered", "clusterConfig", "cacheInvalidation", "cacheInvalidationConfig",
+ "depends", "iorSecurityConfig"})
public class JBossEntityBeanMetaData extends JBossEnterpriseBeanMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/MessagePropertiesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/MessagePropertiesMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/MessagePropertiesMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version <tt>$Revision$</tt>
*/
- at XmlType(name="message-propertiesType")
+ at XmlType(name="message-propertiesType", propOrder={"className", "method", "delivery", "priority"})
public class MessagePropertiesMetaData extends IdMetaDataImpl
{
private MethodAttributeMetaData method;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ActivationConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ActivationConfigMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ActivationConfigMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -32,7 +32,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="activation-configType")
+ at XmlType(name="activation-configType", propOrder={"descriptions", "activationConfigProperties"})
public class ActivationConfigMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ApplicationExceptionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ApplicationExceptionMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ApplicationExceptionMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="application-exceptionType")
+ at XmlType(name="application-exceptionType", propOrder={"exceptionClass", "rollback"})
public class ApplicationExceptionMetaData extends NamedMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AroundInvokeMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AroundInvokeMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AroundInvokeMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -32,7 +32,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="around-invokeType")
+ at XmlType(name="around-invokeType", propOrder={"className", "methodName"})
public class AroundInvokeMetaData implements Serializable
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AssemblyDescriptorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AssemblyDescriptorMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AssemblyDescriptorMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -37,7 +37,8 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="assembly-descriptorType")
+ at XmlType(name="assembly-descriptorType", propOrder={"securityRoles", "methodPermissions", "containerTransactions", "interceptorBindings",
+ "messageDestinations", "excludeList", "applicationExceptions"})
public class AssemblyDescriptorMetaData extends IdMetaDataImpl
implements IAssemblyDescriptorMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/CMPFieldMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/CMPFieldMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/CMPFieldMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="cmp-fieldType")
+ at XmlType(name="cmp-fieldType", propOrder={"descriptions", "fieldName"})
public class CMPFieldMetaData extends NamedMetaDataWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/CMRFieldMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/CMRFieldMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/CMRFieldMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="cmr-fieldType")
+ at XmlType(name="cmr-fieldType", propOrder={"descriptions", "cmrFieldName", "cmrFieldType"})
public class CMRFieldMetaData extends NamedMetaDataWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -35,7 +35,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="container-transactionType")
+ at XmlType(name="container-transactionType", propOrder={"descriptions", "methods", "transAttribute"})
public class ContainerTransactionMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EntityBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EntityBeanMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EntityBeanMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -32,7 +32,9 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="entity-beanType")
+ at XmlType(name="entity-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "home", "remote", "localHome", "local",
+ "ejbClass", "persistenceType", "primKeyClass", "reentrant", "cmpVersion", "abstractSchemaName", "cmpFields", "primKeyField",
+ "jndiEnvironmentRefsGroup", "securityRoleRefs", "securityIdentity", "queries"})
public class EntityBeanMetaData extends EnterpriseBeanMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ExcludeListMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ExcludeListMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ExcludeListMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -32,7 +32,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="exclude-listType")
+ at XmlType(name="exclude-listType", propOrder={"descriptions", "methods"})
public class ExcludeListMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InitMethodMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InitMethodMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InitMethodMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="init-methodType")
+ at XmlType(name="init-methodType", propOrder={"createMethod", "beanMethod"})
public class InitMethodMetaData extends IdMetaDataImpl
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -33,7 +33,8 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="interceptor-bindingType")
+ at XmlType(name="interceptor-bindingType", propOrder={"descriptions", "ejbName", "interceptorClasses", "interceptorOrder",
+ "excludeDefaultInterceptors", "excludeClassInterceptors", "method"})
public class InterceptorBindingMetaData extends NamedMetaDataWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -56,7 +56,8 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="interceptorType")
+ at XmlType(name="interceptorType", propOrder={"descriptions", "interceptorClass", "aroundInvokes", "jndiEnvironmentRefsGroup",
+ "postActivates", "prePassivates"})
public class InterceptorMetaData extends NamedMetaDataWithDescriptions implements Environment
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MessageDrivenBeanMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MessageDrivenBeanMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -36,7 +36,11 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="message-driven-beanType")
+ at XmlType(name="message-driven-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "ejbClass",
+ "transactionType", "messageSelector", "acknowledgeMode", "messageDrivenDestination", // <!-- these are ejb2.x
+ "messagingType",
+ "timeoutMethod", "transactionType", "messageDestinationType", "messageDestinationLink", "activationConfig", "aroundInvokes",
+ "jndiEnvironmentRefsGroup", "securityIdentity"})
public class MessageDrivenBeanMetaData extends EnterpriseBeanMetaData
implements ITimeoutTarget
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -32,7 +32,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="methodType")
+ at XmlType(name="methodType", propOrder={"descriptions", "ejbName", "methodIntf", "methodName", "methodParams"})
public class MethodMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodPermissionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodPermissionMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodPermissionMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -35,7 +35,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="method-permissionType")
+ at XmlType(name="method-permissionType", propOrder={"descriptions", "roles", "unchecked", "methods"})
public class MethodPermissionMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/NamedMethodMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/NamedMethodMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/NamedMethodMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="named-methodType")
+ at XmlType(name="named-methodType", propOrder={"methodName", "methodParams"})
public class NamedMethodMetaData extends NamedMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -33,7 +33,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 1.1 $
*/
- at XmlType(name="queryType")
+ at XmlType(name="queryType", propOrder={"descriptions", "queryMethod", "resultTypeMapping", "ejbQL"})
public class QueryMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMethodMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMethodMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMethodMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="query-methodType")
+ at XmlType(name="query-methodType", propOrder={"methodName", "methodParams"})
public class QueryMethodMetaData extends NamedMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -34,7 +34,8 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="ejb-relationship-roleType")
+ at XmlType(name="ejb-relationship-roleType", propOrder={"descriptions", "ejbRelationshipRoleName", "multiplicity", "cascadeDelete",
+ "roleSource", "cmrField"})
public class RelationRoleMetaData extends NamedMetaDataWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleSourceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleSourceMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleSourceMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="relationship-role-sourceType")
+ at XmlType(name="relationship-role-sourceType", propOrder={"descriptions", "ejbName"})
public class RelationRoleSourceMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationsMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationsMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -38,7 +38,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 1.1 $
*/
- at XmlType(name="relationshipsType")
+ at XmlType(name="relationshipsType", propOrder={"descriptions"})
public class RelationsMetaData extends ArrayList<RelationMetaData>
implements IdMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RemoveMethodMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RemoveMethodMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RemoveMethodMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,7 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="remove-methodType")
+ at XmlType(name="remove-methodType", propOrder={"beanMethod", "retainIfException"})
public class RemoveMethodMetaData extends IdMetaDataImpl
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SessionBeanMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SessionBeanMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -37,7 +37,9 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="session-beanType")
+ at XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "home", "remote", "localHome", "local",
+ "businessLocals", "businessRemotes", "serviceEndpoint", "ejbClass", "sessionType", "timeoutMethod", "initMethods", "removeMethods",
+ "transactionType", "aroundInvokes", "jndiEnvironmentRefsGroup", "postActivates", "prePassivates", "securityRoleRefs", "securityIdentity"})
public class SessionBeanMetaData extends EnterpriseBeanMetaData
implements ITimeoutTarget
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/LifecycleCallbackMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/LifecycleCallbackMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/LifecycleCallbackMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -34,8 +34,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 1.1 $
*/
-//@SchemaType(name="lifecycle-callbackType", mandatory=false)
- at XmlType(name="lifecycle-callbackType")
+ at XmlType(name="lifecycle-callbackType", propOrder={"className", "methodName"})
public class LifecycleCallbackMetaData implements Serializable
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponentRef.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponentRef.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponentRef.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -32,7 +32,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="port-component-refType")
+ at XmlType(name="port-component-refType", propOrder={"serviceEndpointInterface", "enableMtom", "portComponentLink"})
public class PortComponentRef extends IdMetaDataImpl
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PropertyMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PropertyMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -31,8 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-//@SchemaType(name="propertyType", mandatory=false)
- at XmlType(name="propertyType")
+ at XmlType(name="propertyType", propOrder={"name", "value"})
public class PropertyMetaData extends NamedMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionTargetMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionTargetMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionTargetMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -32,8 +32,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-//@SchemaType(name="injection-targetType", mandatory=false)
- at XmlType(name="injection-targetType")
+ at XmlType(name="injection-targetType", propOrder={"injectionTargetClass", "injectionTargetName"})
public class ResourceInjectionTargetMetaData implements Serializable
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceHandlerChainMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceHandlerChainMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceHandlerChainMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -36,7 +36,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 1.1 $
*/
- at XmlType(name="service-ref_handler-chainType")
+ at XmlType(name="service-ref_handler-chainType", propOrder={"serviceNamePattern", "portNamePattern", "protocolBindings", "handler"})
public class ServiceReferenceHandlerChainMetaData
extends IdMetaDataImpl
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -39,7 +39,8 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="service-refType")
+ at XmlType(name="service-refType", propOrder={"descriptionGroup", "serviceRefName", "serviceInterface", "serviceRefType", "wsdlFile",
+ "jaxrpcMappingFile", "serviceQname", "portComponentRef", "handlers", "handlerChains", "mappedName", "injectionTargets"})
public class ServiceReferenceMetaData extends ResourceInjectionMetaDataWithDescriptionGroup
implements MergeableMappedMetaData<ServiceReferenceMetaData>
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -40,7 +40,9 @@
namespace="",
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
- at XmlType(name="jboss-webType", namespace="")
+ at XmlType(name="jboss-webType", namespace="", propOrder={"classLoading", "securityDomain", "jaccAllStoreRole", "contextRoot",
+ "virtualHosts", "useSessionCookies", "replicationConfig", "jndiEnvironmentRefsGroup", "securityRoles", "messageDestinations",
+ "webserviceDescriptions", "depends", "servlets", "maxActiveSessions", "passivationConfig"})
public class JBoss50DTDWebMetaData extends JBossWebMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -39,7 +39,10 @@
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JBOSS_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="jboss-webType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at XmlType(name="jboss-webType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"classLoading", "securityDomain",
+ "jaccAllStoreRole", "contextRoot",
+ "virtualHosts", "useSessionCookies", "replicationConfig", "jndiEnvironmentRefsGroup", "securityRoles", "messageDestinations",
+ "webserviceDescriptions", "depends", "servlets", "maxActiveSessions", "passivationConfig"})
public class JBoss50WebMetaData extends JBossWebMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -23,7 +23,10 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
@XmlType(name="web-appType",
- namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+ propOrder={"descriptionGroup", "distributable", "contextParams", "filters", "filterMappings", "listeners", "servlets",
+ "servletMappings", "sessionConfig", "mimeMappings", "welcomeFileList", "errorPages", "jspConfig", "securityContraints",
+ "loginConfig", "securityRoles", "jndiEnvironmentRefsGroup", "messageDestinations", "localEncodings"})
public class Web25MetaData extends WebMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/resources/dtd/jboss-app_5_0.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss-app_5_0.dtd 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss-app_5_0.dtd 2008-11-30 22:12:20 UTC (rev 81860)
@@ -10,10 +10,27 @@
<!-- The jboss-app element is the root element.
-->
-<!ELEMENT jboss-app (security-domain?, unauthenticated-principal?,
+<!ELEMENT jboss-app (module-order?, security-domain?, unauthenticated-principal?,
loader-repository?, jmx-name?, library-directory?, module*, security-role*)>
+
<!--
+NOTE: legacy element from 4.x. Has absolutely no effect in JBoss_5.x.
+
+ The value of the module-order could be implicit or strict
+ <module-order>strict</module-order>
+ or
+ <module-order>implicit</module-order>
+ The strict value indicates that the deployments of the modules will
+ be done in the order that would be specified in the application.xml
+ and jboss-app.xml file .
+ The implicit value indicates the deployment would follow the order
+ which would be specified in the DeploymentSorter.
+ The default order will be implicit to support backward compatibility
+-->
+<!ELEMENT module-order (#PCDATA)>
+
+<!--
The security-domain element specifies the JNDI name of the security
manager that implements the EJBSecurityManager and RealmMapping for
the domain. When specified at the jboss level it specifies the security
Modified: projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd 2008-11-30 22:12:20 UTC (rev 81860)
@@ -22,9 +22,9 @@
-->
<!ELEMENT jboss-web (class-loading?, security-domain?, jacc-star-role-allow?, context-root?,
virtual-host*, use-session-cookies?, replication-config?, resource-env-ref*,
- resource-ref*, security-role*, ejb-ref*, ejb-local-ref*,
- message-destination-ref*, message-destination*,
- webservice-description*, service-ref*, depends*, servlet*, max-active-sessions?, passivation-config?)>
+ ejb-ref*, ejb-local-ref*, service-ref*, resource-ref*,
+ message-destination-ref*, security-role*, message-destination*,
+ webservice-description*, depends*, servlet*, max-active-sessions?, passivation-config?)>
<!-- The class-loading element allows one to override the default class
loading behavior of the web container. You can specify the
Modified: projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd 2008-11-30 22:12:20 UTC (rev 81860)
@@ -499,8 +499,8 @@
-->
<!ELEMENT entity (ejb-name , jndi-name? , local-jndi-name? , call-by-value?, read-only?,
exception-on-rollback?, timer-persistence?, configuration-name? , invoker-bindings?,
- security-proxy? , ejb-ref* , ejb-local-ref* , service-ref*, security-identity? ,
- resource-ref* , resource-env-ref*, message-destination-ref* , method-attributes? ,
+ security-proxy? , ejb-ref* , ejb-local-ref* , service-ref*,
+ resource-ref* , resource-env-ref*, message-destination-ref* , security-identity?, method-attributes? ,
clustered? , cluster-config?, cache-invalidation? , cache-invalidation-config?,
depends*, ior-security-config?)>
<!-- Allow the entity to have a unique id -->
@@ -517,8 +517,8 @@
-->
<!ELEMENT session (ejb-name , jndi-name? , home-jndi-name?, local-jndi-name?, call-by-value?,
exception-on-rollback?, timer-persistence?, configuration-name?, invoker-bindings?,
- security-proxy? , ejb-ref* , ejb-local-ref* , service-ref*, security-identity? ,
- resource-ref* , resource-env-ref*, message-destination-ref* , clustered? ,
+ security-proxy? , ejb-ref* , ejb-local-ref* , service-ref* ,
+ resource-ref* , resource-env-ref*, message-destination-ref* , security-identity?, clustered? ,
cluster-config?, method-attributes?, depends*,
ior-security-config?, port-component?, ejb-timeout-identity?)>
<!-- Allow the session to have a unique id -->
@@ -537,8 +537,8 @@
local-jndi-name?,
mdb-user?, mdb-passwd? , mdb-client-id? , mdb-subscription-id? , resource-adapter-name? ,
exception-on-rollback?, timer-persistence?, configuration-name? , invoker-bindings?,
- security-proxy? , ejb-ref* , ejb-local-ref*, service-ref*, security-identity?, resource-ref*,
- resource-env-ref*, message-destination-ref*, depends*, ior-security-config?,
+ security-proxy? , ejb-ref* , ejb-local-ref*, service-ref*, resource-ref*,
+ resource-env-ref*, message-destination-ref*, security-identity?, depends*, ior-security-config?,
ejb-timeout-identity?)>
<!-- Allow the message-driven to have a unique id -->
<!ATTLIST message-driven id ID #IMPLIED>
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -125,7 +125,7 @@
// Basic check if EjbReferences.invokerBindings are merged
assertEjbReferenceInvokerBindings(ejb);
- assertInvokerBindings(jbossMetaData.getInvokerProxyBindings());
+ //this is ejb2 only? assertInvokerBindings(jbossMetaData.getInvokerProxyBindings());
}
/**
@@ -167,7 +167,7 @@
// Basic check if EjbReferences.invokerBindings are merged
assertEjbReferenceInvokerBindings(ejb);
- assertInvokerBindings(mergedMetaData.getInvokerProxyBindings());
+ // this is ejb2 only? assertInvokerBindings(mergedMetaData.getInvokerProxyBindings());
}
/**
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 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2008-11-30 22:12:20 UTC (rev 81860)
@@ -329,11 +329,14 @@
assertResourceManagers(jbossMetaData.getResourceManagers(), mode);
assertResourceManager("resourceManager1", true, jbossMetaData.getResourceManager("resourceManager1Name"), mode);
assertResourceManager("resourceManager2", false, jbossMetaData.getResourceManager("resourceManager2Name"), mode);
- if(hasStandardJBoss == false)
- assertInvokerProxyBindings(jbossMetaData.getInvokerProxyBindings(), mode);
- assertInvokerProxyBinding("invokerProxyBinding1", 1, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding1Name"), mode);
- assertInvokerProxyBinding("invokerProxyBinding2", 2, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding2Name"), mode);
- assertContainerConfigurations(jbossMetaData, mode);
+ if(mode == Mode.JBOSS_DTD)
+ {
+ if(hasStandardJBoss == false)
+ assertInvokerProxyBindings(jbossMetaData.getInvokerProxyBindings(), mode);
+ assertInvokerProxyBinding("invokerProxyBinding1", 1, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding1Name"), mode);
+ assertInvokerProxyBinding("invokerProxyBinding2", 2, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding2Name"), mode);
+ assertContainerConfigurations(jbossMetaData, mode);
+ }
}
private void assertVersion(JBossMetaData jbossMetaData)
@@ -522,7 +525,12 @@
assertSecurityIdentity(prefix, "SecurityIdentity", session.getSecurityIdentity(), false, mode);
- assertClusterConfig(prefix, session.determineClusterConfig(), true, mode);
+ ClusterConfigMetaData clusterConfig = null;
+ if(mode == Mode.JBOSS)
+ clusterConfig = session.getClusterConfig();
+ else
+ clusterConfig = session.determineClusterConfig();
+ assertClusterConfig(prefix, clusterConfig, true, mode);
assertMethodAttributes(prefix, session.getMethodAttributes(), mode);
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml 2008-11-30 22:12:20 UTC (rev 81860)
@@ -92,10 +92,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>session1ResourceRef1Name</res-ref-name>
<jndi-name>session1ResourceRef1JndiName</jndi-name>
@@ -125,6 +121,10 @@
<jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity>
+ <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>true</clustered>
<cluster-config>
@@ -229,10 +229,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>session2ResourceRef1Name</res-ref-name>
<jndi-name>session2ResourceRef1JndiName</jndi-name>
@@ -261,6 +257,10 @@
<message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<clustered>false</clustered>
@@ -370,10 +370,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>entity1ResourceRef1Name</res-ref-name>
<jndi-name>entity1ResourceRef1JndiName</jndi-name>
@@ -402,6 +398,10 @@
<message-destination-ref-name>entity1MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>entity1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<method-attributes>
<method>
@@ -500,10 +500,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>entity2ResourceRef1Name</res-ref-name>
<jndi-name>entity2ResourceRef1JndiName</jndi-name>
@@ -532,6 +528,10 @@
<message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>entity2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<method-attributes>
<method>
@@ -637,10 +637,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>mdb1ResourceRef1Name</res-ref-name>
<jndi-name>mdb1ResourceRef1JndiName</jndi-name>
@@ -669,6 +665,10 @@
<message-destination-ref-name>mdb1MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>mdb1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<depends>mdb1Depends1</depends>
<depends>mdb1Depends2</depends>
@@ -748,10 +748,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>mdb2ResourceRef1Name</res-ref-name>
<jndi-name>mdb2ResourceRef1JndiName</jndi-name>
@@ -780,6 +776,10 @@
<message-destination-ref-name>mdb2MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>mdb2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<depends>mdb2Depends1</depends>
<depends>mdb2Depends2</depends>
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 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2008-11-30 22:12:20 UTC (rev 81860)
@@ -1930,214 +1930,5 @@
<res-url>resourceManager2URL</res-url>
</resource-manager>
</resource-managers>
-
- <invoker-proxy-bindings id="invoker-proxy-bindings-id">
- <description>en-invoker-proxy-bindings-desc</description>
- <description xml:lang="fr">fr-invoker-proxy-bindings-desc</description>
- <description xml:lang="de">de-invoker-proxy-bindings-desc</description>
- <invoker-proxy-binding id="invokerProxyBinding1-id">
- <description>en-invokerProxyBinding1-desc</description>
- <description xml:lang="fr">fr-invokerProxyBinding1-desc</description>
- <description xml:lang="de">de-invokerProxyBinding1-desc</description>
- <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
- <invoker-mbean>invokerProxyBinding1InvokerMBean</invoker-mbean>
- <proxy-factory>invokerProxyBinding1ProxyFactory</proxy-factory>
- </invoker-proxy-binding>
- <invoker-proxy-binding id="invokerProxyBinding2-id">
- <description>en-invokerProxyBinding2-desc</description>
- <description xml:lang="fr">fr-invokerProxyBinding2-desc</description>
- <description xml:lang="de">de-invokerProxyBinding2-desc</description>
- <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>
-
- <container-configurations id="container-configurations-id">
- <description>en-container-configurations-desc</description>
- <description xml:lang="fr">fr-container-configurations-desc</description>
- <description xml:lang="de">de-container-configurations-desc</description>
-
- <container-configuration>
- <container-name>containerConfiguration1Extends</container-name>
- </container-configuration>
- <container-configuration>
- <container-name>containerConfiguration2Extends</container-name>
- </container-configuration>
-
- <container-configuration extends="Standard Stateless SessionBean">
- <container-name>session1ConfigurationName</container-name>
- </container-configuration>
- <container-configuration extends="Standard Stateless SessionBean">
- <container-name>session2ConfigurationName</container-name>
- </container-configuration>
- <container-configuration extends="Standard CMP 2.x EntityBean">
- <container-name>entity1ConfigurationName</container-name>
- </container-configuration>
- <container-configuration extends="Standard CMP 2.x EntityBean">
- <container-name>entity2ConfigurationName</container-name>
- </container-configuration>
- <container-configuration extends="Standard Message Inflow Driven Bean">
- <container-name>mdb1ConfigurationName</container-name>
- </container-configuration>
- <container-configuration extends="Standard Message Inflow Driven Bean">
- <container-name>mdb2ConfigurationName</container-name>
- </container-configuration>
-
- <container-configuration>
- <container-name>containerConfiguration0Name</container-name>
- </container-configuration>
- <container-configuration id="containerConfiguration1-id" extends="containerConfiguration1Extends">
- <description>en-containerConfiguration1-desc</description>
- <description xml:lang="fr">fr-containerConfiguration1-desc</description>
- <description xml:lang="de">de-containerConfiguration1-desc</description>
- <container-name>containerConfiguration1Name</container-name>
- <call-logging>true</call-logging>
- <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1</invoker-proxy-binding-name>
- <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>
- <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
- <store-not-flushed>true</store-not-flushed>
- <container-interceptors>
- <interceptor>containerConfiguration1.Interceptor1</interceptor>
- <interceptor>containerConfiguration1.Interceptor2</interceptor>
- <!-- CMT -->
- <interceptor transaction="Container">containerConfiguration1.Interceptor3c</interceptor>
- <!-- BMT -->
- <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>
- <container-cache-conf>
- <cache-policy>containerConfiguration1.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="containerConfiguration1-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>
- <cluster-config id="containerConfiguration1ClusterConfig-id">
- <description>en-containerConfiguration1ClusterConfig-desc</description>
- <description xml:lang="fr">fr-containerConfiguration1ClusterConfig-desc</description>
- <description xml:lang="de">de-containerConfiguration1ClusterConfig-desc</description>
- <partition-name>containerConfiguration1ClusterConfigPartitionName</partition-name>
- <home-load-balance-policy>containerConfiguration1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
- <bean-load-balance-policy>containerConfiguration1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
- <session-state-manager-jndi-name>containerConfiguration1ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
- </cluster-config>
- <depends>containerConfiguration1Depends1</depends>
- <depends>containerConfiguration1Depends2</depends>
- </container-configuration>
- <container-configuration id="containerConfiguration2-id" extends="containerConfiguration2Extends">
- <description>en-containerConfiguration2-desc</description>
- <description xml:lang="fr">fr-containerConfiguration2-desc</description>
- <description xml:lang="de">de-containerConfiguration2-desc</description>
- <container-name>containerConfiguration2Name</container-name>
- <call-logging>false</call-logging>
- <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName1</invoker-proxy-binding-name>
- <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>
- <call-ejb-store-on-clean>false</call-ejb-store-on-clean>
- <store-not-flushed>false</store-not-flushed>
- <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>
- <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>
- <cluster-config id="containerConfiguration2ClusterConfig-id">
- <description>en-containerConfiguration2ClusterConfig-desc</description>
- <description xml:lang="fr">fr-containerConfiguration2ClusterConfig-desc</description>
- <description xml:lang="de">de-containerConfiguration2ClusterConfig-desc</description>
- <partition-name>containerConfiguration2ClusterConfigPartitionName</partition-name>
- <home-load-balance-policy>containerConfiguration2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
- <bean-load-balance-policy>containerConfiguration2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
- <session-state-manager-jndi-name>containerConfiguration2ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
- </cluster-config>
- <depends>containerConfiguration2Depends1</depends>
- <depends>containerConfiguration2Depends2</depends>
- </container-configuration>
- <container-configuration>
- <container-name>containerConfiguration3Name</container-name>
- <commit-option>B</commit-option>
- </container-configuration>
- <container-configuration>
- <container-name>containerConfiguration4Name</container-name>
- <commit-option>C</commit-option>
- </container-configuration>
- </container-configurations>
-
+
</jboss>
\ No newline at end of file
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml 2008-11-30 22:12:20 UTC (rev 81860)
@@ -103,10 +103,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>session1ResourceRef1Name</res-ref-name>
<jndi-name>session1ResourceRef1JndiName</jndi-name>
@@ -136,6 +132,10 @@
<jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity>
+ <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>true</clustered>
<cluster-config>
<partition-name>session1ClusterConfigPartitionName</partition-name>
@@ -245,10 +245,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>session2ResourceRef1Name</res-ref-name>
<jndi-name>session2ResourceRef1JndiName</jndi-name>
@@ -277,6 +273,11 @@
<message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>false</clustered>
<cluster-config>
<partition-name>session2ClusterConfigPartitionName</partition-name>
@@ -388,10 +389,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>entity1ResourceRef1Name</res-ref-name>
<jndi-name>entity1ResourceRef1JndiName</jndi-name>
@@ -421,6 +418,10 @@
<jndi-name>entity1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity>
+ <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<method-attributes>
<method>
<method-name>get*</method-name>
@@ -528,10 +529,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>entity2ResourceRef1Name</res-ref-name>
<jndi-name>entity2ResourceRef1JndiName</jndi-name>
@@ -560,6 +557,11 @@
<message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>entity2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<method-attributes>
<method>
<method-name>get*</method-name>
@@ -669,10 +671,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>mdb1ResourceRef1Name</res-ref-name>
<jndi-name>mdb1ResourceRef1JndiName</jndi-name>
@@ -702,6 +700,10 @@
<jndi-name>mdb1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity>
+ <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<depends>mdb1Depends1</depends>
<depends>mdb1Depends2</depends>
<ior-security-config>
@@ -786,10 +788,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>mdb2ResourceRef1Name</res-ref-name>
<jndi-name>mdb2ResourceRef1JndiName</jndi-name>
@@ -818,6 +816,11 @@
<message-destination-ref-name>mdb2MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>mdb2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<depends>mdb2Depends1</depends>
<depends>mdb2Depends2</depends>
<ior-security-config>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml 2008-11-30 22:08:50 UTC (rev 81859)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml 2008-11-30 22:12:20 UTC (rev 81860)
@@ -89,10 +89,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>session1ResourceRef1Name</res-ref-name>
<jndi-name>session1ResourceRef1JndiName</jndi-name>
@@ -121,6 +117,10 @@
<message-destination-ref-name>session1MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<clustered>true</clustered>
@@ -222,10 +222,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>session2ResourceRef1Name</res-ref-name>
<jndi-name>session2ResourceRef1JndiName</jndi-name>
@@ -254,6 +250,10 @@
<message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<clustered>false</clustered>
@@ -360,10 +360,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>entity1ResourceRef1Name</res-ref-name>
<jndi-name>entity1ResourceRef1JndiName</jndi-name>
@@ -392,6 +388,10 @@
<message-destination-ref-name>entity1MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>entity1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<method-attributes>
<method>
@@ -488,10 +488,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>entity2ResourceRef1Name</res-ref-name>
<jndi-name>entity2ResourceRef1JndiName</jndi-name>
@@ -520,6 +516,10 @@
<message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>entity2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<method-attributes>
<method>
@@ -623,10 +623,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>mdb1ResourceRef1Name</res-ref-name>
<jndi-name>mdb1ResourceRef1JndiName</jndi-name>
@@ -655,6 +651,10 @@
<message-destination-ref-name>mdb1MessageDestinationRef3Name</message-destination-ref-name>
<jndi-name>mdb1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity>
+ <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<depends>mdb1Depends1</depends>
<depends>mdb1Depends2</depends>
@@ -732,10 +732,6 @@
<!-- TODO service-ref -->
- <security-identity>
- <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref>
<res-ref-name>mdb2ResourceRef1Name</res-ref-name>
<jndi-name>mdb2ResourceRef1JndiName</jndi-name>
@@ -765,6 +761,10 @@
<jndi-name>mdb2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity>
+ <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<depends>mdb2Depends1</depends>
<depends>mdb2Depends2</depends>
More information about the jboss-cvs-commits
mailing list