[jboss-cvs] JBossAS SVN: r84989 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/client/jboss and 27 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 2 06:40:53 EST 2009
Author: alex.loubyansky at jboss.com
Date: 2009-03-02 06:40:52 -0500 (Mon, 02 Mar 2009)
New Revision: 84989
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss4xDTDWebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWeb4xEnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/SchemaVersionUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion30.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion32.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion40.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion42.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion50.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion50xsd.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion51.xml
Removed:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion30.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion32.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion40.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion42.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion50.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion50xsd.xml
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient51MetaData.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/jboss/JBossClientMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationMetaData.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/JBossConsumerBeanMetaData.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/JBossEntityBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.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/MessageDrivenBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SessionBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBLocalReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/IconImpl.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ParamValueMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/RaConfigPropertyMetaData.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/jboss/JBossWebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss-client_5_0.xsd
projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd
projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/HandlerChainsTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEMetaDataTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/JBossProcessingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5_test4915.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.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/web/WebApp24_testRunAsPrincipal.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testSecurityConstraint.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
Log:
JBMETA-142, JBMETA-39, JBMETA-159
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -114,7 +114,7 @@
protected JBoss50MetaData create()
{
JBoss50MetaData metaData = new JBoss50MetaData();
- metaData.setVersion("3.0");
+ metaData.setVersion("5.0");
metaData.setEjbVersion("3.0");
return metaData;
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient51MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient51MetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient51MetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -48,7 +48,7 @@
normalizeSpace=true)
@XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS,
propOrder={"descriptionGroup", "callbackHandler", "metadataComplete",
- "jndiName", "jndiEnvironmentRefsGroup", "messageDestinations", "depends"})
+ "jndiName", "environmentRefsGroup", "messageDestinations", "depends"})
public class JBossClient51MetaData extends JBossClientMetaData
{
private static final long serialVersionUID = 1;
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -44,7 +44,7 @@
namespace="",
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
- at XmlType(name="jboss-clientType", namespace="", propOrder={"jndiName", "jndiEnvironmentRefsGroup", "depends"})
+ at XmlType(name="jboss-clientType", namespace="", propOrder={"jndiName", "environmentRefsGroup", "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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -45,7 +45,7 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
@XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"callbackHandler", "metadataComplete",
- "descriptionGroup", "jndiName", "jndiEnvironmentRefsGroup", "messageDestinations", "depends"})
+ "descriptionGroup", "jndiName", "environmentRefsGroup", "messageDestinations", "depends"})
public class JBossClient5MetaData extends JBossClientMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -26,7 +26,6 @@
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
@@ -183,7 +182,8 @@
{
return jndiEnvironmentRefsGroup;
}
- @XmlElement(type=JBossEnvironmentRefsGroupMetaData.class)
+
+ @XmlTransient
public void setJndiEnvironmentRefsGroup(Environment jndiEnvironmentRefsGroup)
{
if(jndiEnvironmentRefsGroup == null)
@@ -191,6 +191,12 @@
this.jndiEnvironmentRefsGroup = (JBossEnvironmentRefsGroupMetaData) jndiEnvironmentRefsGroup;
}
+ // for xml binding to expose the correct model group type
+ public void setEnvironmentRefsGroup(JBossEnvironmentRefsGroupMetaData env)
+ {
+ this.setJndiEnvironmentRefsGroup(env);
+ }
+
// Convinence accessors
/**
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -21,14 +21,26 @@
*/
package org.jboss.metadata.ear.spec;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlValue;
+import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlModelGroup;
/**
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
+ at JBossXmlModelGroup(
+ kind=JBossXmlConstants.MODEL_GROUP_CHOICE,
+ particles={
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="connector"), type=ConnectorModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="ejb"), type=EjbModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="java"), type=JavaModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="web"), type=WebModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="service"), type=ServiceModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="har"), type=ServiceModuleMetaData.class)})
public class AbstractModule extends IdMetaDataImpl
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -22,6 +22,7 @@
package org.jboss.metadata.ear.spec;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -35,8 +36,8 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="moduleType")
- at JBossXmlChildren
+ at XmlType(name="moduleType", propOrder={"value", "alternativeDD"})
+/*@JBossXmlChildren
({
@JBossXmlChild(name="connector", type=ConnectorModuleMetaData.class),
@JBossXmlChild(name="ejb", type=EjbModuleMetaData.class),
@@ -45,7 +46,7 @@
@JBossXmlChild(name="service", type=ServiceModuleMetaData.class),
@JBossXmlChild(name="har", type=ServiceModuleMetaData.class)
})
-public class ModuleMetaData extends NamedMetaData
+*/public class ModuleMetaData extends NamedMetaData
{
private static final long serialVersionUID = 1;
private AbstractModule module;
@@ -57,16 +58,19 @@
{
return module;
}
+
public void setValue(AbstractModule value)
{
this.module = value;
// Set the mappable name to the module file name
super.setName(value.getFileName());
}
+
public String getAlternativeDD()
{
return altDD;
}
+
@XmlElement(name="alt-dd")
public void setAlternativeDD(String altDD)
{
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -41,12 +41,12 @@
propOrder={"descriptions", "containerName",
"callLogging", "invokerProxyBindingNames",
"syncOnCommitOnly", "insertAfterEjbPostCreate",
- "ejbStoreOnClean", "storeNotFlushed", "instancePool",
- "instanceCache", "persistenceManager",
+ "ejbStoreOnClean", "storeNotFlushed", "containerInterceptors",
+ "instancePool", "instanceCache", "persistenceManager",
"webClassLoader", "lockingPolicy",
+ "containerCacheConf", "containerPoolConf",
"commitOption", "optiondRefreshRate", "securityDomain",
- "clusterConfig", "depends",
- "containerPoolConf", "containerCacheConf", "containerInterceptors"}
+ "clusterConfig", "depends"}
)
public class ContainerConfigurationMetaData extends NamedMetaDataWithDescriptions
{
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.ejb.jboss;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
@@ -61,6 +62,17 @@
{
// For serialization
}
+
+/* public String getVersion()
+ {
+ return "5.0";
+ }
+*/
+ @XmlAttribute
+ public void setVersion(String v)
+ {
+ super.setVersion(v);
+ }
@Override
@XmlElementWrapper(name="enterprise-beans")
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -39,7 +39,7 @@
*/
@XmlType(name="consumer-beanType", propOrder={"descriptionGroup", "ejbName", "ejbClass", "messageDestination",
"messageDestinationType", "producers", "localProducers", "currentMessage", "messageProperties", "mappedName",
- "localJndiName", "jndiBindingPolicy", "jndiEnvironmentRefsGroup", "securityDomain", "methodAttributes", "depends",
+ "localJndiName", "jndiBindingPolicy", "environmentRefsGroup", "securityDomain", "methodAttributes", "depends",
"annotations", "ignoreDependency", "aopDomainName", "poolConfig", "jndiRefs", "activationConfig", "defaultActivationConfig"})
public class JBossConsumerBeanMetaData extends JBossEnterpriseBeanMetaData
{
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -295,7 +295,7 @@
return jndiEnvironmentRefsGroup;
}
- @XmlElement(type=JBossEnvironmentRefsGroupMetaData.class)
+ @XmlTransient
public void setJndiEnvironmentRefsGroup(Environment env)
{
if (env == null)
@@ -307,6 +307,12 @@
jndiEnvironmentRefsGroup = jenv;
}
+ // just for XML binding, to expose the type of the model group
+ public void setEnvironmentRefsGroup(JBossEnvironmentRefsGroupMetaData env)
+ {
+ this.setJndiEnvironmentRefsGroup(env);
+ }
+
/**
* Get the ejbName.
*
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -30,6 +30,8 @@
import org.jboss.metadata.ejb.spec.PersistenceType;
import org.jboss.metadata.ejb.spec.QueriesMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* EntityBeanMetaData.
@@ -39,9 +41,11 @@
* @version $Revision$
*/
@XmlType(name="jboss-entity-beanType", propOrder={"ejbName", "jndiName", "localJndiName", "callByValue", "readOnly",
- "exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "jndiEnvironmentRefsGroup",
+ "exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "environmentRefsGroup",
"securityIdentity", "methodAttributes", "clustered", "clusterConfig", "cacheInvalidation", "cacheInvalidationConfig",
"depends", "iorSecurityConfig"})
+// unordered for pre-jboss-5_0.dtd
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class JBossEntityBeanMetaData extends JBossEnterpriseBeanMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -32,7 +32,7 @@
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version $Revision$
*/
- at XmlType(name="generic-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "jndiEnvironmentRefsGroup",
+ at XmlType(name="generic-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "environmentRefsGroup",
"securityIdentity", "jndiName", "homeJndiName", "exceptionOnRollback", "timerPersistence", "configurationName",
"invokerBindings", "securityProxy", "localJndiName", "localHomeJndiName",
"jndiBindingPolicy", "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -33,6 +33,8 @@
import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.ejb.spec.SubscriptionDurability;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* MessageDrivenBeanMetaData.
@@ -43,9 +45,11 @@
@XmlType(name="message-driven-beanType", propOrder={"descriptionGroup", "ejbName", "activationConfig", "destinationJndiName", "localJndiName",
"jndiBindingPolicy", "mdbUser", "mdbPassword", "mdbClientId", "mdbSubscriptionId", "resourceAdapterName",
"exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy",
- "jndiEnvironmentRefsGroup", "securityIdentity", "securityDomain", "methodAttributes", "depends", "iorSecurityConfig",
+ "environmentRefsGroup", "securityIdentity", "securityDomain", "methodAttributes", "depends", "iorSecurityConfig",
"ejbTimeoutIdentity", "annotations", "ignoreDependency", "aopDomainName", "poolConfig",
"jndiRefs", "createDestination"})
+// unordered for pre-jboss-5_0.dtd
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class JBossMessageDrivenBeanMetaData extends JBossEnterpriseBeanMetaData implements ITimeoutTarget
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -30,7 +30,7 @@
* @version $Revision$
*/
@XmlType(name="service-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "businessLocals", "businessRemotes",
- "ejbClass", "jndiEnvironmentRefsGroup", "securityIdentity", "objectName", "management", "xmbean", "localBindings",
+ "ejbClass", "environmentRefsGroup", "securityIdentity", "objectName", "management", "xmbean", "localBindings",
"remoteBindings", "jndiName", "homeJndiName", "callByValue",
"exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "localJndiName",
"jndiBindingPolicy", "clustered",
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -29,12 +29,12 @@
* @author <a href="alex at jboss.com">Alexey Loubyansky</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "jndiEnvironmentRefsGroup",
+ at XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "environmentRefsGroup",
"securityIdentity", "localBindings", "remoteBindings", "businessLocals", "businessRemotes",
"jndiName", "homeJndiName", "callByValue",
"exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "localJndiName",
- "localHomeJndiName", "jndiBindingPolicy", "clustered",
- "clusterConfig", "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
+ "localHomeJndiName", "jndiBindingPolicy", "clustered", "clusterConfig",
+ "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
"cacheConfig", "poolConfig", "concurrent", "jndiRefs", "portComponent", "ejbTimeoutIdentity", "iorSecurityConfig"})
public class JBossSessionBeanJBoss50MetaData extends JBossSessionBeanMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -40,6 +40,8 @@
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.PortComponent;
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* SessionBeanMetaData.
@@ -48,13 +50,15 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "jndiEnvironmentRefsGroup",
- "securityIdentity", "localBindings", "remoteBindings", "businessLocals", "businessRemotes",
- "jndiName", "homeJndiName", "callByValue",
- "exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "localJndiName",
- "localHomeJndiName", "jndiBindingPolicy", "clustered",
- "clusterConfig", "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
- "cacheConfig", "poolConfig", "concurrent", "jndiRefs", "portComponent", "ejbTimeoutIdentity", "iorSecurityConfig"})
+ at XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "jndiName", "homeJndiName", "localJndiName",
+ "localHomeJndiName",
+ "callByValue", "exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy",
+ "environmentRefsGroup",
+ "securityIdentity",
+ "clustered", "clusterConfig", "securityDomain", "methodAttributes", "depends",
+ "iorSecurityConfig", "portComponent", "ejbTimeoutIdentity"})
+// unordered for pre-jboss-5_0.dtd
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class JBossSessionBeanMetaData extends JBossEnterpriseBeanMetaData implements ITimeoutTarget
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -316,7 +316,7 @@
* @param jndiEnvironmentRefsGroup the jndiEnvironmentRefsGroup.
* @throws IllegalArgumentException for a null jndiEnvironmentRefsGroup
*/
- @XmlElement(type=EnvironmentRefsGroupMetaData.class)
+ @XmlTransient
public void setJndiEnvironmentRefsGroup(Environment jndiEnvironmentRefsGroup)
{
if (jndiEnvironmentRefsGroup == null)
@@ -329,6 +329,12 @@
this.jndiEnvironmentRefsGroup = env;
}
+ // just for XML binding, to expose the type of the model group
+ public void setEnvironmentRefsGroup(EnvironmentRefsGroupMetaData env)
+ {
+ setJndiEnvironmentRefsGroup(env);
+ }
+
/**
* Get the securityIdentity.
*
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EntityBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -25,6 +25,8 @@
import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* EntityBeanMetaData.
@@ -34,7 +36,8 @@
*/
@XmlType(name="entity-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "home", "remote", "localHome", "local",
"ejbClass", "persistenceType", "primKeyClass", "reentrant", "cmpVersion", "abstractSchemaName", "cmpFields", "primKeyField",
- "jndiEnvironmentRefsGroup", "securityRoleRefs", "securityIdentity", "queries"})
+ "environmentRefsGroup", "securityRoleRefs", "securityIdentity", "queries"})
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class EntityBeanMetaData extends EnterpriseBeanMetaData
{
/** 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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MessageDrivenBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -29,6 +29,8 @@
import org.jboss.metadata.common.ejb.ITimeoutTarget;
import org.jboss.metadata.javaee.spec.TransactionManagementTypeAdapter;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* MessageDrivenBeanMetaData.
@@ -40,7 +42,8 @@
"transactionType", "messageSelector", "acknowledgeMode", "messageDrivenDestination", // <!-- these are ejb2.x
"messagingType",
"timeoutMethod", "transactionType", "messageDestinationType", "messageDestinationLink", "activationConfig", "aroundInvokes",
- "jndiEnvironmentRefsGroup", "securityIdentity"})
+ "environmentRefsGroup", "securityIdentity"})
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class MessageDrivenBeanMetaData extends EnterpriseBeanMetaData
implements ITimeoutTarget
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;
import org.jboss.xb.annotations.JBossXmlConstants;
@@ -37,7 +38,7 @@
* @version $Revision: 1.1 $
*/
// TODO it's currently bound as a choice with single particle...
-//@XmlType(name="ejb-relationType")
+ at XmlType(name="ejb-relationType", propOrder={"descriptions", "ejbRelationName", "ejbRelationshipRoles"})
@JBossXmlModelGroup(
kind=JBossXmlConstants.MODEL_GROUP_CHOICE,
particles={@JBossXmlModelGroup.Particle(element=@XmlElement(name="ejb-relation"), type=RelationMetaData.class)})
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SessionBeanMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -30,6 +30,8 @@
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
import org.jboss.metadata.javaee.spec.TransactionManagementTypeAdapter;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* SessionBeanMetaData.
@@ -39,7 +41,8 @@
*/
@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"})
+ "transactionType", "aroundInvokes", "environmentRefsGroup", "postActivates", "prePassivates", "securityRoleRefs", "securityIdentity"})
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class SessionBeanMetaData extends EnterpriseBeanMetaData
implements ITimeoutTarget
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -29,6 +29,8 @@
import javax.xml.namespace.QName;
import org.jboss.metadata.javaee.spec.PortComponentRef;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
jboss port-component-ref-type
@@ -54,6 +56,7 @@
* @version $Revision$
*/
@XmlType(name = "port-component-refType", propOrder={"serviceEndpointInterface", "portQname", "configName", "configFile", "stubProperties", "callProperties"})
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class JBossPortComponentRef extends PortComponentRef
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -30,6 +30,8 @@
import org.jboss.metadata.javaee.spec.PortComponentRef;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
<xsd:sequence>
@@ -48,6 +50,7 @@
*/
@XmlType(name = "service-refType", propOrder={"serviceRefName", "serviceClass",
"serviceQname", "configName", "configFile", "handlerChain", "JBossPortComponentRef", "wsdlOverride"})
+ at JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class JBossServiceReferenceMetaData extends ServiceReferenceMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -23,7 +23,6 @@
// $Id$
-import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
@@ -33,7 +32,6 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name = "service-refType")
public class JBossServiceReferencesMetaData extends ServiceReferencesMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -28,6 +28,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* A remapping of ParamValueMetaData to support prop-name, prop-value elements
@@ -35,6 +37,7 @@
* @version $Revision$
*/
@XmlType(name="stub-propertyType", propOrder={"propName", "propValue"})
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class StubPropertyMetaData extends ParamValueMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBLocalReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBLocalReferenceMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBLocalReferenceMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -33,7 +33,7 @@
* @version $Revision: 1.1 $
*/
@XmlType(name="ejb-local-refType", propOrder={"descriptions", "ejbRefName", "ejbRefType", "localHome", "local", "link",
- "injectionTargets", "jndiName", "mappedName", "localJndiName", "ignoreDependency"})
+ "localJndiName", "jndiName", "mappedName", "injectionTargets", "ignoreDependency"})
public class EJBLocalReferenceMetaData extends AbstractEJBReferenceMetaData implements MergeableMappedMetaData<EJBLocalReferenceMetaData>
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBReferenceMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EJBReferenceMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -27,6 +27,8 @@
import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.MergeableMappedMetaData;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* EJBReferenceMetaData.
@@ -34,8 +36,10 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="ejb-refType", propOrder={"descriptions", "ejbRefName", "ejbRefType", "home", "remote", "jndiName", "mappedName",
- "link", "injectionTargets", "ignoreDependency"})
+ at XmlType(name="ejb-refType", propOrder={"descriptions", "ejbRefName", "ejbRefType", "home", "remote", "link",
+ "jndiName", "mappedName", "injectionTargets", "ignoreDependency"})
+// unordered for the jboss client 5_0.xsd
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class EJBReferenceMetaData extends AbstractEJBReferenceMetaData implements MergeableMappedMetaData<EJBReferenceMetaData>
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -25,7 +25,9 @@
import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.ResourceInjectionMetaDataWithDescriptions;
+import org.jboss.xb.annotations.JBossXmlConstants;
import org.jboss.xb.annotations.JBossXmlPreserveWhitespace;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* EnvironmentEntryMetaData.
@@ -34,6 +36,7 @@
* @version $Revision: 1.1 $
*/
@XmlType(name="env-entryType", propOrder={"descriptions", "envEntryName", "type", "value", "jndiName", "mappedName", "injectionTargets", "ignoreDependency"})
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class EnvironmentEntryMetaData extends ResourceInjectionMetaDataWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/IconImpl.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/IconImpl.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/IconImpl.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -25,6 +25,7 @@
import org.jboss.annotation.javaee.Icon;
import org.jboss.metadata.javaee.support.LanguageMetaData;
+import org.jboss.xb.annotations.JBossXmlNsPrefix;
/**
* IconImpl.
@@ -32,7 +33,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="iconType")
+ at XmlType(name="iconType", propOrder={"smallIcon", "largeIcon"})
public class IconImpl extends LanguageMetaData implements Icon
{
/** The serialVersionUID */
@@ -67,6 +68,7 @@
*
* @return the largeIcon.
*/
+ @JBossXmlNsPrefix(prefix = "jee", applyToComponentContent=false, schemaTargetIfNotMapped=true)
public String getLargeIcon()
{
return largeIcon;
@@ -90,6 +92,7 @@
*
* @return the smallIcon.
*/
+ @JBossXmlNsPrefix(prefix = "jee", applyToComponentContent=false, schemaTargetIfNotMapped=true)
public String getSmallIcon()
{
return smallIcon;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ParamValueMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ParamValueMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ParamValueMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -26,12 +26,15 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
@XmlType(name="param-valueType", propOrder={"descriptions", "paramName", "paramValue"})
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class ParamValueMetaData extends IdMetaDataImplWithDescriptions
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferenceMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferenceMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -35,8 +35,9 @@
*/
@XmlType(name="resource-refType",
propOrder={
- "descriptions", "resourceRefName", "type", "resAuth", "resSharingScope", "mappedName", "injectionTargets",
- "ignoreDependency", "jndiName", "resourceName", "resUrl"
+ "descriptions", "resourceRefName", "type", "resAuth", "resSharingScope",
+ "resourceName", "jndiName", "mappedName", "resUrl",
+ "injectionTargets", "ignoreDependency"
} )
public class ResourceReferenceMetaData extends ResourceInjectionMetaDataWithDescriptions implements MergeableMappedMetaData<ResourceReferenceMetaData>
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -30,7 +30,6 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-//@SchemaGroup(name="service-refGroup")
public class ServiceReferencesMetaData
extends AbstractMappedMetaData<ServiceReferenceMetaData>
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/RaConfigPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/RaConfigPropertyMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/RaConfigPropertyMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -22,6 +22,7 @@
package org.jboss.metadata.rar.jboss;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
@@ -31,6 +32,7 @@
* @author Jeff Zhang
* @version $Revision:$
*/
+ at XmlType(name="ra-config-property-type", propOrder={"descriptionGroup", "name", "type", "value"})
public class RaConfigPropertyMetaData extends IdMetaDataImplWithDescriptionGroup
{
private static final long serialVersionUID = -5247621229521854849L;
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss4xDTDWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss4xDTDWebMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss4xDTDWebMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.web.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+import org.jboss.xb.annotations.JBossXmlType;
+
+/**
+ * A JBoss4xDTDWebMetaData.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlRootElement(name="jboss-web", namespace="")
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace="",
+ elementFormDefault=XmlNsForm.UNSET,
+ normalizeSpace=true)
+ at XmlType(name="jboss-webType", namespace="", propOrder={"classLoading", "securityDomain", "jaccAllStoreRole", "contextRoot",
+ "virtualHosts", "useSessionCookies", "replicationConfig", "environmentRefsGroup4x", "securityRoles", "messageDestinations",
+ "webserviceDescriptions", "depends", "servlets"})
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
+public class JBoss4xDTDWebMetaData extends JBossWebMetaData
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ public void setEnvironmentRefsGroup4x(JBossWeb4xEnvironmentRefsGroupMetaData env)
+ {
+ super.setEnvironmentRefsGroup(env);
+ }
+}
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -41,7 +41,7 @@
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
@XmlType(name="jboss-webType", namespace="", propOrder={"classLoading", "securityDomain", "jaccAllStoreRole", "contextRoot",
- "virtualHosts", "useSessionCookies", "replicationConfig", "jndiEnvironmentRefsGroup", "securityRoles", "messageDestinations",
+ "virtualHosts", "useSessionCookies", "replicationConfig", "environmentRefsGroup", "securityRoles", "messageDestinations",
"webserviceDescriptions", "depends", "servlets", "maxActiveSessions", "passivationConfig"})
public class JBoss50DTDWebMetaData extends JBossWebMetaData
{
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -41,7 +41,7 @@
elementFormDefault=XmlNsForm.QUALIFIED)
@XmlType(name="jboss-webType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"classLoading", "securityDomain",
"jaccAllStoreRole", "contextRoot",
- "virtualHosts", "useSessionCookies", "replicationConfig", "jndiEnvironmentRefsGroup", "securityRoles", "messageDestinations",
+ "virtualHosts", "useSessionCookies", "replicationConfig", "environmentRefsGroup", "securityRoles", "messageDestinations",
"webserviceDescriptions", "depends", "servlets", "maxActiveSessions", "passivationConfig"})
public class JBoss50WebMetaData extends JBossWebMetaData
{
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWeb4xEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWeb4xEnvironmentRefsGroupMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWeb4xEnvironmentRefsGroupMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.web.jboss;
+
+import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
+import org.jboss.xb.annotations.JBossXmlModelGroup;
+
+/**
+ * A JBossWeb4xEnvironmentRefsGroupMetaData.
+ * This is to address ordering issues in jboss-web_4.x.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlModelGroup(name="jndiEnvironmentRefsGroup",
+ propOrder={"resourceEnvironmentReferences", "resourceReferences", "ejbReferences", "ejbLocalReferences",
+ "messageDestinationReferences", "serviceReferences"})
+public class JBossWeb4xEnvironmentRefsGroupMetaData extends JBossEnvironmentRefsGroupMetaData
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -782,7 +782,7 @@
* @param jndiEnvironmentRefsGroup the jndiEnvironmentRefsGroup.
* @throws IllegalArgumentException for a null jndiEnvironmentRefsGroup
*/
- @XmlElement(type=JBossEnvironmentRefsGroupMetaData.class)
+ @XmlTransient
public void setJndiEnvironmentRefsGroup(Environment env)
{
if (env == null)
@@ -794,6 +794,12 @@
jndiEnvironmentRefsGroup = jenv;
}
+ // just for the xml binding, to expose correct model group type
+ public void setEnvironmentRefsGroup(JBossEnvironmentRefsGroupMetaData env)
+ {
+ this.setJndiEnvironmentRefsGroup(env);
+ }
+
public boolean isJaccAllStoreRole()
{
if(jaccAllStoreRole == null) return Boolean.FALSE;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -24,6 +24,7 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
import org.jboss.metadata.javaee.spec.RunAsMetaData;
@@ -37,6 +38,8 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at XmlType(name="servletType", propOrder={"descriptionGroup", "servletName", "servletClass", "jspFile", "initParam", "loadOnStartup",
+ "runAs", "securityRoleRefs"})
public class ServletMetaData extends NamedMetaDataWithDescriptionGroup
implements MergeableMetaData<ServletMetaData>
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -6,8 +6,11 @@
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.xb.annotations.JBossXmlConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
+import org.jboss.xb.annotations.JBossXmlType;
/**
* Web application spec metadata.
@@ -22,6 +25,11 @@
namespace="",
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
+ at XmlType(name="web-appType",
+ propOrder={"descriptionGroup", "distributable", "contextParams", "filters", "filterMappings", "listeners", "servlets",
+ "servletMappings", "sessionConfig", "mimeMappings", "welcomeFileList", "errorPages", "taglibs", "securityContraints",
+ "loginConfig", "securityRoles", "jndiEnvironmentRefsGroup"})
+ at JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
public class Web23MetaData extends WebMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -3,6 +3,7 @@
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
@@ -20,6 +21,11 @@
namespace=JavaEEMetaDataConstants.J2EE_NS,
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
+ at XmlType(name="web-appType",
+ 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 Web24MetaData extends WebMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -30,6 +30,7 @@
import java.util.TreeSet;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;
@@ -37,6 +38,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at XmlType(name="web-resource-collectionType", propOrder={"webResourceName", "descriptions", "urlPatterns", "httpMethods"})
public class WebResourceCollectionMetaData extends NamedMetaDataWithDescriptions
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/resources/schema/jboss-client_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss-client_5_0.xsd 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/resources/schema/jboss-client_5_0.xsd 2009-03-02 11:40:52 UTC (rev 84989)
@@ -75,9 +75,9 @@
<xsd:complexType name="port-component-refType">
<xsd:sequence>
<xsd:element name="config-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="stub-property" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="stub-property" type="jboss:stub-propertyType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="config-file" type="xsd:string" minOccurs="0"/>
- <xsd:element name="call-property" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="call-property" type="jboss:call-propertyType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="enable-mtom" type="xsd:boolean" minOccurs="0"/>
<xsd:element name="port-component-link" type="xsd:string" minOccurs="0"/>
<xsd:element name="service-endpoint-interface" type="xsd:string" minOccurs="0"/>
@@ -85,6 +85,18 @@
</xsd:sequence>
<xsd:attribute name="id" type="xsd:string"/>
</xsd:complexType>
+ <xsd:complexType name="stub-propertyType">
+ <xsd:sequence>
+ <xsd:element name="prop-name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="prop-value" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="call-propertyType">
+ <xsd:sequence>
+ <xsd:element name="prop-name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="prop-value" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
<xsd:complexType name="env-entryType">
<xsd:sequence>
<xsd:element name="env-entry-type" type="xsd:string" minOccurs="0"/>
Modified: projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd 2009-03-02 11:40:52 UTC (rev 84989)
@@ -539,6 +539,7 @@
<xsd:element name="config-file" type="xsd:string" minOccurs="0"/>
<xsd:element name="wsdl-publish-location" type="xsd:string" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
</xsd:schema>
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2009-03-02 11:40:52 UTC (rev 84989)
@@ -116,7 +116,7 @@
<xsd:element name="assembly-descriptor" type="jboss:assembly-descriptorType" minOccurs="0"/>
<xsd:element name="resource-managers" type="jboss:resource-managersType" minOccurs="0"/>
</xsd:sequence>
- <xsd:attribute name="version" type="javaee:dewey-versionType" fixed="3.0" use="required">
+ <xsd:attribute name="version" type="javaee:dewey-versionType" default="5.0">
<xsd:annotation>
<xsd:documentation> The version specifies the version of the EJB specification that the
instance document must comply with. This information enables deployment tools to validate
@@ -440,7 +440,6 @@
maxOccurs="unbounded"/>
<xsd:element name="service-ref" type="jboss:service-refType" minOccurs="0"
maxOccurs="unbounded"/>
- <xsd:element name="security-identity" type="jboss:security-identityType" minOccurs="0"/>
<xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0"
maxOccurs="unbounded"/>
<xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0"
@@ -699,7 +698,7 @@
<xsd:sequence>
<xsd:element name="method-name" type="javaee:method-nameType"/>
<xsd:element name="read-only" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="idempotant" type="xsd:boolean" minOccurs="0"/>
+ <xsd:element name="idempotent" type="xsd:boolean" minOccurs="0"/>
<xsd:element name="transaction-timeout" type="jboss:transaction-timeoutType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
@@ -985,7 +984,7 @@
<xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
<xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
<xsd:element name="depends" type="jboss:dependsType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="annotation" type="jboss:annotationType" minOccurs="0"/>
+ <xsd:element name="annotation" type="jboss:annotationType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ignore-dependency" type="jboss:ignore-dependencyType" minOccurs="0"/>
<xsd:element name="aop-domain-name" type="jboss:aop-domain-nameType" minOccurs="0"/>
<xsd:element name="cache-config" type="jboss:cache-configType" minOccurs="0"/>
@@ -1317,6 +1316,7 @@
<xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="injection-target" type="jboss:injection-targetType" maxOccurs="unbounded"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
<!-- **************************************************** -->
@@ -1372,6 +1372,7 @@
<xsd:element name="proxy-factory" type="jboss:proxy-factoryType" minOccurs="0"/>
<xsd:element name="invoker-name" type="jboss:invoker-nameType" minOccurs="0"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -1535,9 +1536,10 @@
<xsd:complexType name="webservicesType">
<xsd:sequence>
- <xsd:element name="contextRoot" type="javaee:string" minOccurs="0"/>
+ <xsd:element name="context-root" type="javaee:string" minOccurs="0"/>
<xsd:element name="webservice-description" type="jboss:webservice-descriptionType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<xsd:complexType name="webservice-descriptionType">
@@ -1557,6 +1559,7 @@
<xsd:element name="config-file" type="xsd:string" minOccurs="0"/>
<xsd:element name="wsdl-publish-location" type="xsd:string" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -1578,6 +1581,7 @@
<xsd:element name="transport-guarantee" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element name="secure-wsdl-access" type="xsd:boolean" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<xsd:complexType name="service-refType">
@@ -1693,6 +1697,7 @@
<xsd:element name="as-context" type="jboss:as-contextType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="sas-context" type="jboss:sas-contextType" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!--
@@ -1708,6 +1713,7 @@
<xsd:element name="detect-misordering" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element name="detect-replay" type="xsd:string" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!--
@@ -1722,6 +1728,7 @@
<xsd:element name="realm" type="xsd:string"/>
<xsd:element name="required" type="xsd:string"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!--
@@ -1733,6 +1740,7 @@
<xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="caller-propagation" type="xsd:string"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -1973,7 +1981,7 @@
<xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
<xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
<xsd:element name="depends" type="jboss:dependsType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="annotation" type="jboss:annotationType" minOccurs="0"/>
+ <xsd:element name="annotation" type="jboss:annotationType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ignore-dependency" type="jboss:ignore-dependencyType" minOccurs="0"/>
<xsd:element name="aop-domain-name" type="jboss:aop-domain-nameType" minOccurs="0"/>
<xsd:element name="pool-config" type="jboss:pool-configType" minOccurs="0"/>
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd 2009-03-02 11:40:52 UTC (rev 84989)
@@ -114,14 +114,13 @@
<xsd:element name="assembly-descriptor" type="jboss:assembly-descriptorType" minOccurs="0"/>
<xsd:element name="resource-managers" type="jboss:resource-managersType" minOccurs="0"/>
</xsd:sequence>
- <xsd:attribute name="version" type="javaee:dewey-versionType" fixed="3.0" use="required">
+
+ <xsd:attribute name="version" type="javaee:dewey-versionType" fixed="5.1">
<xsd:annotation>
- <xsd:documentation> The version specifies the version of the EJB specification that the
- instance document must comply with. This information enables deployment tools to validate
- a particular EJB Deployment Descriptor with respect to a specific version of the EJB
- schema. </xsd:documentation>
+ <xsd:documentation> The version specifies the version of the schema. </xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+
<xsd:attribute name="metadata-complete" type="xsd:boolean"/>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -638,7 +637,7 @@
<xsd:sequence>
<xsd:element name="method-name" type="javaee:method-nameType"/>
<xsd:element name="read-only" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="idempotant" type="xsd:boolean" minOccurs="0"/>
+ <xsd:element name="idempotent" type="xsd:boolean" minOccurs="0"/>
<xsd:element name="transaction-timeout" type="jboss:transaction-timeoutType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
@@ -924,7 +923,7 @@
<xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
<xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
<xsd:element name="depends" type="jboss:dependsType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="annotation" type="jboss:annotationType" minOccurs="0"/>
+ <xsd:element name="annotation" type="jboss:annotationType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ignore-dependency" type="jboss:ignore-dependencyType" minOccurs="0"/>
<xsd:element name="aop-domain-name" type="jboss:aop-domain-nameType" minOccurs="0"/>
<xsd:element name="cache-config" type="jboss:cache-configType" minOccurs="0"/>
@@ -1244,6 +1243,7 @@
<xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="injection-target" type="jboss:injection-targetType" maxOccurs="unbounded"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
<!-- **************************************************** -->
@@ -1286,6 +1286,7 @@
<xsd:element name="proxy-factory" type="jboss:proxy-factoryType" minOccurs="0"/>
<xsd:element name="invoker-name" type="jboss:invoker-nameType" minOccurs="0"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
<!-- **************************************************** -->
@@ -1304,9 +1305,10 @@
<xsd:complexType name="webservicesType">
<xsd:sequence>
- <xsd:element name="contextRoot" type="javaee:string" minOccurs="0"/>
+ <xsd:element name="context-root" type="javaee:string" minOccurs="0"/>
<xsd:element name="webservice-description" type="jboss:webservice-descriptionType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
<xsd:complexType name="port-componentType">
@@ -1327,6 +1329,7 @@
<xsd:element name="transport-guarantee" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element name="secure-wsdl-access" type="xsd:boolean" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
<!-- **************************************************** -->
@@ -1341,6 +1344,7 @@
<xsd:element name="as-context" type="jboss:as-contextType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="sas-context" type="jboss:sas-contextType" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
<!--
@@ -1356,6 +1360,7 @@
<xsd:element name="detect-misordering" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element name="detect-replay" type="xsd:string" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
<!--
@@ -1370,6 +1375,7 @@
<xsd:element name="realm" type="xsd:string"/>
<xsd:element name="required" type="xsd:string"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
<!--
@@ -1381,6 +1387,7 @@
<xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="caller-propagation" type="xsd:string"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
</xsd:complexType>
<!-- **************************************************** -->
@@ -1512,7 +1519,7 @@
<xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
<xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
<xsd:element name="depends" type="jboss:dependsType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="annotation" type="jboss:annotationType" minOccurs="0"/>
+ <xsd:element name="annotation" type="jboss:annotationType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ignore-dependency" type="jboss:ignore-dependencyType" minOccurs="0"/>
<xsd:element name="aop-domain-name" type="jboss:aop-domain-nameType" minOccurs="0"/>
<xsd:element name="pool-config" type="jboss:pool-configType" minOccurs="0"/>
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/HandlerChainsTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/HandlerChainsTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/HandlerChainsTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -74,8 +74,6 @@
public void testAssembledHandlerChainsProcessors()
{
- enableTrace("org.jboss.metadata.annotation.creator");
-
Collection<Class<?>> classes = new HashSet<Class<?>>();
classes.add(AnnotatedClient.class);
ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, classMainName);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -170,18 +170,19 @@
JBoss50MetaData metaData = creator.create(classes);
assertTrue(metaData.isEJB3x());
- assertEquals("3.0", metaData.getVersion());
+ assertEquals("3.0", metaData.getEjbVersion());
+ assertEquals("5.0", metaData.getVersion());
assertNotNull("no beans defined", metaData.getEnterpriseBeans());
assertNotNull("no assembly descriptor defined", metaData.getAssemblyDescriptor());
assertNotNull("no container transactions", metaData.getAssemblyDescriptor().getContainerTransactions());
// There is a bug in IdMetaDataImpl.hashCode which isn't unique when id is not set.
- for(ContainerTransactionMetaData transaction : metaData.getAssemblyDescriptor().getContainerTransactions())
+/* for(ContainerTransactionMetaData transaction : metaData.getAssemblyDescriptor().getContainerTransactions())
{
System.out.println(transaction);
}
-
+*/
assertEquals(6, metaData.getEnterpriseBeans().size());
assertMyStatefulBean(metaData.getEnterpriseBean("AnotherName")); // MyStatefulBean
@@ -404,7 +405,8 @@
JBoss50MetaData metaData = creator.create(classes);
assertTrue(metaData.isEJB3x());
- assertEquals("3.0", metaData.getVersion());
+ assertEquals("3.0", metaData.getEjbVersion());
+ assertEquals("5.0", metaData.getVersion());
assertNotNull("no beans defined", metaData.getEnterpriseBeans());
//assertNotNull("no assembly descriptor defined", metaData.getAssemblyDescriptor());
@@ -962,7 +964,8 @@
JBoss50MetaData metaData = creator.create(classes);
assertTrue(metaData.isEJB3x());
- assertEquals("3.0", metaData.getVersion());
+ assertEquals("3.0", metaData.getEjbVersion());
+ assertEquals("5.0", metaData.getVersion());
assertNotNull("no beans defined", metaData.getEnterpriseBeans());
assertNotNull("no assembly descriptor defined", metaData.getAssemblyDescriptor());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -72,7 +72,7 @@
JBoss50Creator creator = new JBoss50Creator(finder);
JBoss50MetaData annotations = creator.create(classes);
- EjbJar3xMetaData ejbJarMetaData = unmarshal("ejb-jar.xml", EjbJar3xMetaData.class, null);
+ EjbJar3xMetaData ejbJarMetaData = unmarshal("ejb-jar.xml", EjbJar30MetaData.class, null);
JBossMetaData jbossMetaData = unmarshal("jboss.xml", JBoss50MetaData.class, null);
JBoss50MetaData specMetaData = new JBoss50MetaData();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -83,7 +83,7 @@
public void testMemoryMetaDataLoader()
throws Exception
{
- enableTrace("org.jboss.metadata.annotation.creator");
+ //enableTrace("org.jboss.metadata.annotation.creator");
Class<?>[] beanClasses = {
Class.forName("org.jboss.test.metadata.annotation.ejb3.MyStatelessBean"),
Class.forName("org.jboss.test.metadata.annotation.ejb3.MyStatefulBean")
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -316,7 +316,7 @@
List<Class<?>> classes = Arrays.asList(webClasses);
System.out.println("Processing classes: " + classes);
- enableTrace("org.jboss.metadata.annotation.creator");
+ //enableTrace("org.jboss.metadata.annotation.creator");
Web25MetaDataCreator creator = new Web25MetaDataCreator(finder);
Web25MetaData metaData = creator.create(classes);
@@ -359,7 +359,7 @@
List<Class<?>> classes = Arrays.asList(webClasses);
System.out.println("Processing classes: " + classes);
- enableTrace("org.jboss.metadata.annotation.creator");
+ //enableTrace("org.jboss.metadata.annotation.creator");
Web25MetaDataCreator creator = new Web25MetaDataCreator(finder);
Web25MetaData annotation = creator.create(classes);
@@ -410,7 +410,7 @@
List<Class<?>> classes = Arrays.asList(webClasses);
System.out.println("Processing classes: " + classes);
- enableTrace("org.jboss.metadata.annotation.creator");
+ //enableTrace("org.jboss.metadata.annotation.creator");
Web25MetaDataCreator creator = new Web25MetaDataCreator(finder);
Web25MetaData annotation = creator.create(classes);
@@ -456,7 +456,7 @@
Class<?>[] webClasses = {SimpleServlet.class, MyServlet.class};
List<Class<?>> classes = Arrays.asList(webClasses);
- enableTrace("org.jboss.metadata.annotation.creator");
+ //enableTrace("org.jboss.metadata.annotation.creator");
Web25MetaDataCreator creator = new Web25MetaDataCreator(finder);
Web25MetaData annotation = creator.create(classes);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationTest.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationTest.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -63,6 +63,7 @@
import org.jboss.xb.binding.sunday.unmarshalling.SequenceBinding;
import org.jboss.xb.binding.sunday.unmarshalling.TermBinding;
import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.UnorderedSequenceBinding;
import org.jboss.xb.binding.sunday.unmarshalling.WildcardBinding;
/**
@@ -409,7 +410,7 @@
if(!(modelGroupBinding instanceof SequenceBinding))
{
// another chance...
- if(modelGroupBinding instanceof AllBinding)
+ if(modelGroupBinding instanceof AllBinding || modelGroupBinding instanceof UnorderedSequenceBinding)
all = true;
else
fail("ModelGroupBinding expected to be a sequence but was " + modelGroupBinding);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -24,6 +24,7 @@
import java.util.List;
import org.jboss.metadata.client.jboss.JBossClient5DTDMetaData;
+import org.jboss.metadata.client.jboss.JBossClient5MetaData;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
import org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData;
import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
@@ -59,6 +60,7 @@
resolver.addClassBindingForLocation("application-client_1_4.xsd", ApplicationClient14MetaData.class);
resolver.addClassBindingForLocation("application-client_5.xsd", ApplicationClient5MetaData.class);
resolver.addClassBindingForLocation("jboss-client", JBossClient5DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss-client_5_0.xsd", JBossClient5MetaData.class);
return resolver;
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -95,9 +95,6 @@
public void testServiceRefQname() throws Exception
{
-// JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
-// xbdelegate.setValidateSchema(false);
-
JBossMetaData result = unmarshal();
assertEquals(1, result.getEnterpriseBeans().size());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -118,12 +118,7 @@
resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
return resolver;
}
-
- public static boolean validateSchema()
- {
- return true;
- }
-
+
public JBoss50UnitTestCase(String name)
{
super(name);
@@ -509,46 +504,6 @@
}
/**
- * Simple test of a jboss.xml with a 5.0 dtd doctype
- * @throws Exception
- */
- public void testVersion50() throws Exception
- {
- JBossMetaData result = unmarshal();
- assertEquals("5.0", result.getVersion());
- }
- public void testVersion50xsd() throws Exception
- {
- JBossMetaData result = unmarshal();
- assertEquals("3.0", result.getVersion());
- }
-
- /**
- * Simple test of a jboss.xml with a 4.2 dtd doctype
- * @throws Exception
- */
- public void testVersion42() throws Exception
- {
- JBossMetaData result = unmarshal();
- assertEquals("4.2", result.getVersion());
- }
- public void testVersion40() throws Exception
- {
- JBossMetaData result = unmarshal();
- assertEquals("4.0", result.getVersion());
- }
- public void testVersion32() throws Exception
- {
- JBossMetaData result = unmarshal();
- assertEquals("3.2", result.getVersion());
- }
- public void testVersion30() throws Exception
- {
- JBossMetaData result = unmarshal();
- assertEquals("3.0", result.getVersion());
- }
-
- /**
* Validate an ejb-jar.xml/jboss.xml/standardjboss.xml set of metadata used to
* obtain an ejb container configuration.
*
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/SchemaVersionUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/SchemaVersionUnitTestCase.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/SchemaVersionUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.ejb;
+
+import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
+import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * A SchemaVersionUnitTestCase.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public class SchemaVersionUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+
+ public SchemaVersionUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static SchemaBindingResolver initResolver()
+ {
+ DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+ resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
+ resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
+ resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
+ resolver.addClassBindingForLocation("jboss_5_1.xsd", JBoss50MetaData.class);
+ // Workaround wildard resolution slowness
+ resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
+ return resolver;
+ }
+
+ /**
+ * Simple test of a jboss.xml with a 5.0 dtd doctype
+ * @throws Exception
+ */
+ public void testVersion50() throws Exception
+ {
+ JBossMetaData result = unmarshal();
+ assertEquals("5.0", result.getVersion());
+ }
+
+ public void testVersion50xsd() throws Exception
+ {
+ JBossMetaData result = unmarshal();
+ assertEquals("5.0", result.getVersion());
+ }
+
+ public void testVersion51() throws Exception
+ {
+ JBossMetaData result = unmarshal();
+ assertEquals("5.1", result.getVersion());
+ }
+
+ /**
+ * Simple test of a jboss.xml with a 4.2 dtd doctype
+ * @throws Exception
+ */
+ public void testVersion42() throws Exception
+ {
+ JBossMetaData result = unmarshal();
+ assertEquals("4.2", result.getVersion());
+ }
+
+ public void testVersion40() throws Exception
+ {
+ JBossMetaData result = unmarshal();
+ assertEquals("4.0", result.getVersion());
+ }
+
+ public void testVersion32() throws Exception
+ {
+ JBossMetaData result = unmarshal();
+ assertEquals("3.2", result.getVersion());
+ }
+
+ public void testVersion30() throws Exception
+ {
+ JBossMetaData result = unmarshal();
+ assertEquals("3.0", result.getVersion());
+ }
+
+ protected JBossMetaData unmarshal() throws Exception
+ {
+ return unmarshal(JBossMetaData.class);
+ }
+}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEMetaDataTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEMetaDataTest.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEMetaDataTest.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -95,6 +95,11 @@
return new JavaEEMetaDataTestDelegate(clazz);
}
+ public static boolean validateSchema()
+ {
+ return true;
+ }
+
protected JavaEEMetaDataTestDelegate getJavaEEMetaDataDelegate()
{
return (JavaEEMetaDataTestDelegate) getDelegate();
@@ -193,7 +198,9 @@
protected Object unmarshal(String name, SchemaBindingResolver resolver) throws Exception
{
String url = findXML(name);
- return getJavaEEMetaDataDelegate().unmarshal(url, resolver);
+ JavaEEMetaDataTestDelegate delegate = getJavaEEMetaDataDelegate();
+ //delegate.setValidateSchema(false);
+ return delegate.unmarshal(url, resolver);
}
/**
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -70,7 +70,8 @@
jbossMetaData = processor.process(jbossMetaData);
assertTrue(jbossMetaData.isEJB3x());
- assertEquals("3.0", jbossMetaData.getVersion());
+ assertEquals("3.0", jbossMetaData.getEjbVersion());
+ assertEquals("5.0", jbossMetaData.getVersion());
assertNotNull("no beans defined", jbossMetaData.getEnterpriseBeans());
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/JBossProcessingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/JBossProcessingUnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/JBossProcessingUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -162,7 +162,8 @@
JBoss50MetaData jbossMetaData = creator.create(classes);
- assertEquals("3.0", jbossMetaData.getVersion());
+ assertEquals("3.0", jbossMetaData.getEjbVersion());
+ assertEquals("5.0", jbossMetaData.getVersion());
return (JBossSessionBeanMetaData) jbossMetaData.getEnterpriseBean(enterpriseBean);
}
}
\ No newline at end of file
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -49,7 +49,7 @@
protected void setUp() throws Exception
{
super.setUp();
- enableTrace("org.jboss.xb");
+ // enable trace only when debugging enableTrace("org.jboss.xb");
}
abstract protected String getRAVersion();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -70,6 +70,12 @@
return resolver;
}
+ // TODO return true to see all the validation issues
+ public static boolean validateSchema()
+ {
+ return false;
+ }
+
public RA16NegativeUnitTestCase(String name)
{
super(name);
@@ -78,7 +84,8 @@
protected void setUp() throws Exception
{
super.setUp();
- enableTrace("org.jboss.xb");
+ // use trace for local test runs only
+ //enableTrace("org.jboss.xb");
}
/**
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -23,6 +23,7 @@
import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
+import org.jboss.metadata.web.jboss.JBoss4xDTDWebMetaData;
import org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.jboss.PassivationConfig;
@@ -32,8 +33,6 @@
import org.jboss.metadata.web.jboss.SnapshotMode;
import org.jboss.metadata.web.spec.Web24MetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -52,8 +51,8 @@
DefaultSchemaResolver resolver = new DefaultSchemaResolver();
resolver.addClassBindingForLocation("web-app_2_4.xsd", Web24MetaData.class);
resolver.addClassBindingForLocation("jboss-web", JBoss50DTDWebMetaData.class);
- resolver.addClassBindingForLocation("jboss-web_4_0.dtd", JBoss50DTDWebMetaData.class);
- resolver.addClassBindingForLocation("jboss-web_4_2.dtd", JBoss50DTDWebMetaData.class);
+ resolver.addClassBindingForLocation("jboss-web_4_0.dtd", JBoss4xDTDWebMetaData.class);
+ resolver.addClassBindingForLocation("jboss-web_4_2.dtd", JBoss4xDTDWebMetaData.class);
resolver.addClassBindingForLocation("jboss-web_5_0.dtd", JBoss50DTDWebMetaData.class);
return resolver;
}
@@ -107,10 +106,11 @@
assertEquals(true, classLoading.isJava2ClassLoadingCompliance());
assertEquals(true, classLoading.wasJava2ClassLoadingComplianceSet());
}
+
public void testClassLoading42()
throws Exception
{
- JBossWebMetaData jbossWeb = unmarshal();
+ JBossWebMetaData jbossWeb = unmarshal(JBoss4xDTDWebMetaData.class);
ClassLoadingMetaData classLoading = jbossWeb.getClassLoading();
assertNotNull(classLoading);
assertEquals(false, classLoading.isJava2ClassLoadingCompliance());
@@ -122,7 +122,7 @@
public void testIsJaacAllStoreRole() throws Exception
{
- JBossWebMetaData jbossWeb = unmarshal();
+ JBossWebMetaData jbossWeb = unmarshal(JBoss4xDTDWebMetaData.class);
assertNotNull(jbossWeb);
assertTrue(jbossWeb.isJaccAllStoreRole());
@@ -131,6 +131,6 @@
protected JBossWebMetaData unmarshal() throws Exception
{
- return unmarshal(JBossWebMetaData.class);
+ return unmarshal(JBoss50DTDWebMetaData.class);
}
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -45,7 +45,7 @@
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
-import org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData;
+import org.jboss.metadata.web.jboss.JBoss4xDTDWebMetaData;
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.Web24MetaData;
@@ -67,8 +67,8 @@
{
DefaultSchemaResolver resolver = new DefaultSchemaResolver();
resolver.addClassBindingForLocation("web-app_2_4.xsd", Web24MetaData.class);
- resolver.addClassBindingForLocation("jboss-web_4_0.dtd", JBoss50DTDWebMetaData.class);
- resolver.addClassBindingForLocation("jboss-web_4_2.dtd", JBoss50DTDWebMetaData.class);
+ resolver.addClassBindingForLocation("jboss-web_4_0.dtd", JBoss4xDTDWebMetaData.class);
+ resolver.addClassBindingForLocation("jboss-web_4_2.dtd", JBoss4xDTDWebMetaData.class);
return resolver;
}
@@ -356,8 +356,9 @@
protected JBossWebMetaData unmarshal() throws Exception
{
- return unmarshal(JBossWebMetaData.class);
+ return unmarshal(JBoss4xDTDWebMetaData.class);
}
+
protected String getDescription(Descriptions descriptions)
{
String desc = null;
@@ -365,6 +366,7 @@
desc = descriptions.value()[0].value();
return desc;
}
+
protected Set<String> set(String...strings)
{
HashSet<String> set = new HashSet<String>();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -96,6 +96,7 @@
{
UnmarshallerFactory factory = UnmarshallerFactory.newInstance();
Unmarshaller unmarshaller = factory.newUnmarshaller();
+ unmarshaller.setSchemaValidation(true);
URL webXml = getClass().getResource(name);
if (webXml == null)
throw new IllegalStateException("Unable to find: "+name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2009-03-02 11:40:52 UTC (rev 84989)
@@ -26,7 +26,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import javax.xml.parsers.SAXParser;
@@ -35,11 +34,9 @@
import org.jboss.logging.Logger;
import org.jboss.util.xml.JBossEntityResolver;
import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
import junit.framework.TestCase;
@@ -79,7 +76,10 @@
// these don't include DTD info on purpose
IGNORE.add("JBoss42_testNoDoctype.xml");
IGNORE.add("Ear4x_testNoDtd.xml");
-
+ // here stub-property is expected to be a simple string!
+ IGNORE.add("JBossClient5_test4915.xml");
+ // dtd don't support prefix mapping (xmlns:prefix_name must declared attributes)
+ IGNORE.add("JBoss42_testServiceRefQnameWithNS.xml");
}
private static final EntityResolver RESOLVER = new JBossEntityResolver();
@@ -119,7 +119,7 @@
});
// TODO there are currently 6 expected
- assertEquals("Zero invalid files among total of " + total, 6, invalid);
+ assertEquals("Zero invalid files among total of " + total, 0, invalid);
}
private static boolean isValid(final File xmlFile)
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5_test4915.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5_test4915.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5_test4915.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -1,13 +1,18 @@
-<jboss-client>
+<jboss-client xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.com/xml/ns/javaee/jboss-client_5_0.xsd"
+ version="5.0"
+ id="appclient-test">
+
<jndi-name>jbossws-client</jndi-name>
<!--
@WebServiceRef(name = "Service1")
-->
<service-ref>
+ <service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-impl-class>
+ <service-qname xmlns:wsref="http://org.jboss.ws/wsref">wsref:TestEndpointService</service-qname>
<service-ref-name>Service1</service-ref-name>
- <service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-impl-class>
- <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -15,9 +20,9 @@
@WebServiceRef(name = "Service2")
-->
<service-ref>
+ <config-file>META-INF/jbossws-client-config.xml</config-file>
<service-ref-name>Service2</service-ref-name>
<config-name>Custom Client</config-name>
- <config-file>META-INF/jbossws-client-config.xml</config-file>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -25,9 +30,9 @@
@WebServiceRef(name = "Service3")
-->
<service-ref>
+ <service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-impl-class>
+ <service-qname xmlns:wsref="http://org.jboss.ws/wsref">wsref:TestEndpointService</service-qname>
<service-ref-name>Service3</service-ref-name>
- <service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-impl-class>
- <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -35,12 +40,12 @@
@WebServiceRef(name = "Service4")
-->
<service-ref>
- <service-ref-name>Service4</service-ref-name>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
<config-name>Custom Client</config-name>
<config-file>META-INF/jbossws-client-config.xml</config-file>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
</port-component-ref>
+ <service-ref-name>Service4</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -48,12 +53,12 @@
@WebServiceRef(name = "Port1", type = TestEndpoint.class)
-->
<service-ref>
- <service-ref-name>Port1</service-ref-name>
<port-component-ref>
- <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname>
<config-name>Custom Client</config-name>
<config-file>META-INF/jbossws-client-config.xml</config-file>
+ <port-qname xmlns:wsref="http://org.jboss.ws/wsref">wsref:TestEndpointPort</port-qname>
</port-component-ref>
+ <service-ref-name>Port1</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -61,12 +66,12 @@
@WebServiceRef(name = "Port2")
-->
<service-ref>
- <service-ref-name>Port2</service-ref-name>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
<config-name>Custom Client</config-name>
<config-file>META-INF/jbossws-client-config.xml</config-file>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
</port-component-ref>
+ <service-ref-name>Port2</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -74,10 +79,7 @@
@WebServiceRef(name = "Port3")
-->
<service-ref>
- <service-ref-name>Port3</service-ref-name>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
- <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname>
<stub-property>
<prop-name>javax.xml.ws.security.auth.username</prop-name>
<prop-value>kermit</prop-value>
@@ -86,7 +88,10 @@
<prop-name>javax.xml.ws.security.auth.password</prop-name>
<prop-value>thefrog</prop-value>
</stub-property>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
+ <port-qname xmlns:wsref="http://org.jboss.ws/wsref">wsref:TestEndpointPort</port-qname>
</port-component-ref>
+ <service-ref-name>Port3</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -6,6 +6,8 @@
version="5.0"
id="jboss-app-id">
+ <library-directory>jboss-app-lib0</library-directory>
+
<!-- Add a sar0 module -->
<module id="sar0">
<service>sar0.sar</service>
@@ -37,5 +39,4 @@
<role-name>role1</role-name>
<principal-name>principal1</principal-name>
</security-role>
- <library-directory>jboss-app-lib0</library-directory>
</jboss-app>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -5,7 +5,8 @@
xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-app_5_0.xsd"
version="5.0"
id="jboss-app_5_0-id">
-
+
+ <library-directory>jboss-app-lib0</library-directory>
<module id="sar0">
<service>sar0.sar</service>
</module>
@@ -23,5 +24,4 @@
<description>The 1 security role</description>
<role-name>role1</role-name>
</security-role>
- <library-directory>jboss-app-lib0</library-directory>
</jboss-app>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion30.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion30.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion30.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
-<jboss>
- <enterprise-beans>
- <session>
- <ejb-name>StatefulOverrideBean</ejb-name>
- <jndi-name>StatefulOverride</jndi-name>
- </session>
- </enterprise-beans>
-</jboss>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion32.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion32.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion32.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 3.2//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
-<jboss>
- <enterprise-beans>
- <session>
- <ejb-name>StatefulOverrideBean</ejb-name>
- <jndi-name>StatefulOverride</jndi-name>
- </session>
- </enterprise-beans>
-</jboss>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion40.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion40.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion40.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
-<jboss>
- <enterprise-beans>
- <session>
- <ejb-name>StatefulOverrideBean</ejb-name>
- <jndi-name>StatefulOverride</jndi-name>
- </session>
- </enterprise-beans>
-</jboss>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion42.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion42.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion42.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 4.2//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd">
-<jboss>
- <enterprise-beans>
- <session>
- <ejb-name>StatefulOverrideBean</ejb-name>
- <jndi-name>StatefulOverride</jndi-name>
- </session>
- </enterprise-beans>
-</jboss>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion50.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion50.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion50.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 5.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
-<jboss>
- <enterprise-beans>
- <session>
- <ejb-name>StatefulOverrideBean</ejb-name>
- <jndi-name>StatefulOverride</jndi-name>
- </session>
- </enterprise-beans>
-</jboss>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion50xsd.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion50xsd.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testVersion50xsd.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<jboss
- xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
- http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
- version="3.0">
-</jboss>
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 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -14,16 +14,16 @@
<display-name xml:lang="fr">fr-jboss-disp</display-name>
<display-name xml:lang="de">de-jboss-disp</display-name>
<icon id="en-jboss-icon-id">
- <small-icon>en-jboss-small-icon</small-icon>
- <large-icon>en-jboss-large-icon</large-icon>
+ <jee:small-icon>en-jboss-small-icon</jee:small-icon>
+ <jee:large-icon>en-jboss-large-icon</jee:large-icon>
</icon>
<icon xml:lang="fr" id="fr-jboss-icon-id">
- <small-icon>fr-jboss-small-icon</small-icon>
- <large-icon>fr-jboss-large-icon</large-icon>
+ <jee:small-icon>fr-jboss-small-icon</jee:small-icon>
+ <jee:large-icon>fr-jboss-large-icon</jee:large-icon>
</icon>
<icon xml:lang="de" id="de-jboss-icon-id">
- <small-icon>de-jboss-small-icon</small-icon>
- <large-icon>de-jboss-large-icon</large-icon>
+ <jee:small-icon>de-jboss-small-icon</jee:small-icon>
+ <jee:large-icon>de-jboss-large-icon</jee:large-icon>
</icon>
<loader-repository id="loaderRepository-id" loaderRepositoryClass="loaderRepositoryClass">
@@ -73,85 +73,27 @@
<display-name xml:lang="fr">fr-session1-disp</display-name>
<display-name xml:lang="de">de-session1-disp</display-name>
<icon id="en-session1-icon-id">
- <small-icon>en-session1-small-icon</small-icon>
- <large-icon>en-session1-large-icon</large-icon>
+ <jee:small-icon>en-session1-small-icon</jee:small-icon>
+ <jee:large-icon>en-session1-large-icon</jee:large-icon>
</icon>
<icon xml:lang="fr" id="fr-session1-icon-id">
- <small-icon>fr-session1-small-icon</small-icon>
- <large-icon>fr-session1-large-icon</large-icon>
+ <jee:small-icon>fr-session1-small-icon</jee:small-icon>
+ <jee:large-icon>fr-session1-large-icon</jee:large-icon>
</icon>
<icon xml:lang="de" id="de-session1-icon-id">
- <small-icon>de-session1-small-icon</small-icon>
- <large-icon>de-session1-large-icon</large-icon>
+ <jee:small-icon>de-session1-small-icon</jee:small-icon>
+ <jee:large-icon>de-session1-large-icon</jee:large-icon>
</icon>
<ejb-name>session1EjbName</ejb-name>
-
- <remote-binding id="session1RemoteBinding-id">
- <description>en-session1RemoteBinding-desc</description>
- <description xml:lang="fr">fr-session1RemoteBinding-desc</description>
- <description xml:lang="de">de-session1RemoteBinding-desc</description>
- <jndi-name>session1RemoteBindingJndiName</jndi-name>
- <client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
- <interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
- <proxy-factory>session1RemoteBindingProxyFactory</proxy-factory>
- <invoker-name>session1RemoteBindingInvokerName</invoker-name>
- </remote-binding>
- <jndi-name>session1JndiName</jndi-name>
- <home-jndi-name>session1HomeJndiName</home-jndi-name>
- <local-jndi-name>session1LocalJndiName</local-jndi-name>
- <local-home-jndi-name>session1LocalHomeJndiName</local-home-jndi-name>
- <call-by-value>true</call-by-value>
- <exception-on-rollback>true</exception-on-rollback>
- <timer-persistence>true</timer-persistence>
- <configuration-name>session1ConfigurationName</configuration-name>
-
- <invoker-bindings id="session1InvokerBindings-id">
- <description>en-session1InvokerBindings-desc</description>
- <description xml:lang="fr">fr-session1InvokerBindings-desc</description>
- <description xml:lang="de">de-session1InvokerBindings-desc</description>
-
- <invoker id="session1Invoker1-id">
- <description>en-session1Invoker1-desc</description>
- <description xml:lang="fr">fr-session1Invoker1-desc</description>
- <description xml:lang="de">de-session1Invoker1-desc</description>
-
- <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
- <jndi-name>session1Invoker1JndiName</jndi-name>
-
- <ejb-ref>
- <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
- <jndi-name>session1Invoker1EjbName1</jndi-name>
- </ejb-ref>
- </invoker>
- <invoker id="session1Invoker2-id">
- <description>en-session1Invoker2-desc</description>
- <description xml:lang="fr">fr-session1Invoker2-desc</description>
- <description xml:lang="de">de-session1Invoker2-desc</description>
-
- <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
- <jndi-name>session1Invoker2JndiName</jndi-name>
-
- <ejb-ref>
- <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
- <jndi-name>session1Invoker2EjbName1</jndi-name>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
- <jndi-name>session1Invoker2EjbName2</jndi-name>
- </ejb-ref>
- </invoker>
- </invoker-bindings>
-
- <security-proxy>session1SecurityProxy</security-proxy>
-
<ejb-ref id="session1EjbRef1-id">
<description>en-session1EjbRef1-desc</description>
<description xml:lang="fr">fr-session1EjbRef1-desc</description>
<description xml:lang="de">de-session1EjbRef1-desc</description>
<ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
+ <jndi-name>session1EjbRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session1EjbRef1Injection1Class</injection-target-class>
<injection-target-name>session1EjbRef1Injection1Name</injection-target-name>
@@ -160,7 +102,6 @@
<injection-target-class>session1EjbRef1Injection2Class</injection-target-class>
<injection-target-name>session1EjbRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1EjbRef1JndiName</jndi-name>
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="session1EjbRef2-id">
@@ -169,6 +110,7 @@
<description xml:lang="de">de-session1EjbRef2-desc</description>
<ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
+ <jndi-name>session1EjbRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session1EjbRef2Injection1Class</injection-target-class>
<injection-target-name>session1EjbRef2Injection1Name</injection-target-name>
@@ -177,7 +119,6 @@
<injection-target-class>session1EjbRef2Injection2Class</injection-target-class>
<injection-target-name>session1EjbRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1EjbRef2JndiName</jndi-name>
</ejb-ref>
<ejb-local-ref id="session1EjbLocalRef1-id">
@@ -186,6 +127,7 @@
<description xml:lang="de">de-session1EjbLocalRef1-desc</description>
<ejb-ref-name>session1EjbLocalRef1Name</ejb-ref-name>
+ <jndi-name>session1EjbLocalRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session1EjbLocalRef1Injection1Class</injection-target-class>
<injection-target-name>session1EjbLocalRef1Injection1Name</injection-target-name>
@@ -194,7 +136,6 @@
<injection-target-class>session1EjbLocalRef1Injection2Class</injection-target-class>
<injection-target-name>session1EjbLocalRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1EjbLocalRef1JndiName</jndi-name>
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="session1EjbLocalRef2-id">
@@ -203,6 +144,7 @@
<description xml:lang="de">de-session1EjbLocalRef2-desc</description>
<ejb-ref-name>session1EjbLocalRef2Name</ejb-ref-name>
+ <jndi-name>session1EjbLocalRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session1EjbLocalRef2Injection1Class</injection-target-class>
<injection-target-name>session1EjbLocalRef2Injection1Name</injection-target-name>
@@ -211,7 +153,6 @@
<injection-target-class>session1EjbLocalRef2Injection2Class</injection-target-class>
<injection-target-name>session1EjbLocalRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1EjbLocalRef2JndiName</jndi-name>
</ejb-local-ref>
<!-- TODO service-ref -->
@@ -221,6 +162,7 @@
<description xml:lang="fr">fr-session1ResourceRef1-desc</description>
<description xml:lang="de">de-session1ResourceRef1-desc</description>
<res-ref-name>session1ResourceRef1Name</res-ref-name>
+ <jndi-name>session1ResourceRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session1ResourceRef1Injection1Class</injection-target-class>
<injection-target-name>session1ResourceRef1Injection1Name</injection-target-name>
@@ -229,7 +171,6 @@
<injection-target-class>session1ResourceRef1Injection2Class</injection-target-class>
<injection-target-name>session1ResourceRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1ResourceRef1JndiName</jndi-name>
<ignore-dependency/>
</resource-ref>
<resource-ref id="session1ResourceRef2-id">
@@ -237,6 +178,7 @@
<description xml:lang="fr">fr-session1ResourceRef2-desc</description>
<description xml:lang="de">de-session1ResourceRef2-desc</description>
<res-ref-name>session1ResourceRef2Name</res-ref-name>
+ <jndi-name>session1ResourceRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session1ResourceRef2Injection1Class</injection-target-class>
<injection-target-name>session1ResourceRef2Injection1Name</injection-target-name>
@@ -245,13 +187,13 @@
<injection-target-class>session1ResourceRef2Injection2Class</injection-target-class>
<injection-target-name>session1ResourceRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="session1ResourceEnvRef1-id">
<description>en-session1ResourceEnvRef1-desc</description>
<description xml:lang="fr">fr-session1ResourceEnvRef1-desc</description>
<description xml:lang="de">de-session1ResourceEnvRef1-desc</description>
<resource-env-ref-name>session1ResourceEnvRef1Name</resource-env-ref-name>
+ <jndi-name>session1ResourceEnvRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session1ResourceEnvRef1Injection1Class</injection-target-class>
<injection-target-name>session1ResourceEnvRef1Injection1Name</injection-target-name>
@@ -260,7 +202,6 @@
<injection-target-class>session1ResourceEnvRef1Injection2Class</injection-target-class>
<injection-target-name>session1ResourceEnvRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1ResourceEnvRef1JndiName</jndi-name>
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="session1ResourceEnvRef2-id">
@@ -268,6 +209,7 @@
<description xml:lang="fr">fr-session1ResourceEnvRef2-desc</description>
<description xml:lang="de">de-session1ResourceEnvRef2-desc</description>
<resource-env-ref-name>session1ResourceEnvRef2Name</resource-env-ref-name>
+ <jndi-name>session1ResourceEnvRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session1ResourceEnvRef2Injection1Class</injection-target-class>
<injection-target-name>session1ResourceEnvRef2Injection1Name</injection-target-name>
@@ -276,13 +218,13 @@
<injection-target-class>session1ResourceEnvRef2Injection2Class</injection-target-class>
<injection-target-name>session1ResourceEnvRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="session1MessageDestinationRef1-id">
<description>en-session1MessageDestinationRef1-desc</description>
<description xml:lang="fr">fr-session1MessageDestinationRef1-desc</description>
<description xml:lang="de">de-session1MessageDestinationRef1-desc</description>
<message-destination-ref-name>session1MessageDestinationRef1Name</message-destination-ref-name>
+ <jndi-name>session1MessageDestinationRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session1MessageDestinationRef1Injection1Class</injection-target-class>
<injection-target-name>session1MessageDestinationRef1Injection1Name</injection-target-name>
@@ -291,7 +233,6 @@
<injection-target-class>session1MessageDestinationRef1Injection2Class</injection-target-class>
<injection-target-name>session1MessageDestinationRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1MessageDestinationRef1JndiName</jndi-name>
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="session1MessageDestinationRef2-id">
@@ -299,6 +240,7 @@
<description xml:lang="fr">fr-session1MessageDestinationRef2-desc</description>
<description xml:lang="de">de-session1MessageDestinationRef2-desc</description>
<message-destination-ref-name>session1MessageDestinationRef2Name</message-destination-ref-name>
+ <jndi-name>session1MessageDestinationRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session1MessageDestinationRef2Injection1Class</injection-target-class>
<injection-target-name>session1MessageDestinationRef2Injection1Name</injection-target-name>
@@ -307,13 +249,13 @@
<injection-target-class>session1MessageDestinationRef2Injection2Class</injection-target-class>
<injection-target-name>session1MessageDestinationRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="session1MessageDestinationRef3-id">
<description>en-session1MessageDestinationRef3-desc</description>
<description xml:lang="fr">fr-session1MessageDestinationRef3-desc</description>
<description xml:lang="de">de-session1MessageDestinationRef3-desc</description>
<message-destination-ref-name>session1MessageDestinationRef3Name</message-destination-ref-name>
+ <jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
<injection-target>
<injection-target-class>session1MessageDestinationRef3Injection1Class</injection-target-class>
<injection-target-name>session1MessageDestinationRef3Injection1Name</injection-target-name>
@@ -322,7 +264,6 @@
<injection-target-class>session1MessageDestinationRef3Injection2Class</injection-target-class>
<injection-target-name>session1MessageDestinationRef3Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
<security-identity id="session1SecurityIdentity-id">
@@ -332,6 +273,67 @@
<run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
</security-identity>
+ <remote-binding id="session1RemoteBinding-id">
+ <description>en-session1RemoteBinding-desc</description>
+ <description xml:lang="fr">fr-session1RemoteBinding-desc</description>
+ <description xml:lang="de">de-session1RemoteBinding-desc</description>
+ <jndi-name>session1RemoteBindingJndiName</jndi-name>
+ <client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
+ <interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
+ <proxy-factory>session1RemoteBindingProxyFactory</proxy-factory>
+ <invoker-name>session1RemoteBindingInvokerName</invoker-name>
+ </remote-binding>
+
+ <jndi-name>session1JndiName</jndi-name>
+ <home-jndi-name>session1HomeJndiName</home-jndi-name>
+
+ <call-by-value>true</call-by-value>
+ <exception-on-rollback>true</exception-on-rollback>
+ <timer-persistence>true</timer-persistence>
+ <configuration-name>session1ConfigurationName</configuration-name>
+
+ <invoker-bindings id="session1InvokerBindings-id">
+ <description>en-session1InvokerBindings-desc</description>
+ <description xml:lang="fr">fr-session1InvokerBindings-desc</description>
+ <description xml:lang="de">de-session1InvokerBindings-desc</description>
+
+ <invoker id="session1Invoker1-id">
+ <description>en-session1Invoker1-desc</description>
+ <description xml:lang="fr">fr-session1Invoker1-desc</description>
+ <description xml:lang="de">de-session1Invoker1-desc</description>
+
+ <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
+ <jndi-name>session1Invoker1JndiName</jndi-name>
+
+ <ejb-ref>
+ <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
+ <jndi-name>session1Invoker1EjbName1</jndi-name>
+ </ejb-ref>
+ </invoker>
+ <invoker id="session1Invoker2-id">
+ <description>en-session1Invoker2-desc</description>
+ <description xml:lang="fr">fr-session1Invoker2-desc</description>
+ <description xml:lang="de">de-session1Invoker2-desc</description>
+
+ <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
+ <jndi-name>session1Invoker2JndiName</jndi-name>
+
+ <ejb-ref>
+ <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
+ <jndi-name>session1Invoker2EjbName1</jndi-name>
+ </ejb-ref>
+ <ejb-ref>
+ <ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
+ <jndi-name>session1Invoker2EjbName2</jndi-name>
+ </ejb-ref>
+ </invoker>
+ </invoker-bindings>
+
+ <security-proxy>session1SecurityProxy</security-proxy>
+
+ <local-jndi-name>session1LocalJndiName</local-jndi-name>
+ <local-home-jndi-name>session1LocalHomeJndiName</local-home-jndi-name>
+
<clustered>true</clustered>
<cluster-config id="session1ClusterConfig-id">
@@ -343,7 +345,7 @@
<bean-load-balance-policy>session1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
<session-state-manager-jndi-name>session1ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
</cluster-config>
-
+
<security-domain>session1SecurityDomain</security-domain>
<method-attributes id="session1MethodAttributes-id">
@@ -360,53 +362,7 @@
<depends>session1Depends1</depends>
<depends>session1Depends2</depends>
-
- <ior-security-config id="session1IorSecurityConfig-id">
- <description>en-session1IorSecurityConfig-desc</description>
- <description xml:lang="fr">fr-session1IorSecurityConfig-desc</description>
- <description xml:lang="de">de-session1IorSecurityConfig-desc</description>
- <transport-config id="session1TransportConfig-id">
- <description>en-session1TransportConfig-desc</description>
- <description xml:lang="fr">fr-session1TransportConfig-desc</description>
- <description xml:lang="de">de-session1TransportConfig-desc</description>
- <integrity>NONE</integrity>
- <confidentiality>NONE</confidentiality>
- <establish-trust-in-target>NONE</establish-trust-in-target>
- <establish-trust-in-client>NONE</establish-trust-in-client>
- <detect-misordering>NONE</detect-misordering>
- <detect-replay>NONE</detect-replay>
- </transport-config>
- <as-context id="session1ASContext-id">
- <description>en-session1ASContext-desc</description>
- <description xml:lang="fr">fr-session1ASContext-desc</description>
- <description xml:lang="de">de-session1ASContext-desc</description>
- <auth-method>USERNAME_PASSWORD</auth-method>
- <realm>session1ASContextRealm</realm>
- <required>false</required>
- </as-context>
- <sas-context id="session1SASContext-id">
- <description>en-session1SASContext-desc</description>
- <description xml:lang="fr">fr-session1SASContext-desc</description>
- <description xml:lang="de">de-session1SASContext-desc</description>
- <caller-propagation>NONE</caller-propagation>
- </sas-context>
- </ior-security-config>
-
- <port-component id="session1PortComponent-id">
- <port-component-name>session1-PortComponent</port-component-name>
- <port-component-uri>/session1/PortComponentURI</port-component-uri>
- <auth-method>BASIC</auth-method>
- <transport-guarantee>NONE</transport-guarantee>
- <secure-wsdl-access>true</secure-wsdl-access>
- </port-component>
-
- <ejb-timeout-identity id="session1EjbTimeoutIdentity-id">
- <description>en-session1EjbTimeoutIdentity-desc</description>
- <description xml:lang="fr">fr-session1EjbTimeoutIdentity-desc</description>
- <description xml:lang="de">de-session1EjbTimeoutIdentity-desc</description>
- <run-as-principal>session1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
- </ejb-timeout-identity>
-
+
<annotation id="session1Annotation1-id">
<description>en-session1Annotation1-desc</description>
<description xml:lang="fr">fr-session1Annotation1-desc</description>
@@ -524,7 +480,53 @@
<injection-target-name>session1JndiRef2Injection2Name</injection-target-name>
</injection-target>
</jndi-ref>
+
+ <port-component id="session1PortComponent-id">
+ <port-component-name>session1-PortComponent</port-component-name>
+ <port-component-uri>/session1/PortComponentURI</port-component-uri>
+ <auth-method>BASIC</auth-method>
+ <transport-guarantee>NONE</transport-guarantee>
+ <secure-wsdl-access>true</secure-wsdl-access>
+ </port-component>
+
+ <ejb-timeout-identity id="session1EjbTimeoutIdentity-id">
+ <description>en-session1EjbTimeoutIdentity-desc</description>
+ <description xml:lang="fr">fr-session1EjbTimeoutIdentity-desc</description>
+ <description xml:lang="de">de-session1EjbTimeoutIdentity-desc</description>
+ <run-as-principal>session1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
+ </ejb-timeout-identity>
+ <ior-security-config id="session1IorSecurityConfig-id">
+ <description>en-session1IorSecurityConfig-desc</description>
+ <description xml:lang="fr">fr-session1IorSecurityConfig-desc</description>
+ <description xml:lang="de">de-session1IorSecurityConfig-desc</description>
+ <transport-config id="session1TransportConfig-id">
+ <description>en-session1TransportConfig-desc</description>
+ <description xml:lang="fr">fr-session1TransportConfig-desc</description>
+ <description xml:lang="de">de-session1TransportConfig-desc</description>
+ <integrity>NONE</integrity>
+ <confidentiality>NONE</confidentiality>
+ <establish-trust-in-target>NONE</establish-trust-in-target>
+ <establish-trust-in-client>NONE</establish-trust-in-client>
+ <detect-misordering>NONE</detect-misordering>
+ <detect-replay>NONE</detect-replay>
+ </transport-config>
+ <as-context id="session1ASContext-id">
+ <description>en-session1ASContext-desc</description>
+ <description xml:lang="fr">fr-session1ASContext-desc</description>
+ <description xml:lang="de">de-session1ASContext-desc</description>
+ <auth-method>USERNAME_PASSWORD</auth-method>
+ <realm>session1ASContextRealm</realm>
+ <required>false</required>
+ </as-context>
+ <sas-context id="session1SASContext-id">
+ <description>en-session1SASContext-desc</description>
+ <description xml:lang="fr">fr-session1SASContext-desc</description>
+ <description xml:lang="de">de-session1SASContext-desc</description>
+ <caller-propagation>NONE</caller-propagation>
+ </sas-context>
+ </ior-security-config>
+
</session>
<session id="session2-id">
@@ -535,85 +537,27 @@
<display-name xml:lang="fr">fr-session2-disp</display-name>
<display-name xml:lang="de">de-session2-disp</display-name>
<icon id="en-session2-icon-id">
- <small-icon>en-session2-small-icon</small-icon>
- <large-icon>en-session2-large-icon</large-icon>
+ <jee:small-icon>en-session2-small-icon</jee:small-icon>
+ <jee:large-icon>en-session2-large-icon</jee:large-icon>
</icon>
<icon xml:lang="fr" id="fr-session2-icon-id">
- <small-icon>fr-session2-small-icon</small-icon>
- <large-icon>fr-session2-large-icon</large-icon>
+ <jee:small-icon>fr-session2-small-icon</jee:small-icon>
+ <jee:large-icon>fr-session2-large-icon</jee:large-icon>
</icon>
<icon xml:lang="de" id="de-session2-icon-id">
- <small-icon>de-session2-small-icon</small-icon>
- <large-icon>de-session2-large-icon</large-icon>
+ <jee:small-icon>de-session2-small-icon</jee:small-icon>
+ <jee:large-icon>de-session2-large-icon</jee:large-icon>
</icon>
<ejb-name>session2EjbName</ejb-name>
-
- <remote-binding id="session2RemoteBinding-id">
- <description>en-session2RemoteBinding-desc</description>
- <description xml:lang="fr">fr-session2RemoteBinding-desc</description>
- <description xml:lang="de">de-session2RemoteBinding-desc</description>
- <jndi-name>session2RemoteBindingJndiName</jndi-name>
- <client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
- <interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
- <proxy-factory>session2RemoteBindingProxyFactory</proxy-factory>
- <invoker-name>session2RemoteBindingInvokerName</invoker-name>
- </remote-binding>
- <jndi-name>session2JndiName</jndi-name>
- <home-jndi-name>session2HomeJndiName</home-jndi-name>
- <local-jndi-name>session2LocalJndiName</local-jndi-name>
- <local-home-jndi-name>session2LocalHomeJndiName</local-home-jndi-name>
- <call-by-value>false</call-by-value>
- <exception-on-rollback>false</exception-on-rollback>
- <timer-persistence>false</timer-persistence>
- <configuration-name>session2ConfigurationName</configuration-name>
-
- <invoker-bindings id="session2InvokerBindings-id">
- <description>en-session2InvokerBindings-desc</description>
- <description xml:lang="fr">fr-session2InvokerBindings-desc</description>
- <description xml:lang="de">de-session2InvokerBindings-desc</description>
-
- <invoker id="session2Invoker1-id">
- <description>en-session2Invoker1-desc</description>
- <description xml:lang="fr">fr-session2Invoker1-desc</description>
- <description xml:lang="de">de-session2Invoker1-desc</description>
-
- <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
- <jndi-name>session2Invoker1JndiName</jndi-name>
-
- <ejb-ref>
- <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
- <jndi-name>session2Invoker1EjbName1</jndi-name>
- </ejb-ref>
- </invoker>
- <invoker id="session2Invoker2-id">
- <description>en-session2Invoker2-desc</description>
- <description xml:lang="fr">fr-session2Invoker2-desc</description>
- <description xml:lang="de">de-session2Invoker2-desc</description>
-
- <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
- <jndi-name>session2Invoker2JndiName</jndi-name>
-
- <ejb-ref>
- <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
- <jndi-name>session2Invoker2EjbName1</jndi-name>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
- <jndi-name>session2Invoker2EjbName2</jndi-name>
- </ejb-ref>
- </invoker>
- </invoker-bindings>
-
- <security-proxy>session2SecurityProxy</security-proxy>
-
<ejb-ref id="session2EjbRef1-id">
<description>en-session2EjbRef1-desc</description>
<description xml:lang="fr">fr-session2EjbRef1-desc</description>
<description xml:lang="de">de-session2EjbRef1-desc</description>
<ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
+ <jndi-name>session2EjbRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session2EjbRef1Injection1Class</injection-target-class>
<injection-target-name>session2EjbRef1Injection1Name</injection-target-name>
@@ -622,7 +566,6 @@
<injection-target-class>session2EjbRef1Injection2Class</injection-target-class>
<injection-target-name>session2EjbRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2EjbRef1JndiName</jndi-name>
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="session2EjbRef2-id">
@@ -631,6 +574,7 @@
<description xml:lang="de">de-session2EjbRef2-desc</description>
<ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
+ <jndi-name>session2EjbRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session2EjbRef2Injection1Class</injection-target-class>
<injection-target-name>session2EjbRef2Injection1Name</injection-target-name>
@@ -639,7 +583,6 @@
<injection-target-class>session2EjbRef2Injection2Class</injection-target-class>
<injection-target-name>session2EjbRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2EjbRef2JndiName</jndi-name>
</ejb-ref>
<ejb-local-ref id="session2EjbLocalRef1-id">
@@ -648,6 +591,7 @@
<description xml:lang="de">de-session2EjbLocalRef1-desc</description>
<ejb-ref-name>session2EjbLocalRef1Name</ejb-ref-name>
+ <jndi-name>session2EjbLocalRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session2EjbLocalRef1Injection1Class</injection-target-class>
<injection-target-name>session2EjbLocalRef1Injection1Name</injection-target-name>
@@ -656,7 +600,6 @@
<injection-target-class>session2EjbLocalRef1Injection2Class</injection-target-class>
<injection-target-name>session2EjbLocalRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2EjbLocalRef1JndiName</jndi-name>
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="session2EjbLocalRef2-id">
@@ -665,6 +608,7 @@
<description xml:lang="de">de-session2EjbLocalRef2-desc</description>
<ejb-ref-name>session2EjbLocalRef2Name</ejb-ref-name>
+ <jndi-name>session2EjbLocalRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session2EjbLocalRef2Injection1Class</injection-target-class>
<injection-target-name>session2EjbLocalRef2Injection1Name</injection-target-name>
@@ -673,7 +617,6 @@
<injection-target-class>session2EjbLocalRef2Injection2Class</injection-target-class>
<injection-target-name>session2EjbLocalRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2EjbLocalRef2JndiName</jndi-name>
</ejb-local-ref>
<!-- TODO service-ref -->
@@ -683,6 +626,7 @@
<description xml:lang="fr">fr-session2ResourceRef1-desc</description>
<description xml:lang="de">de-session2ResourceRef1-desc</description>
<res-ref-name>session2ResourceRef1Name</res-ref-name>
+ <jndi-name>session2ResourceRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session2ResourceRef1Injection1Class</injection-target-class>
<injection-target-name>session2ResourceRef1Injection1Name</injection-target-name>
@@ -691,7 +635,6 @@
<injection-target-class>session2ResourceRef1Injection2Class</injection-target-class>
<injection-target-name>session2ResourceRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2ResourceRef1JndiName</jndi-name>
<ignore-dependency/>
</resource-ref>
<resource-ref id="session2ResourceRef2-id">
@@ -699,6 +642,7 @@
<description xml:lang="fr">fr-session2ResourceRef2-desc</description>
<description xml:lang="de">de-session2ResourceRef2-desc</description>
<res-ref-name>session2ResourceRef2Name</res-ref-name>
+ <jndi-name>session2ResourceRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session2ResourceRef2Injection1Class</injection-target-class>
<injection-target-name>session2ResourceRef2Injection1Name</injection-target-name>
@@ -707,13 +651,13 @@
<injection-target-class>session2ResourceRef2Injection2Class</injection-target-class>
<injection-target-name>session2ResourceRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="session2ResourceEnvRef1-id">
<description>en-session2ResourceEnvRef1-desc</description>
<description xml:lang="fr">fr-session2ResourceEnvRef1-desc</description>
<description xml:lang="de">de-session2ResourceEnvRef1-desc</description>
<resource-env-ref-name>session2ResourceEnvRef1Name</resource-env-ref-name>
+ <jndi-name>session2ResourceEnvRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session2ResourceEnvRef1Injection1Class</injection-target-class>
<injection-target-name>session2ResourceEnvRef1Injection1Name</injection-target-name>
@@ -722,7 +666,6 @@
<injection-target-class>session2ResourceEnvRef1Injection2Class</injection-target-class>
<injection-target-name>session2ResourceEnvRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2ResourceEnvRef1JndiName</jndi-name>
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="session2ResourceEnvRef2-id">
@@ -730,6 +673,7 @@
<description xml:lang="fr">fr-session2ResourceEnvRef2-desc</description>
<description xml:lang="de">de-session2ResourceEnvRef2-desc</description>
<resource-env-ref-name>session2ResourceEnvRef2Name</resource-env-ref-name>
+ <jndi-name>session2ResourceEnvRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session2ResourceEnvRef2Injection1Class</injection-target-class>
<injection-target-name>session2ResourceEnvRef2Injection1Name</injection-target-name>
@@ -738,13 +682,13 @@
<injection-target-class>session2ResourceEnvRef2Injection2Class</injection-target-class>
<injection-target-name>session2ResourceEnvRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="session2MessageDestinationRef1-id">
<description>en-session2MessageDestinationRef1-desc</description>
<description xml:lang="fr">fr-session2MessageDestinationRef1-desc</description>
<description xml:lang="de">de-session2MessageDestinationRef1-desc</description>
<message-destination-ref-name>session2MessageDestinationRef1Name</message-destination-ref-name>
+ <jndi-name>session2MessageDestinationRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>session2MessageDestinationRef1Injection1Class</injection-target-class>
<injection-target-name>session2MessageDestinationRef1Injection1Name</injection-target-name>
@@ -753,7 +697,6 @@
<injection-target-class>session2MessageDestinationRef1Injection2Class</injection-target-class>
<injection-target-name>session2MessageDestinationRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2MessageDestinationRef1JndiName</jndi-name>
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="session2MessageDestinationRef2-id">
@@ -761,6 +704,7 @@
<description xml:lang="fr">fr-session2MessageDestinationRef2-desc</description>
<description xml:lang="de">de-session2MessageDestinationRef2-desc</description>
<message-destination-ref-name>session2MessageDestinationRef2Name</message-destination-ref-name>
+ <jndi-name>session2MessageDestinationRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>session2MessageDestinationRef2Injection1Class</injection-target-class>
<injection-target-name>session2MessageDestinationRef2Injection1Name</injection-target-name>
@@ -769,13 +713,13 @@
<injection-target-class>session2MessageDestinationRef2Injection2Class</injection-target-class>
<injection-target-name>session2MessageDestinationRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="session2MessageDestinationRef3-id">
<description>en-session2MessageDestinationRef3-desc</description>
<description xml:lang="fr">fr-session2MessageDestinationRef3-desc</description>
<description xml:lang="de">de-session2MessageDestinationRef3-desc</description>
<message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
+ <jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
<injection-target>
<injection-target-class>session2MessageDestinationRef3Injection1Class</injection-target-class>
<injection-target-name>session2MessageDestinationRef3Injection1Name</injection-target-name>
@@ -784,16 +728,76 @@
<injection-target-class>session2MessageDestinationRef3Injection2Class</injection-target-class>
<injection-target-name>session2MessageDestinationRef3Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
-
+
<security-identity id="session2SecurityIdentity-id">
<description>en-session2SecurityIdentity-desc</description>
<description xml:lang="fr">fr-session2SecurityIdentity-desc</description>
<description xml:lang="de">de-session2SecurityIdentity-desc</description>
<run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
</security-identity>
+
+ <remote-binding id="session2RemoteBinding-id">
+ <description>en-session2RemoteBinding-desc</description>
+ <description xml:lang="fr">fr-session2RemoteBinding-desc</description>
+ <description xml:lang="de">de-session2RemoteBinding-desc</description>
+ <jndi-name>session2RemoteBindingJndiName</jndi-name>
+ <client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
+ <interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
+ <proxy-factory>session2RemoteBindingProxyFactory</proxy-factory>
+ <invoker-name>session2RemoteBindingInvokerName</invoker-name>
+ </remote-binding>
+ <jndi-name>session2JndiName</jndi-name>
+ <home-jndi-name>session2HomeJndiName</home-jndi-name>
+
+ <call-by-value>false</call-by-value>
+ <exception-on-rollback>false</exception-on-rollback>
+ <timer-persistence>false</timer-persistence>
+ <configuration-name>session2ConfigurationName</configuration-name>
+
+ <invoker-bindings id="session2InvokerBindings-id">
+ <description>en-session2InvokerBindings-desc</description>
+ <description xml:lang="fr">fr-session2InvokerBindings-desc</description>
+ <description xml:lang="de">de-session2InvokerBindings-desc</description>
+
+ <invoker id="session2Invoker1-id">
+ <description>en-session2Invoker1-desc</description>
+ <description xml:lang="fr">fr-session2Invoker1-desc</description>
+ <description xml:lang="de">de-session2Invoker1-desc</description>
+
+ <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
+ <jndi-name>session2Invoker1JndiName</jndi-name>
+
+ <ejb-ref>
+ <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
+ <jndi-name>session2Invoker1EjbName1</jndi-name>
+ </ejb-ref>
+ </invoker>
+ <invoker id="session2Invoker2-id">
+ <description>en-session2Invoker2-desc</description>
+ <description xml:lang="fr">fr-session2Invoker2-desc</description>
+ <description xml:lang="de">de-session2Invoker2-desc</description>
+
+ <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
+ <jndi-name>session2Invoker2JndiName</jndi-name>
+
+ <ejb-ref>
+ <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
+ <jndi-name>session2Invoker2EjbName1</jndi-name>
+ </ejb-ref>
+ <ejb-ref>
+ <ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
+ <jndi-name>session2Invoker2EjbName2</jndi-name>
+ </ejb-ref>
+ </invoker>
+ </invoker-bindings>
+
+ <security-proxy>session2SecurityProxy</security-proxy>
+
+ <local-jndi-name>session2LocalJndiName</local-jndi-name>
+ <local-home-jndi-name>session2LocalHomeJndiName</local-home-jndi-name>
+
<clustered>false</clustered>
<cluster-config id="session2ClusterConfig-id">
@@ -807,7 +811,7 @@
</cluster-config>
<security-domain>session2SecurityDomain</security-domain>
-
+
<method-attributes id="session2MethodAttributes-id">
<method id="session2MethodAttributesMethod1-id">
<method-name>get*</method-name>
@@ -822,53 +826,7 @@
<depends>session2Depends1</depends>
<depends>session2Depends2</depends>
-
- <ior-security-config id="session2IorSecurityConfig-id">
- <description>en-session2IorSecurityConfig-desc</description>
- <description xml:lang="fr">fr-session2IorSecurityConfig-desc</description>
- <description xml:lang="de">de-session2IorSecurityConfig-desc</description>
- <transport-config id="session2TransportConfig-id">
- <description>en-session2TransportConfig-desc</description>
- <description xml:lang="fr">fr-session2TransportConfig-desc</description>
- <description xml:lang="de">de-session2TransportConfig-desc</description>
- <integrity>NONE</integrity>
- <confidentiality>NONE</confidentiality>
- <establish-trust-in-target>NONE</establish-trust-in-target>
- <establish-trust-in-client>NONE</establish-trust-in-client>
- <detect-misordering>NONE</detect-misordering>
- <detect-replay>NONE</detect-replay>
- </transport-config>
- <as-context id="session2ASContext-id">
- <description>en-session2ASContext-desc</description>
- <description xml:lang="fr">fr-session2ASContext-desc</description>
- <description xml:lang="de">de-session2ASContext-desc</description>
- <auth-method>USERNAME_PASSWORD</auth-method>
- <realm>session2ASContextRealm</realm>
- <required>false</required>
- </as-context>
- <sas-context id="session2SASContext-id">
- <description>en-session2SASContext-desc</description>
- <description xml:lang="fr">fr-session2SASContext-desc</description>
- <description xml:lang="de">de-session2SASContext-desc</description>
- <caller-propagation>NONE</caller-propagation>
- </sas-context>
- </ior-security-config>
-
- <port-component id="session2PortComponent-id">
- <port-component-name>session2-PortComponent</port-component-name>
- <port-component-uri>/session2/PortComponentURI</port-component-uri>
- <auth-method>BASIC</auth-method>
- <transport-guarantee>NONE</transport-guarantee>
- <secure-wsdl-access>true</secure-wsdl-access>
- </port-component>
-
- <ejb-timeout-identity id="session2EjbTimeoutIdentity-id">
- <description>en-session2EjbTimeoutIdentity-desc</description>
- <description xml:lang="fr">fr-session2EjbTimeoutIdentity-desc</description>
- <description xml:lang="de">de-session2EjbTimeoutIdentity-desc</description>
- <run-as-principal>session2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
- </ejb-timeout-identity>
-
+
<annotation id="session2Annotation1-id">
<description>en-session2Annotation1-desc</description>
<description xml:lang="fr">fr-session2Annotation1-desc</description>
@@ -986,6 +944,52 @@
</injection-target>
</jndi-ref>
+ <port-component id="session2PortComponent-id">
+ <port-component-name>session2-PortComponent</port-component-name>
+ <port-component-uri>/session2/PortComponentURI</port-component-uri>
+ <auth-method>BASIC</auth-method>
+ <transport-guarantee>NONE</transport-guarantee>
+ <secure-wsdl-access>true</secure-wsdl-access>
+ </port-component>
+
+ <ejb-timeout-identity id="session2EjbTimeoutIdentity-id">
+ <description>en-session2EjbTimeoutIdentity-desc</description>
+ <description xml:lang="fr">fr-session2EjbTimeoutIdentity-desc</description>
+ <description xml:lang="de">de-session2EjbTimeoutIdentity-desc</description>
+ <run-as-principal>session2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
+ </ejb-timeout-identity>
+
+ <ior-security-config id="session2IorSecurityConfig-id">
+ <description>en-session2IorSecurityConfig-desc</description>
+ <description xml:lang="fr">fr-session2IorSecurityConfig-desc</description>
+ <description xml:lang="de">de-session2IorSecurityConfig-desc</description>
+ <transport-config id="session2TransportConfig-id">
+ <description>en-session2TransportConfig-desc</description>
+ <description xml:lang="fr">fr-session2TransportConfig-desc</description>
+ <description xml:lang="de">de-session2TransportConfig-desc</description>
+ <integrity>NONE</integrity>
+ <confidentiality>NONE</confidentiality>
+ <establish-trust-in-target>NONE</establish-trust-in-target>
+ <establish-trust-in-client>NONE</establish-trust-in-client>
+ <detect-misordering>NONE</detect-misordering>
+ <detect-replay>NONE</detect-replay>
+ </transport-config>
+ <as-context id="session2ASContext-id">
+ <description>en-session2ASContext-desc</description>
+ <description xml:lang="fr">fr-session2ASContext-desc</description>
+ <description xml:lang="de">de-session2ASContext-desc</description>
+ <auth-method>USERNAME_PASSWORD</auth-method>
+ <realm>session2ASContextRealm</realm>
+ <required>false</required>
+ </as-context>
+ <sas-context id="session2SASContext-id">
+ <description>en-session2SASContext-desc</description>
+ <description xml:lang="fr">fr-session2SASContext-desc</description>
+ <description xml:lang="de">de-session2SASContext-desc</description>
+ <caller-propagation>NONE</caller-propagation>
+ </sas-context>
+ </ior-security-config>
+
</session>
<message-driven>
@@ -1000,16 +1004,16 @@
<display-name xml:lang="fr">fr-mdb1-disp</display-name>
<display-name xml:lang="de">de-mdb1-disp</display-name>
<icon id="en-mdb1-icon-id">
- <small-icon>en-mdb1-small-icon</small-icon>
- <large-icon>en-mdb1-large-icon</large-icon>
+ <jee:small-icon>en-mdb1-small-icon</jee:small-icon>
+ <jee:large-icon>en-mdb1-large-icon</jee:large-icon>
</icon>
<icon xml:lang="fr" id="fr-mdb1-icon-id">
- <small-icon>fr-mdb1-small-icon</small-icon>
- <large-icon>fr-mdb1-large-icon</large-icon>
+ <jee:small-icon>fr-mdb1-small-icon</jee:small-icon>
+ <jee:large-icon>fr-mdb1-large-icon</jee:large-icon>
</icon>
<icon xml:lang="de" id="de-mdb1-icon-id">
- <small-icon>de-mdb1-small-icon</small-icon>
- <large-icon>de-mdb1-large-icon</large-icon>
+ <jee:small-icon>de-mdb1-small-icon</jee:small-icon>
+ <jee:large-icon>de-mdb1-large-icon</jee:large-icon>
</icon>
<ejb-name>mdb1EjbName</ejb-name>
@@ -1081,6 +1085,7 @@
<description xml:lang="de">de-mdb1EjbRef1-desc</description>
<ejb-ref-name>mdb1EjbRef1Name</ejb-ref-name>
+ <jndi-name>mdb1EjbRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1EjbRef1Injection1Class</injection-target-class>
<injection-target-name>mdb1EjbRef1Injection1Name</injection-target-name>
@@ -1089,7 +1094,6 @@
<injection-target-class>mdb1EjbRef1Injection2Class</injection-target-class>
<injection-target-name>mdb1EjbRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1EjbRef1JndiName</jndi-name>
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="mdb1EjbRef2-id">
@@ -1098,6 +1102,7 @@
<description xml:lang="de">de-mdb1EjbRef2-desc</description>
<ejb-ref-name>mdb1EjbRef2Name</ejb-ref-name>
+ <jndi-name>mdb1EjbRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1EjbRef2Injection1Class</injection-target-class>
<injection-target-name>mdb1EjbRef2Injection1Name</injection-target-name>
@@ -1106,7 +1111,6 @@
<injection-target-class>mdb1EjbRef2Injection2Class</injection-target-class>
<injection-target-name>mdb1EjbRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1EjbRef2JndiName</jndi-name>
</ejb-ref>
<ejb-local-ref id="mdb1EjbLocalRef1-id">
@@ -1115,6 +1119,7 @@
<description xml:lang="de">de-mdb1EjbLocalRef1-desc</description>
<ejb-ref-name>mdb1EjbLocalRef1Name</ejb-ref-name>
+ <jndi-name>mdb1EjbLocalRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1EjbLocalRef1Injection1Class</injection-target-class>
<injection-target-name>mdb1EjbLocalRef1Injection1Name</injection-target-name>
@@ -1123,7 +1128,6 @@
<injection-target-class>mdb1EjbLocalRef1Injection2Class</injection-target-class>
<injection-target-name>mdb1EjbLocalRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1EjbLocalRef1JndiName</jndi-name>
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="mdb1EjbLocalRef2-id">
@@ -1132,6 +1136,7 @@
<description xml:lang="de">de-mdb1EjbLocalRef2-desc</description>
<ejb-ref-name>mdb1EjbLocalRef2Name</ejb-ref-name>
+ <jndi-name>mdb1EjbLocalRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1EjbLocalRef2Injection1Class</injection-target-class>
<injection-target-name>mdb1EjbLocalRef2Injection1Name</injection-target-name>
@@ -1140,7 +1145,6 @@
<injection-target-class>mdb1EjbLocalRef2Injection2Class</injection-target-class>
<injection-target-name>mdb1EjbLocalRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1EjbLocalRef2JndiName</jndi-name>
</ejb-local-ref>
<!-- TODO service-ref -->
@@ -1150,6 +1154,7 @@
<description xml:lang="fr">fr-mdb1ResourceRef1-desc</description>
<description xml:lang="de">de-mdb1ResourceRef1-desc</description>
<res-ref-name>mdb1ResourceRef1Name</res-ref-name>
+ <jndi-name>mdb1ResourceRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1ResourceRef1Injection1Class</injection-target-class>
<injection-target-name>mdb1ResourceRef1Injection1Name</injection-target-name>
@@ -1158,7 +1163,6 @@
<injection-target-class>mdb1ResourceRef1Injection2Class</injection-target-class>
<injection-target-name>mdb1ResourceRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1ResourceRef1JndiName</jndi-name>
<ignore-dependency/>
</resource-ref>
<resource-ref id="mdb1ResourceRef2-id">
@@ -1166,6 +1170,7 @@
<description xml:lang="fr">fr-mdb1ResourceRef2-desc</description>
<description xml:lang="de">de-mdb1ResourceRef2-desc</description>
<res-ref-name>mdb1ResourceRef2Name</res-ref-name>
+ <jndi-name>mdb1ResourceRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1ResourceRef2Injection1Class</injection-target-class>
<injection-target-name>mdb1ResourceRef2Injection1Name</injection-target-name>
@@ -1174,13 +1179,13 @@
<injection-target-class>mdb1ResourceRef2Injection2Class</injection-target-class>
<injection-target-name>mdb1ResourceRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="mdb1ResourceEnvRef1-id">
<description>en-mdb1ResourceEnvRef1-desc</description>
<description xml:lang="fr">fr-mdb1ResourceEnvRef1-desc</description>
<description xml:lang="de">de-mdb1ResourceEnvRef1-desc</description>
<resource-env-ref-name>mdb1ResourceEnvRef1Name</resource-env-ref-name>
+ <jndi-name>mdb1ResourceEnvRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1ResourceEnvRef1Injection1Class</injection-target-class>
<injection-target-name>mdb1ResourceEnvRef1Injection1Name</injection-target-name>
@@ -1189,7 +1194,6 @@
<injection-target-class>mdb1ResourceEnvRef1Injection2Class</injection-target-class>
<injection-target-name>mdb1ResourceEnvRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1ResourceEnvRef1JndiName</jndi-name>
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="mdb1ResourceEnvRef2-id">
@@ -1197,6 +1201,7 @@
<description xml:lang="fr">fr-mdb1ResourceEnvRef2-desc</description>
<description xml:lang="de">de-mdb1ResourceEnvRef2-desc</description>
<resource-env-ref-name>mdb1ResourceEnvRef2Name</resource-env-ref-name>
+ <jndi-name>mdb1ResourceEnvRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1ResourceEnvRef2Injection1Class</injection-target-class>
<injection-target-name>mdb1ResourceEnvRef2Injection1Name</injection-target-name>
@@ -1205,13 +1210,13 @@
<injection-target-class>mdb1ResourceEnvRef2Injection2Class</injection-target-class>
<injection-target-name>mdb1ResourceEnvRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="mdb1MessageDestinationRef1-id">
<description>en-mdb1MessageDestinationRef1-desc</description>
<description xml:lang="fr">fr-mdb1MessageDestinationRef1-desc</description>
<description xml:lang="de">de-mdb1MessageDestinationRef1-desc</description>
<message-destination-ref-name>mdb1MessageDestinationRef1Name</message-destination-ref-name>
+ <jndi-name>mdb1MessageDestinationRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1MessageDestinationRef1Injection1Class</injection-target-class>
<injection-target-name>mdb1MessageDestinationRef1Injection1Name</injection-target-name>
@@ -1220,7 +1225,6 @@
<injection-target-class>mdb1MessageDestinationRef1Injection2Class</injection-target-class>
<injection-target-name>mdb1MessageDestinationRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1MessageDestinationRef1JndiName</jndi-name>
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="mdb1MessageDestinationRef2-id">
@@ -1228,6 +1232,7 @@
<description xml:lang="fr">fr-mdb1MessageDestinationRef2-desc</description>
<description xml:lang="de">de-mdb1MessageDestinationRef2-desc</description>
<message-destination-ref-name>mdb1MessageDestinationRef2Name</message-destination-ref-name>
+ <jndi-name>mdb1MessageDestinationRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1MessageDestinationRef2Injection1Class</injection-target-class>
<injection-target-name>mdb1MessageDestinationRef2Injection1Name</injection-target-name>
@@ -1236,13 +1241,13 @@
<injection-target-class>mdb1MessageDestinationRef2Injection2Class</injection-target-class>
<injection-target-name>mdb1MessageDestinationRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="mdb1MessageDestinationRef3-id">
<description>en-mdb1MessageDestinationRef3-desc</description>
<description xml:lang="fr">fr-mdb1MessageDestinationRef3-desc</description>
<description xml:lang="de">de-mdb1MessageDestinationRef3-desc</description>
<message-destination-ref-name>mdb1MessageDestinationRef3Name</message-destination-ref-name>
+ <jndi-name>mdb1MessageDestinationRef3JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb1MessageDestinationRef3Injection1Class</injection-target-class>
<injection-target-name>mdb1MessageDestinationRef3Injection1Name</injection-target-name>
@@ -1251,9 +1256,15 @@
<injection-target-class>mdb1MessageDestinationRef3Injection2Class</injection-target-class>
<injection-target-name>mdb1MessageDestinationRef3Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity id="mdb1SecurityIdentity-id">
+ <description>en-mdb1SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
+ <description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
+ <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<method-attributes id="mdb1MethodAttributes-id">
<method id="mdb1MethodAttributesMethod1-id">
<method-name>get*</method-name>
@@ -1266,13 +1277,6 @@
</method>
</method-attributes>
- <security-identity id="mdb1SecurityIdentity-id">
- <description>en-mdb1SecurityIdentity-desc</description>
- <description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
- <description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
- <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<depends>mdb1Depends1</depends>
<depends>mdb1Depends2</depends>
@@ -1425,16 +1429,16 @@
<display-name xml:lang="fr">fr-mdb2-disp</display-name>
<display-name xml:lang="de">de-mdb2-disp</display-name>
<icon id="en-mdb2-icon-id">
- <small-icon>en-mdb2-small-icon</small-icon>
- <large-icon>en-mdb2-large-icon</large-icon>
+ <jee:small-icon>en-mdb2-small-icon</jee:small-icon>
+ <jee:large-icon>en-mdb2-large-icon</jee:large-icon>
</icon>
<icon xml:lang="fr" id="fr-mdb2-icon-id">
- <small-icon>fr-mdb2-small-icon</small-icon>
- <large-icon>fr-mdb2-large-icon</large-icon>
+ <jee:small-icon>fr-mdb2-small-icon</jee:small-icon>
+ <jee:large-icon>fr-mdb2-large-icon</jee:large-icon>
</icon>
<icon xml:lang="de" id="de-mdb2-icon-id">
- <small-icon>de-mdb2-small-icon</small-icon>
- <large-icon>de-mdb2-large-icon</large-icon>
+ <jee:small-icon>de-mdb2-small-icon</jee:small-icon>
+ <jee:large-icon>de-mdb2-large-icon</jee:large-icon>
</icon>
<ejb-name>mdb2EjbName</ejb-name>
@@ -1505,6 +1509,7 @@
<description xml:lang="de">de-mdb2EjbRef1-desc</description>
<ejb-ref-name>mdb2EjbRef1Name</ejb-ref-name>
+ <jndi-name>mdb2EjbRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2EjbRef1Injection1Class</injection-target-class>
<injection-target-name>mdb2EjbRef1Injection1Name</injection-target-name>
@@ -1513,7 +1518,6 @@
<injection-target-class>mdb2EjbRef1Injection2Class</injection-target-class>
<injection-target-name>mdb2EjbRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2EjbRef1JndiName</jndi-name>
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="mdb2EjbRef2-id">
@@ -1522,6 +1526,7 @@
<description xml:lang="de">de-mdb2EjbRef2-desc</description>
<ejb-ref-name>mdb2EjbRef2Name</ejb-ref-name>
+ <jndi-name>mdb2EjbRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2EjbRef2Injection1Class</injection-target-class>
<injection-target-name>mdb2EjbRef2Injection1Name</injection-target-name>
@@ -1530,7 +1535,6 @@
<injection-target-class>mdb2EjbRef2Injection2Class</injection-target-class>
<injection-target-name>mdb2EjbRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2EjbRef2JndiName</jndi-name>
</ejb-ref>
<ejb-local-ref id="mdb2EjbLocalRef1-id">
@@ -1539,6 +1543,7 @@
<description xml:lang="de">de-mdb2EjbLocalRef1-desc</description>
<ejb-ref-name>mdb2EjbLocalRef1Name</ejb-ref-name>
+ <jndi-name>mdb2EjbLocalRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2EjbLocalRef1Injection1Class</injection-target-class>
<injection-target-name>mdb2EjbLocalRef1Injection1Name</injection-target-name>
@@ -1547,7 +1552,6 @@
<injection-target-class>mdb2EjbLocalRef1Injection2Class</injection-target-class>
<injection-target-name>mdb2EjbLocalRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2EjbLocalRef1JndiName</jndi-name>
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="mdb2EjbLocalRef2-id">
@@ -1556,6 +1560,7 @@
<description xml:lang="de">de-mdb2EjbLocalRef2-desc</description>
<ejb-ref-name>mdb2EjbLocalRef2Name</ejb-ref-name>
+ <jndi-name>mdb2EjbLocalRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2EjbLocalRef2Injection1Class</injection-target-class>
<injection-target-name>mdb2EjbLocalRef2Injection1Name</injection-target-name>
@@ -1564,7 +1569,6 @@
<injection-target-class>mdb2EjbLocalRef2Injection2Class</injection-target-class>
<injection-target-name>mdb2EjbLocalRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2EjbLocalRef2JndiName</jndi-name>
</ejb-local-ref>
<!-- TODO service-ref -->
@@ -1574,6 +1578,7 @@
<description xml:lang="fr">fr-mdb2ResourceRef1-desc</description>
<description xml:lang="de">de-mdb2ResourceRef1-desc</description>
<res-ref-name>mdb2ResourceRef1Name</res-ref-name>
+ <jndi-name>mdb2ResourceRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2ResourceRef1Injection1Class</injection-target-class>
<injection-target-name>mdb2ResourceRef1Injection1Name</injection-target-name>
@@ -1582,7 +1587,6 @@
<injection-target-class>mdb2ResourceRef1Injection2Class</injection-target-class>
<injection-target-name>mdb2ResourceRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2ResourceRef1JndiName</jndi-name>
<ignore-dependency/>
</resource-ref>
<resource-ref id="mdb2ResourceRef2-id">
@@ -1590,6 +1594,7 @@
<description xml:lang="fr">fr-mdb2ResourceRef2-desc</description>
<description xml:lang="de">de-mdb2ResourceRef2-desc</description>
<res-ref-name>mdb2ResourceRef2Name</res-ref-name>
+ <jndi-name>mdb2ResourceRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2ResourceRef2Injection1Class</injection-target-class>
<injection-target-name>mdb2ResourceRef2Injection1Name</injection-target-name>
@@ -1598,13 +1603,13 @@
<injection-target-class>mdb2ResourceRef2Injection2Class</injection-target-class>
<injection-target-name>mdb2ResourceRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="mdb2ResourceEnvRef1-id">
<description>en-mdb2ResourceEnvRef1-desc</description>
<description xml:lang="fr">fr-mdb2ResourceEnvRef1-desc</description>
<description xml:lang="de">de-mdb2ResourceEnvRef1-desc</description>
<resource-env-ref-name>mdb2ResourceEnvRef1Name</resource-env-ref-name>
+ <jndi-name>mdb2ResourceEnvRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2ResourceEnvRef1Injection1Class</injection-target-class>
<injection-target-name>mdb2ResourceEnvRef1Injection1Name</injection-target-name>
@@ -1613,7 +1618,6 @@
<injection-target-class>mdb2ResourceEnvRef1Injection2Class</injection-target-class>
<injection-target-name>mdb2ResourceEnvRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2ResourceEnvRef1JndiName</jndi-name>
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="mdb2ResourceEnvRef2-id">
@@ -1621,6 +1625,7 @@
<description xml:lang="fr">fr-mdb2ResourceEnvRef2-desc</description>
<description xml:lang="de">de-mdb2ResourceEnvRef2-desc</description>
<resource-env-ref-name>mdb2ResourceEnvRef2Name</resource-env-ref-name>
+ <jndi-name>mdb2ResourceEnvRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2ResourceEnvRef2Injection1Class</injection-target-class>
<injection-target-name>mdb2ResourceEnvRef2Injection1Name</injection-target-name>
@@ -1629,13 +1634,13 @@
<injection-target-class>mdb2ResourceEnvRef2Injection2Class</injection-target-class>
<injection-target-name>mdb2ResourceEnvRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="mdb2MessageDestinationRef1-id">
<description>en-mdb2MessageDestinationRef1-desc</description>
<description xml:lang="fr">fr-mdb2MessageDestinationRef1-desc</description>
<description xml:lang="de">de-mdb2MessageDestinationRef1-desc</description>
<message-destination-ref-name>mdb2MessageDestinationRef1Name</message-destination-ref-name>
+ <jndi-name>mdb2MessageDestinationRef1JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2MessageDestinationRef1Injection1Class</injection-target-class>
<injection-target-name>mdb2MessageDestinationRef1Injection1Name</injection-target-name>
@@ -1644,7 +1649,6 @@
<injection-target-class>mdb2MessageDestinationRef1Injection2Class</injection-target-class>
<injection-target-name>mdb2MessageDestinationRef1Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2MessageDestinationRef1JndiName</jndi-name>
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="mdb2MessageDestinationRef2-id">
@@ -1652,6 +1656,7 @@
<description xml:lang="fr">fr-mdb2MessageDestinationRef2-desc</description>
<description xml:lang="de">de-mdb2MessageDestinationRef2-desc</description>
<message-destination-ref-name>mdb2MessageDestinationRef2Name</message-destination-ref-name>
+ <jndi-name>mdb2MessageDestinationRef2JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2MessageDestinationRef2Injection1Class</injection-target-class>
<injection-target-name>mdb2MessageDestinationRef2Injection1Name</injection-target-name>
@@ -1660,13 +1665,13 @@
<injection-target-class>mdb2MessageDestinationRef2Injection2Class</injection-target-class>
<injection-target-name>mdb2MessageDestinationRef2Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="mdb2MessageDestinationRef3-id">
<description>en-mdb2MessageDestinationRef3-desc</description>
<description xml:lang="fr">fr-mdb2MessageDestinationRef3-desc</description>
<description xml:lang="de">de-mdb2MessageDestinationRef3-desc</description>
<message-destination-ref-name>mdb2MessageDestinationRef3Name</message-destination-ref-name>
+ <jndi-name>mdb2MessageDestinationRef3JndiName</jndi-name>
<injection-target>
<injection-target-class>mdb2MessageDestinationRef3Injection1Class</injection-target-class>
<injection-target-name>mdb2MessageDestinationRef3Injection1Name</injection-target-name>
@@ -1675,8 +1680,14 @@
<injection-target-class>mdb2MessageDestinationRef3Injection2Class</injection-target-class>
<injection-target-name>mdb2MessageDestinationRef3Injection2Name</injection-target-name>
</injection-target>
- <jndi-name>mdb2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+
+ <security-identity id="mdb2SecurityIdentity-id">
+ <description>en-mdb2SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
+ <description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
+ <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
<method-attributes id="mdb2MethodAttributes-id">
<method id="mdb2MethodAttributesMethod1-id">
@@ -1689,13 +1700,6 @@
<method-name>*</method-name>
</method>
</method-attributes>
-
- <security-identity id="mdb2SecurityIdentity-id">
- <description>en-mdb2SecurityIdentity-desc</description>
- <description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
- <description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
- <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
<depends>mdb2Depends1</depends>
<depends>mdb2Depends2</depends>
@@ -1870,16 +1874,16 @@
<display-name xml:lang="fr">fr-messageDestination1-disp</display-name>
<display-name xml:lang="de">de-messageDestination1-disp</display-name>
<icon id="en-messageDestination1-icon-id">
- <small-icon>en-messageDestination1-small-icon</small-icon>
- <large-icon>en-messageDestination1-large-icon</large-icon>
+ <jee:small-icon>en-messageDestination1-small-icon</jee:small-icon>
+ <jee:large-icon>en-messageDestination1-large-icon</jee:large-icon>
</icon>
<icon xml:lang="fr" id="fr-messageDestination1-icon-id">
- <small-icon>fr-messageDestination1-small-icon</small-icon>
- <large-icon>fr-messageDestination1-large-icon</large-icon>
+ <jee:small-icon>fr-messageDestination1-small-icon</jee:small-icon>
+ <jee:large-icon>fr-messageDestination1-large-icon</jee:large-icon>
</icon>
<icon xml:lang="de" id="de-messageDestination1-icon-id">
- <small-icon>de-messageDestination1-small-icon</small-icon>
- <large-icon>de-messageDestination1-large-icon</large-icon>
+ <jee:small-icon>de-messageDestination1-small-icon</jee:small-icon>
+ <jee:large-icon>de-messageDestination1-large-icon</jee:large-icon>
</icon>
<message-destination-name>messageDestination1Name</message-destination-name>
<jndi-name>messageDestination1JndiName</jndi-name>
@@ -1892,16 +1896,16 @@
<display-name xml:lang="fr">fr-messageDestination2-disp</display-name>
<display-name xml:lang="de">de-messageDestination2-disp</display-name>
<icon id="en-messageDestination2-icon-id">
- <small-icon>en-messageDestination2-small-icon</small-icon>
- <large-icon>en-messageDestination2-large-icon</large-icon>
+ <jee:small-icon>en-messageDestination2-small-icon</jee:small-icon>
+ <jee:large-icon>en-messageDestination2-large-icon</jee:large-icon>
</icon>
<icon xml:lang="fr" id="fr-messageDestination2-icon-id">
- <small-icon>fr-messageDestination2-small-icon</small-icon>
- <large-icon>fr-messageDestination2-large-icon</large-icon>
+ <jee:small-icon>fr-messageDestination2-small-icon</jee:small-icon>
+ <jee:large-icon>fr-messageDestination2-large-icon</jee:large-icon>
</icon>
<icon xml:lang="de" id="de-messageDestination2-icon-id">
- <small-icon>de-messageDestination2-small-icon</small-icon>
- <large-icon>de-messageDestination2-large-icon</large-icon>
+ <jee:small-icon>de-messageDestination2-small-icon</jee:small-icon>
+ <jee:large-icon>de-messageDestination2-large-icon</jee:large-icon>
</icon>
<message-destination-name>messageDestination2Name</message-destination-name>
<jndi-name>messageDestination2JndiName</jndi-name>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion30.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion30.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion30.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatefulOverrideBean</ejb-name>
+ <jndi-name>StatefulOverride</jndi-name>
+ </session>
+ </enterprise-beans>
+</jboss>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion32.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion32.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion32.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 3.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatefulOverrideBean</ejb-name>
+ <jndi-name>StatefulOverride</jndi-name>
+ </session>
+ </enterprise-beans>
+</jboss>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion40.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion40.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion40.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatefulOverrideBean</ejb-name>
+ <jndi-name>StatefulOverride</jndi-name>
+ </session>
+ </enterprise-beans>
+</jboss>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion42.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion42.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion42.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd">
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatefulOverrideBean</ejb-name>
+ <jndi-name>StatefulOverride</jndi-name>
+ </session>
+ </enterprise-beans>
+</jboss>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion50.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion50.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion50.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatefulOverrideBean</ejb-name>
+ <jndi-name>StatefulOverride</jndi-name>
+ </session>
+ </enterprise-beans>
+</jboss>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion50xsd.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion50xsd.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion50xsd.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<jboss
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+</jboss>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion51.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion51.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/SchemaVersion_testVersion51.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<jboss
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_1.xsd" version="5.1">
+</jboss>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testRunAsPrincipal.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testRunAsPrincipal.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testRunAsPrincipal.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -320,53 +320,6 @@
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
-
- <!-- ### Resources -->
- <!-- JDBC DataSources (java:comp/env/jdbc) -->
- <resource-ref>
- <description>The default DS</description>
- <res-ref-name>jdbc/DefaultDS</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- <!-- JavaMail Connection Factories (java:comp/env/mail) -->
- <resource-ref>
- <description>Default Mail</description>
- <res-ref-name>mail/DefaultMail</res-ref-name>
- <res-type>javax.mail.Session</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- <!-- JMS Connection Factories (java:comp/env/jms) -->
- <resource-ref>
- <description>Default QueueFactory</description>
- <res-ref-name>jms/QueFactory</res-ref-name>
- <res-type>javax.jms.QueueConnectionFactory</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- <!-- URL Connection Factories (java:comp/env/url) -->
- <resource-ref>
- <description>JBoss Home Page</description>
- <res-ref-name>url/JBossHome</res-ref-name>
- <res-type>java.net.URL</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- <resource-ref>
- <description>SomeWebSite HomePage</description>
- <res-ref-name>url/IndirectURL</res-ref-name>
- <res-type>java.net.URL</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
-
- <resource-env-ref id="resenv1">
- <description>A 1st test of the resource-env-ref tag</description>
- <resource-env-ref-name>res1/aQueue</resource-env-ref-name>
- <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="resenv2">
- <description>A 2nd test of the resource-env-ref tag</description>
- <resource-env-ref-name>res2/aQueue</resource-env-ref-name>
- <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
- </resource-env-ref>
<!-- ### Security -->
<security-constraint>
@@ -641,6 +594,54 @@
<local>org.jboss.test.web.interfaces.RunAsTargetLocal</local>
<ejb-link>UnsecureRunAsServletWithPrincipalNameAndRolesTarget</ejb-link>
</ejb-local-ref>
+
+
+ <!-- ### Resources -->
+ <!-- JDBC DataSources (java:comp/env/jdbc) -->
+ <resource-ref>
+ <description>The default DS</description>
+ <res-ref-name>jdbc/DefaultDS</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <!-- JavaMail Connection Factories (java:comp/env/mail) -->
+ <resource-ref>
+ <description>Default Mail</description>
+ <res-ref-name>mail/DefaultMail</res-ref-name>
+ <res-type>javax.mail.Session</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <!-- JMS Connection Factories (java:comp/env/jms) -->
+ <resource-ref>
+ <description>Default QueueFactory</description>
+ <res-ref-name>jms/QueFactory</res-ref-name>
+ <res-type>javax.jms.QueueConnectionFactory</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <!-- URL Connection Factories (java:comp/env/url) -->
+ <resource-ref>
+ <description>JBoss Home Page</description>
+ <res-ref-name>url/JBossHome</res-ref-name>
+ <res-type>java.net.URL</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <resource-ref>
+ <description>SomeWebSite HomePage</description>
+ <res-ref-name>url/IndirectURL</res-ref-name>
+ <res-type>java.net.URL</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
+ <resource-env-ref id="resenv1">
+ <description>A 1st test of the resource-env-ref tag</description>
+ <resource-env-ref-name>res1/aQueue</resource-env-ref-name>
+ <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+ </resource-env-ref>
+ <resource-env-ref id="resenv2">
+ <description>A 2nd test of the resource-env-ref tag</description>
+ <resource-env-ref-name>res2/aQueue</resource-env-ref-name>
+ <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+ </resource-env-ref>
<message-destination-ref id="msgref1">
<description>consumes using a link</description>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testSecurityConstraint.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testSecurityConstraint.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testSecurityConstraint.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -164,6 +164,11 @@
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>WebConstraintsUnitTestCase</realm-name>
+ </login-config>
<security-role>
<role-name>GetRole</role-name>
@@ -172,8 +177,4 @@
<role-name>PostRole</role-name>
</security-role>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>WebConstraintsUnitTestCase</realm-name>
- </login-config>
</web-app>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml 2009-03-02 11:38:49 UTC (rev 84988)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml 2009-03-02 11:40:52 UTC (rev 84989)
@@ -28,18 +28,14 @@
<large-icon>de-web-app-large-icon</large-icon>
</icon>
+ <distributable/>
+
<context-param id="context-param0">
<description>context-param0-description</description>
<param-name>context-param0-name</param-name>
<param-value>context-param0-value</param-value>
</context-param>
- <session-config id="session-config0">
- <session-timeout>30</session-timeout>
- </session-config>
-
- <distributable/>
-
<filter id="filter0">
<description>filter0-description</description>
<display-name>filter0-display-name</display-name>
@@ -75,35 +71,6 @@
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
- <error-page id="error-page0">
- <error-code>404</error-code>
- <location>/error-page0</location>
- </error-page>
- <error-page id="error-page1">
- <exception-type>java.lang.Throwable</exception-type>
- <location>/error-page1</location>
- </error-page>
-
- <jsp-config id="jsp-config0">
- <taglib>
- <taglib-uri>jsp-config0</taglib-uri>
- <taglib-location>/WEB-INF/tlds/jsp-config0.tld</taglib-location>
- </taglib>
- <jsp-property-group>
- <description>Property group for common configuration for all the JSP's</description>
- <url-pattern>*.jsp</url-pattern>
- <url-pattern>*.jspx</url-pattern>
- <el-ignored>false</el-ignored>
- <page-encoding>ISO-8859-1</page-encoding>
- <scripting-invalid>false</scripting-invalid>
- <is-xml>false</is-xml>
- <include-prelude>/common-jsps/prelude.jsp</include-prelude>
- <include-coda>/common-jsps/coda.jsp</include-coda>
- <deferred-syntax-allowed-as-literal>true</deferred-syntax-allowed-as-literal>
- <trim-directive-whitespaces>true</trim-directive-whitespaces>
- </jsp-property-group>
- </jsp-config>
-
<listener id="listener0">
<description>listener0-description</description>
<display-name>listener0-dipslay-name</display-name>
@@ -116,23 +83,6 @@
</listener-class>
</listener>
- <login-config id="login-config-FORM">
- <auth-method>FORM</auth-method>
- <form-login-config>
- <form-login-page>/login.jsp</form-login-page>
- <form-error-page>/login-error.jsp</form-error-page>
- </form-login-config>
- </login-config>
-
- <mime-mapping id="mime-mapping0">
- <extension>ext0</extension>
- <mime-type>x/type0</mime-type>
- </mime-mapping>
- <mime-mapping id="mime-mapping1">
- <extension>ext1</extension>
- <mime-type>x/type1</mime-type>
- </mime-mapping>
-
<servlet id="servlet0">
<servlet-name>servlet0-name</servlet-name>
<servlet-class>
@@ -194,6 +144,53 @@
<url-pattern>/servlet1/*.sx</url-pattern>
</servlet-mapping>
+ <session-config id="session-config0">
+ <session-timeout>30</session-timeout>
+ </session-config>
+
+ <mime-mapping id="mime-mapping0">
+ <extension>ext0</extension>
+ <mime-type>x/type0</mime-type>
+ </mime-mapping>
+ <mime-mapping id="mime-mapping1">
+ <extension>ext1</extension>
+ <mime-type>x/type1</mime-type>
+ </mime-mapping>
+
+ <welcome-file-list id="welcome-file-list0">
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>*.welcome</welcome-file>
+ </welcome-file-list>
+
+ <error-page id="error-page0">
+ <error-code>404</error-code>
+ <location>/error-page0</location>
+ </error-page>
+ <error-page id="error-page1">
+ <exception-type>java.lang.Throwable</exception-type>
+ <location>/error-page1</location>
+ </error-page>
+
+ <jsp-config id="jsp-config0">
+ <taglib>
+ <taglib-uri>jsp-config0</taglib-uri>
+ <taglib-location>/WEB-INF/tlds/jsp-config0.tld</taglib-location>
+ </taglib>
+ <jsp-property-group>
+ <description>Property group for common configuration for all the JSP's</description>
+ <url-pattern>*.jsp</url-pattern>
+ <url-pattern>*.jspx</url-pattern>
+ <el-ignored>false</el-ignored>
+ <page-encoding>ISO-8859-1</page-encoding>
+ <scripting-invalid>false</scripting-invalid>
+ <is-xml>false</is-xml>
+ <include-prelude>/common-jsps/prelude.jsp</include-prelude>
+ <include-coda>/common-jsps/coda.jsp</include-coda>
+ <deferred-syntax-allowed-as-literal>true</deferred-syntax-allowed-as-literal>
+ <trim-directive-whitespaces>true</trim-directive-whitespaces>
+ </jsp-property-group>
+ </jsp-config>
+
<security-constraint id="security-constraint0">
<display-name>security-constraint0-display-name</display-name>
<web-resource-collection id="web-resource-collection0">
@@ -228,6 +225,14 @@
</web-resource-collection>
</security-constraint>
+ <login-config id="login-config-FORM">
+ <auth-method>FORM</auth-method>
+ <form-login-config>
+ <form-login-page>/login.jsp</form-login-page>
+ <form-error-page>/login-error.jsp</form-error-page>
+ </form-login-config>
+ </login-config>
+
<security-role id="security-role0">
<role-name>role0</role-name>
</security-role>
@@ -235,11 +240,6 @@
<role-name>role1</role-name>
</security-role>
- <welcome-file-list id="welcome-file-list0">
- <welcome-file>index.html</welcome-file>
- <welcome-file>*.welcome</welcome-file>
- </welcome-file-list>
-
<!-- env entry -->
<env-entry id="webAppEnvEntry1-id">
<description>en-webAppEnvEntry1-desc</description>
More information about the jboss-cvs-commits
mailing list