[jboss-cvs] JBossAS SVN: r76701 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/client/spec and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 6 04:22:24 EDT 2008
Author: alex.loubyansky at jboss.com
Date: 2008-08-06 04:22:24 -0400 (Wed, 06 Aug 2008)
New Revision: 76701
Added:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar1xEnvEntry.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar20EnvEntry.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar21EnvEntry.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar30EnvEntry.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50DTDEjbRef.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml
Removed:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEnvEntry.xml
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/JBossClient5MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.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/Web25MetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
Log:
JBMETA-76
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -35,14 +35,15 @@
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlRootElement(name="jboss-client", namespace="")
@JBossXmlSchema(
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace="",
- elementFormDefault=XmlNsForm.UNSET)
+ elementFormDefault=XmlNsForm.UNSET,
+ normalizeSpace=true)
@XmlType(name="jboss-clientType", namespace="")
public class JBossClient5DTDMetaData extends JBossClientMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -42,7 +42,8 @@
@XmlNs(namespaceURI = JavaEEMetaDataConstants.XSD_NS, prefix = "xsd")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JBOSS_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
public class JBossClient5MetaData extends JBossClientMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -34,14 +34,15 @@
* does not use a namespace.
*
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlRootElement(name="application-client", namespace="")
@JBossXmlSchema(
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace="",
- elementFormDefault=XmlNsForm.UNSET)
+ elementFormDefault=XmlNsForm.UNSET,
+ normalizeSpace=true)
@XmlType(name="application-clientType",
namespace=JavaEEMetaDataConstants.J2EE_NS)
public class ApplicationClient14DTDMetaData extends ApplicationClientMetaData
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -35,14 +35,15 @@
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.J2EE_NS)
@JBossXmlSchema(
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.J2EE_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="application-clientType",
namespace=JavaEEMetaDataConstants.J2EE_NS)
public class ApplicationClient14MetaData extends ApplicationClientMetaData
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -35,14 +35,15 @@
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
@JBossXmlSchema(
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="application-clientType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS)
public class ApplicationClient5MetaData extends ApplicationClientMetaData
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -45,7 +45,8 @@
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace="",
- elementFormDefault=XmlNsForm.UNSET)
+ elementFormDefault=XmlNsForm.UNSET,
+ normalizeSpace=true)
@XmlType(name="applicationType",
namespace="")
public class Ear13DTDMetaData extends EarMetaData
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -40,7 +40,8 @@
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.J2EE_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="applicationType",
namespace=JavaEEMetaDataConstants.J2EE_NS)
public class Ear14MetaData extends EarMetaData
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -38,7 +38,8 @@
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="applicationType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
propOrder={"descriptionGroup", "modules", "securityRoles", "libraryDirectory"})
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -40,7 +40,8 @@
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace="",
- elementFormDefault=XmlNsForm.UNQUALIFIED)
+ elementFormDefault=XmlNsForm.UNQUALIFIED,
+ normalizeSpace=true)
@XmlType(name="jbossType", namespace="")
public class JBoss50DTDMetaData extends JBossMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -40,7 +40,8 @@
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JBOSS_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
public class JBoss50MetaData extends JBossMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -40,7 +40,8 @@
xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace="",
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="ejb-jarType",
namespace="",
propOrder={"descriptionGroup", "enterpriseBeans", "assemblyDescriptor", "ejbClientJar"})
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -39,7 +39,8 @@
xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace="",
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="ejb-jarType",
namespace="",
propOrder={"descriptionGroup", "enterpriseBeans", "relationships", "assemblyDescriptor", "ejbClientJar"})
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -40,26 +40,11 @@
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace="http://java.sun.com/xml/ns/j2ee",
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="ejb-jarType",
namespace=JavaEEMetaDataConstants.J2EE_NS,
propOrder={"descriptionGroup", "enterpriseBeans", "relationships", "assemblyDescriptor", "ejbClientJar"})
-/*@XmlTypeImpls
-({
- @XmlTypeImpl(name="fully-qualified-classType", startElementCreatesObject=false),
- @XmlTypeImpl(name="java-typeType", startElementCreatesObject=false),
- @XmlTypeImpl(name="java-identifierType", startElementCreatesObject=false),
- @XmlTypeImpl(name="true-falseType", startElementCreatesObject=false),
- @XmlTypeImpl(name="string", namespace=JavaEEMetaDataConstants.J2EE_NS, startElementCreatesObject=false),
- @XmlTypeImpl(name="xsdStringType", startElementCreatesObject=false),
- @XmlTypeImpl(name="env-entry-type-valuesType", startElementCreatesObject=false),
- @XmlTypeImpl(name="ejb-linkType", startElementCreatesObject=false),
- @XmlTypeImpl(name="jndi-nameType", startElementCreatesObject=false),
- @XmlTypeImpl(name="role-nameType", startElementCreatesObject=false),
- @XmlTypeImpl(name="message-destination-typeType", startElementCreatesObject=false),
- @XmlTypeImpl(name="message-destination-linkType", startElementCreatesObject=false),
-})
-*/
public class EjbJar21MetaData extends EjbJar2xMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -40,26 +40,12 @@
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="ejb-jarType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
propOrder={"descriptionGroup", "enterpriseBeans", "interceptors", "relationships", "assemblyDescriptor", "ejbClientJar"})
-/*@XmlTypeImpls
-({
- @XmlTypeImpl(name="fully-qualified-classType", startElementCreatesObject=false),
- @XmlTypeImpl(name="java-typeType", startElementCreatesObject=false),
- @XmlTypeImpl(name="java-identifierType", startElementCreatesObject=false),
- @XmlTypeImpl(name="true-falseType", startElementCreatesObject=false),
- @XmlTypeImpl(name="string", namespace=JavaEEMetaDataConstants.JAVAEE_NS, startElementCreatesObject=false),
- @XmlTypeImpl(name="xsdStringType", startElementCreatesObject=false),
- @XmlTypeImpl(name="env-entry-type-valuesType", startElementCreatesObject=false),
- @XmlTypeImpl(name="ejb-linkType", startElementCreatesObject=false),
- @XmlTypeImpl(name="jndi-nameType", startElementCreatesObject=false),
- @XmlTypeImpl(name="role-nameType", startElementCreatesObject=false),
- @XmlTypeImpl(name="message-destination-typeType", startElementCreatesObject=false),
- @XmlTypeImpl(name="message-destination-linkType", startElementCreatesObject=false),
-})
-*/public class EjbJar30MetaData extends EjbJar3xMetaData
+public class EjbJar30MetaData extends EjbJar3xMetaData
{
/** The serialVersionUID */
private static final long serialVersionUID = 4822895045737616761L;
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 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.ResourceInjectionMetaDataWithDescriptions;
+import org.jboss.xb.annotations.JBossXmlPreserveWhitespace;
/**
* EnvironmentEntryMetaData.
@@ -114,7 +115,7 @@
* @throws IllegalArgumentException for a null value
*/
@XmlElement(name="env-entry-value")
- //@SchemaValue(false)
+ @JBossXmlPreserveWhitespace
public void setValue(String value)
{
if (value == null)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -38,7 +38,8 @@
xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace="",
- elementFormDefault=XmlNsForm.UNSET)
+ elementFormDefault=XmlNsForm.UNSET,
+ normalizeSpace=true)
@XmlType(name="jboss-webType", namespace="")
public class JBoss50DTDWebMetaData extends JBossWebMetaData
{
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 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -13,14 +13,15 @@
* Web application spec metadata.
*
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlRootElement(name="web-app", namespace="")
@JBossXmlSchema(
xmlns={@XmlNs(namespaceURI = "", prefix="jee")},
ignoreUnresolvedFieldOrClass=false,
namespace="",
- elementFormDefault=XmlNsForm.UNSET)
+ elementFormDefault=XmlNsForm.UNSET,
+ normalizeSpace=true)
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 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -11,14 +11,15 @@
* Web application spec metadata.
*
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlRootElement(name="web-app", namespace=JavaEEMetaDataConstants.J2EE_NS)
@JBossXmlSchema(
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.J2EE_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
public class Web24MetaData extends WebMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -13,14 +13,15 @@
* Web application spec metadata.
*
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlRootElement(name="web-app", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
@JBossXmlSchema(
xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
@XmlType(name="web-appType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS)
public class Web25MetaData extends WebMetaData
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -185,6 +185,7 @@
assertNotNull(group);
assertEquals("1.3 EE Client", group.getDescription());
assertEquals("The cts.jar with an application client jar", group.getDisplayName());
+ assertNotNull(result.getModules().get("cts.jar"));
}
public void testSecurityRoles()
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -32,6 +32,9 @@
import org.jboss.annotation.javaee.Icons;
import org.jboss.metadata.ear.spec.Ear50MetaData;
import org.jboss.metadata.ear.spec.Ear5xMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
+import org.jboss.metadata.ear.spec.WebModuleMetaData;
import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
import org.jboss.metadata.javaee.spec.DescriptionImpl;
import org.jboss.metadata.javaee.spec.DisplayNameImpl;
@@ -146,6 +149,12 @@
throws Exception
{
Ear5xMetaData result = unmarshal();
- assertEquals(4, result.getModules().size());
+ ModulesMetaData modules = result.getModules();
+ assertEquals(4, modules.size());
+ assertEquals("transport_ejb_vehicle_client.jar", modules.get(0).getName());
+ assertEquals("transport_ejb_vehicle_ejb.jar", modules.get(1).getName());
+ assertEquals("transport_jsp_vehicle_web.war", modules.get(2).getName());
+ assertEquals("transport_servlet_vehicle_web.war", modules.get(3).getName());
+ assertEquals("transport_servlet_vehicle", ((WebModuleMetaData)modules.get(3).getValue()).getContextRoot());
}
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -22,11 +22,21 @@
package org.jboss.test.metadata.ejb.whitespace;
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
+import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar1xMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
@@ -45,12 +55,71 @@
public static SchemaBindingResolver initResolver()
{
- return schemaResolverForClass(EjbJar30MetaData.class);
+ DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+ resolver.addClassBindingForLocation("ejb-jar_1_1.dtd", EjbJar1xMetaData.class);
+ 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);
+ // Set the JBoss50DTDMetaData class as the default for the jboss root element
+ resolver.addClassBindingForLocation("jboss", JBoss50DTDMetaData.class);
+ // Workaround wildard resolution slowness
+ resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
+ resolver.addClassBinding("http://java.sun.com/xml/ns/javaee", EjbJar30MetaData.class);
+ return resolver;
}
- public void testEnvEntry() throws Exception
+ public void testEjbJar30EnvEntry() throws Exception
{
- EjbJar3xMetaData xml = unmarshal();
+ EjbJar3xMetaData xml = unmarshal(EjbJar30MetaData.class);
+ assertEjbJarEnvEntry(xml);
+ }
+
+ public void testEjbJar20EnvEntry() throws Exception
+ {
+ EjbJarMetaData xml = unmarshal(EjbJar20MetaData.class);
+ assertEjbJarEnvEntry(xml);
+ }
+
+ public void testEjbJar21EnvEntry() throws Exception
+ {
+ EjbJarMetaData xml = unmarshal(EjbJar21MetaData.class);
+ assertEjbJarEnvEntry(xml);
+ }
+
+ public void testEjbJar1xEnvEntry() throws Exception
+ {
+ EjbJarMetaData xml = unmarshal(EjbJar1xMetaData.class);
+ assertEjbJarEnvEntry(xml);
+ }
+
+ public void testJBoss50DTDEjbRef() throws Exception
+ {
+ JBoss50DTDMetaData jboss = unmarshal(JBoss50DTDMetaData.class);
+ assertJBossEjbRef(jboss);
+ }
+
+ public void testJBoss50EjbRef() throws Exception
+ {
+ JBossMetaData jboss = unmarshal(JBoss50MetaData.class);
+ assertJBossEjbRef(jboss);
+ }
+
+ private void assertJBossEjbRef(JBossMetaData jboss)
+ {
+ JBossEnterpriseBeanMetaData bean = jboss.getEnterpriseBean("SessionB");
+ assertNotNull(bean);
+ EJBReferenceMetaData ejbRef = bean.getEjbReferenceByName("ejb/NoLinkSessionA");
+ assertNotNull(ejbRef);
+ assertEquals("naming/SessionA", ejbRef.getJndiName());
+ }
+
+ private void assertEjbJarEnvEntry(EjbJarMetaData xml)
+ {
assertEquals("Whitespace", xml.getDescriptionGroup().getDisplayNames().value()[0].value());
assertEquals(1, xml.getEnterpriseBeans().size());
IEnterpriseBeanMetaData bean = xml.getEnterpriseBeans().iterator().next();
@@ -62,9 +131,4 @@
assertEquals("java.lang.String", envEntry.getType());
assertEquals(" ", envEntry.getValue());
}
-
- protected EjbJar3xMetaData unmarshal() throws Exception
- {
- return unmarshal(EjbJar30MetaData.class);
- }
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java 2008-08-06 08:22:24 UTC (rev 76701)
@@ -22,6 +22,7 @@
package org.jboss.test.metadata.web;
import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.metadata.web.spec.Web23MetaData;
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
@@ -31,7 +32,7 @@
* Test all entries of 2.3 web-app
*
* @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
*/
public class WebApp23UnitTestCase extends AbstractJavaEEEverythingTest
{
@@ -47,6 +48,9 @@
assertNotNull(dg);
assertEquals("web-app-desc", dg.getDescription());
assertEquals("web-app_2_3-display-name", dg.getDisplayName());
+ ServletMetaData servlet = webApp.getServlets().get("servlet0-name");
+ assertNotNull(servlet);
+ assertEquals("servlet0.class", servlet.getServletClass());
}
public static SchemaBindingResolver initResolver()
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -29,7 +29,9 @@
<description>en-appClientEnvEntry1-desc</description>
<description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
<description xml:lang="de">de-appClientEnvEntry1-desc</description>
- <env-entry-name>appClientEnvEntry1Name</env-entry-name>
+ <env-entry-name>
+ appClientEnvEntry1Name
+ </env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>appClientEnvEntry1Value</env-entry-value>
</env-entry>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -8,9 +8,11 @@
<display-name>J2EE Client Tests</display-name>
<env-entry>
- <env-entry-name>String0</env-entry-name>
+ <env-entry-name>
+ String0
+ </env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>String0Value</env-entry-value>
+ <env-entry-value>String0Value </env-entry-value>
</env-entry>
<env-entry>
<env-entry-name>Float0</env-entry-name>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -6,7 +6,9 @@
<jboss-client>
<jndi-name>BeanMirrorSEIClient_client</jndi-name>
<service-ref>
- <service-ref-name>service/beanMirrorSEI</service-ref-name>
+ <service-ref-name>
+ service/beanMirrorSEI
+ </service-ref-name>
<port-component-ref>
<service-endpoint-interface>com.sun.ts.tests.webservices.deploy.beanMirrorSEI.HelloWs</service-endpoint-interface>
<port-qname>{http://BeanMirrorSEI.org}HelloWsPort</port-qname>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -5,7 +5,9 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
<display-name>BeanMirrorSEIClient_client</display-name>
<service-ref>
- <service-ref-name>service/beanMirrorSEI</service-ref-name>
+ <service-ref-name>
+ service/beanMirrorSEI
+ </service-ref-name>
<service-interface>javax.xml.rpc.Service</service-interface>
<wsdl-file>META-INF/wsdl/BeanMirrorSEI.wsdl</wsdl-file>
<jaxrpc-mapping-file>BeanMirrorSEI.xml</jaxrpc-mapping-file>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -30,7 +30,9 @@
<description>en-appClientEnvEntry1-desc</description>
<description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
<description xml:lang="de">de-appClientEnvEntry1-desc</description>
- <env-entry-name>appClientEnvEntry1Name</env-entry-name>
+ <env-entry-name>
+ appClientEnvEntry1Name
+ </env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>appClientEnvEntry1Value</env-entry-value>
<mapped-name>appClientEnvEntry1MappedName</mapped-name>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -5,7 +5,9 @@
version="5.0"
id="appclient-test">
<!-- jndi name -->
- <jndi-name>appClientJndiName</jndi-name>
+ <jndi-name>
+ appClientJndiName
+ </jndi-name>
<!-- resource ref -->
<resource-ref id="appClientResourceRef2-id">
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -6,7 +6,9 @@
<display-name>The cts.jar with an application client jar</display-name>
<description>1.3 EE Client</description>
<module>
- <ejb>cts.jar</ejb>
+ <ejb>
+ cts.jar
+ </ejb>
</module>
<module>
<java>app-client.jar</java>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -9,7 +9,9 @@
</web>
</module>
<security-role>
- <role-name>VP</role-name>
+ <role-name>
+ VP
+ </role-name>
</security-role>
<security-role>
<role-name>Employee</role-name>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -32,7 +32,9 @@
<module>
<web>
<web-uri>transport_servlet_vehicle_web.war</web-uri>
- <context-root>transport_servlet_vehicle</context-root>
+ <context-root>
+ transport_servlet_vehicle
+ </context-root>
</web>
</module>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar1xEnvEntry.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar1xEnvEntry.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar1xEnvEntry.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -0,0 +1,20 @@
+<!DOCTYPE ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN' 'http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd'>
+
+<ejb-jar >
+ <display-name>Whitespace</display-name>
+ <enterprise-beans>
+ <session>
+ <ejb-name>WhitespaceBean </ejb-name>
+ <home>Home</home>
+ <remote>Remote</remote>
+ <ejb-class>WhitespaceBean </ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <env-entry>
+ <env-entry-name>whitespace</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value> </env-entry-value>
+ </env-entry>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar20EnvEntry.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar20EnvEntry.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar20EnvEntry.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ejb-jar
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+ "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+
+<ejb-jar >
+ <display-name>Whitespace</display-name>
+ <enterprise-beans>
+ <session>
+ <ejb-name>WhitespaceBean </ejb-name>
+ <ejb-class>WhitespaceBean </ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <env-entry>
+ <env-entry-name>whitespace</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value> </env-entry-value>
+ </env-entry>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar21EnvEntry.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar21EnvEntry.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar21EnvEntry.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -0,0 +1,19 @@
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+ version="2.1">
+ <display-name>Whitespace</display-name>
+ <enterprise-beans>
+ <session>
+ <ejb-name>WhitespaceBean </ejb-name>
+ <ejb-class>WhitespaceBean </ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <env-entry>
+ <env-entry-name>whitespace</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value> </env-entry-value>
+ </env-entry>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar30EnvEntry.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar30EnvEntry.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar30EnvEntry.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<ejb-jar
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+ version="3.0">
+ <display-name>Whitespace</display-name>
+ <enterprise-beans>
+ <session>
+ <ejb-name>WhitespaceBean </ejb-name>
+ <env-entry>
+ <env-entry-name>whitespace</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value> </env-entry-value>
+ </env-entry>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEnvEntry.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEnvEntry.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEnvEntry.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<ejb-jar
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- version="3.0">
- <display-name>Whitespace</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>WhitespaceBean</ejb-name>
- <env-entry>
- <env-entry-name>whitespace</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value> </env-entry-value>
- </env-entry>
- </session>
- </enterprise-beans>
-</ejb-jar>
\ No newline at end of file
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50DTDEjbRef.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50DTDEjbRef.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50DTDEjbRef.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>SessionB</ejb-name>
+ <jndi-name>naming/SessionB</jndi-name>
+
+ <ejb-ref>
+ <ejb-ref-name>ejb/NoLinkSessionA</ejb-ref-name>
+ <jndi-name>naming/SessionA </jndi-name>
+ </ejb-ref>
+
+ </session>
+ </enterprise-beans>
+</jboss>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -0,0 +1,20 @@
+<?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">
+ <enterprise-beans>
+ <session>
+ <ejb-name>SessionB</ejb-name>
+ <jndi-name>naming/SessionB</jndi-name>
+
+ <ejb-ref>
+ <ejb-ref-name>ejb/NoLinkSessionA</ejb-ref-name>
+ <jndi-name>naming/SessionA </jndi-name>
+ </ejb-ref>
+
+ </session>
+ </enterprise-beans>
+</jboss>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -5,7 +5,9 @@
<jboss-web>
<replication-config>
- <cache-name>testCache</cache-name>
+ <cache-name>
+ testCache
+ </cache-name>
<replication-trigger>SET</replication-trigger>
<replication-granularity>FIELD</replication-granularity>
<replication-field-batch-mode>true</replication-field-batch-mode>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -40,7 +40,9 @@
<servlet id="servlet0">
<servlet-name>servlet0-name</servlet-name>
- <servlet-class>servlet0.class</servlet-class>
+ <servlet-class>
+ servlet0.class
+ </servlet-class>
<init-param id="servlet0-init-param0">
<param-name>init-param0-name</param-name>
<param-value>init-param0-value</param-value>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -7,7 +7,9 @@
<mime-mapping>
<extension>xhtml</extension>
- <mime-type>application/xhtml+xml</mime-type>
+ <mime-type>
+ application/xhtml+xml
+ </mime-type>
</mime-mapping>
</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 2008-08-06 08:19:36 UTC (rev 76700)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml 2008-08-06 08:22:24 UTC (rev 76701)
@@ -111,7 +111,9 @@
<small-icon>listener0-small-icon</small-icon>
<large-icon>listener0-icon</large-icon>
</icon>
- <listener-class>listener0.class</listener-class>
+ <listener-class>
+ listener0.class
+ </listener-class>
</listener>
<login-config id="login-config-FORM">
@@ -133,7 +135,9 @@
<servlet id="servlet0">
<servlet-name>servlet0-name</servlet-name>
- <servlet-class>servlet0.class</servlet-class>
+ <servlet-class>
+ servlet0.class
+ </servlet-class>
<init-param id="servlet0-init-param0">
<param-name>init-param0-name</param-name>
<param-value>init-param0-value</param-value>
More information about the jboss-cvs-commits
mailing list