[jboss-cvs] JBossAS SVN: r73680 - in projects/jboss-deployers/trunk/deployers-vfs/src: resources/tests/bean/multiple/jbossrar.jar/META-INF and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 26 05:34:51 EDT 2008
Author: alesj
Date: 2008-05-26 05:34:50 -0400 (Mon, 26 May 2008)
New Revision: 73680
Added:
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java
Modified:
projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/allrar.jar/META-INF/jboss-rar.xml
projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/allrar.jar/META-INF/rar.xml
projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/META-INF/jboss-rar.xml
projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/META-INF/rar.xml
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/JBossRarMetaData.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarMetaData.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java
Log:
Change the tests to mock Vicky's use case.
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/allrar.jar/META-INF/jboss-rar.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/allrar.jar/META-INF/jboss-rar.xml 2008-05-26 09:11:44 UTC (rev 73679)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/allrar.jar/META-INF/jboss-rar.xml 2008-05-26 09:34:50 UTC (rev 73680)
@@ -1,4 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-rar xmlns="urn:jboss:rar:1.0">
- <elt>java.lang.Object</elt>
-</jboss-rar>
\ No newline at end of file
+
+<!-- $Id: ra.xml 71789 2008-04-08 13:46:40Z adrian at jboss.org $ -->
+
+<jboss-connector xmlns="http://jboss.org/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/connector_1_5.xsd"
+ version="1.5"
+>
+
+ <description>JBoss LocalTransaction JDBC Wrapper Resource Adapter</description>
+
+ <elt>java.lang.Object</elt>
+
+</jboss-connector>
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/allrar.jar/META-INF/rar.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/allrar.jar/META-INF/rar.xml 2008-05-26 09:11:44 UTC (rev 73679)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/allrar.jar/META-INF/rar.xml 2008-05-26 09:34:50 UTC (rev 73680)
@@ -1,2 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<rar xmlns="urn:spec:rar:1.0" attrib="Test" />
\ No newline at end of file
+
+<!-- $Id: ra.xml 71789 2008-04-08 13:46:40Z adrian at jboss.org $ -->
+
+<connector 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/connector_1_5.xsd"
+ version="1.5"
+ attrib="Test"
+>
+
+ <description>JBoss LocalTransaction JDBC Wrapper Resource Adapter</description>
+
+</connector>
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/META-INF/jboss-rar.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/META-INF/jboss-rar.xml 2008-05-26 09:11:44 UTC (rev 73679)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/META-INF/jboss-rar.xml 2008-05-26 09:34:50 UTC (rev 73680)
@@ -1,4 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss-rar xmlns="urn:jboss:rar:1.0" attrib="Test">
- <elt>java.lang.StringBuilder</elt>
-</jboss-rar>
\ No newline at end of file
+
+<!-- $Id: ra.xml 71789 2008-04-08 13:46:40Z adrian at jboss.org $ -->
+
+<jboss-connector xmlns="http://jboss.org/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/connector_1_5.xsd"
+ version="1.5"
+ attrib="Test"
+>
+
+ <description>JBoss LocalTransaction JDBC Wrapper Resource Adapter</description>
+
+ <elt>java.lang.StringBuilder</elt>
+
+</jboss-connector>
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/META-INF/rar.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/META-INF/rar.xml 2008-05-26 09:11:44 UTC (rev 73679)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/META-INF/rar.xml 2008-05-26 09:34:50 UTC (rev 73680)
@@ -1,4 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<rar xmlns="urn:spec:rar:1.0" attrib="Test">
- <elt>java.lang.String</elt>
-</rar>
\ No newline at end of file
+
+<!-- $Id: ra.xml 71789 2008-04-08 13:46:40Z adrian at jboss.org $ -->
+
+<connector 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/connector_1_5.xsd"
+ version="1.5"
+ attrib="Test"
+>
+
+ <description>JBoss LocalTransaction JDBC Wrapper Resource Adapter</description>
+
+ <elt>java.lang.String</elt>
+
+</connector>
\ No newline at end of file
Copied: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java (from rev 73679, projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarMetaData.java)
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java 2008-05-26 09:34:50 UTC (rev 73680)
@@ -0,0 +1,83 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.deployers.vfs.deployer.merge.support;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ConnectorMetaData implements Serializable
+{
+ public static final long serialUIDVersion = 1l;
+
+ private double version;
+ private String attribute;
+ private String description;
+ private String element;
+
+ public double getVersion()
+ {
+ return version;
+ }
+
+ @XmlAttribute
+ public void setVersion(double version)
+ {
+ this.version = version;
+ }
+
+ public String getAttribute()
+ {
+ return attribute;
+ }
+
+ @XmlAttribute(name = "attrib")
+ public void setAttribute(String attribute)
+ {
+ this.attribute = attribute;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ @XmlElement
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+ public String getElement()
+ {
+ return element;
+ }
+
+ @XmlElement(name = "elt")
+ public void setElement(String element)
+ {
+ this.element = element;
+ }
+}
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/JBossRarMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/JBossRarMetaData.java 2008-05-26 09:11:44 UTC (rev 73679)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/JBossRarMetaData.java 2008-05-26 09:34:50 UTC (rev 73680)
@@ -21,9 +21,6 @@
*/
package org.jboss.test.deployers.vfs.deployer.merge.support;
-import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
@@ -32,34 +29,9 @@
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
- at JBossXmlSchema(namespace="urn:jboss:rar:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlRootElement(name="jboss-rar")
-public class JBossRarMetaData implements Serializable
+ at JBossXmlSchema(namespace="http://jboss.org/xml/ns/j2ee", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="jboss-connector")
+public class JBossRarMetaData extends ConnectorMetaData
{
public static final long serialUIDVersion = 1l;
-
- private String attribute;
- private String element;
-
- public String getAttribute()
- {
- return attribute;
- }
-
- @XmlAttribute(name = "attrib")
- public void setAttribute(String attribute)
- {
- this.attribute = attribute;
- }
-
- public String getElement()
- {
- return element;
- }
-
- @XmlElement(name = "elt")
- public void setElement(String element)
- {
- this.element = element;
- }
-}
\ No newline at end of file
+}
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarMetaData.java 2008-05-26 09:11:44 UTC (rev 73679)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarMetaData.java 2008-05-26 09:34:50 UTC (rev 73680)
@@ -21,9 +21,6 @@
*/
package org.jboss.test.deployers.vfs.deployer.merge.support;
-import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
@@ -32,34 +29,9 @@
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
- at JBossXmlSchema(namespace="urn:spec:rar:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlRootElement(name="rar")
-public class RarMetaData implements Serializable
+ at JBossXmlSchema(namespace="http://java.sun.com/xml/ns/j2ee", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="connector")
+public class RarMetaData extends ConnectorMetaData
{
public static final long serialUIDVersion = 1l;
-
- private String attribute;
- private String element;
-
- public String getAttribute()
- {
- return attribute;
- }
-
- @XmlAttribute(name = "attrib")
- public void setAttribute(String attribute)
- {
- this.attribute = attribute;
- }
-
- public String getElement()
- {
- return element;
- }
-
- @XmlElement(name = "elt")
- public void setElement(String element)
- {
- this.element = element;
- }
}
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java 2008-05-26 09:11:44 UTC (rev 73679)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java 2008-05-26 09:34:50 UTC (rev 73680)
@@ -51,6 +51,7 @@
protected void addDeployers(Kernel kernel)
{
+ deployer.setUseSchemaValidation(false);
try
{
controller.install(new AbstractBeanMetaData("rard", MockRarDeployer.class.getName()), deployer);
More information about the jboss-cvs-commits
mailing list