[jboss-cvs] JBossAS SVN: r90632 - in projects/metadata/rar/trunk/src: test/java/org/jboss/test/metadata/annotation/rar and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jun 26 10:14:38 EDT 2009 

Author: jeff.zhang
Date: 2009-06-26 10:14:38 -0400 (Fri, 26 Jun 2009)
New Revision: 90632

Added:
   projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA10DefaultNSMetaData.java
Removed:
   projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRADefaultNSMetaData.java
Modified:
   projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRAMetaData.java
   projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/annotation/rar/RarAnnotationUnitTestCase.java
   projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10DefaultNSUnitTestCase.java
   projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java
   projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DefaultNSUnitTestCase.java
   projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15DefaultNS_testDefaultNS.xml
Log:
[JBMETA-199] refactor JBossRAMetaData

Copied: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA10DefaultNSMetaData.java (from rev 90618, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRADefaultNSMetaData.java)
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA10DefaultNSMetaData.java	                        (rev 0)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA10DefaultNSMetaData.java	2009-06-26 14:14:38 UTC (rev 90632)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.rar.jboss;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * A JBossRAMetaData.
+ * 
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlRootElement(name="jboss-ra")
+ at JBossXmlSchema(
+      ignoreUnresolvedFieldOrClass=false,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true,
+      strict=false)
+public class JBossRA10DefaultNSMetaData extends JBossRAMetaData
+{
+
+}


Property changes on: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA10DefaultNSMetaData.java
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRADefaultNSMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRADefaultNSMetaData.java	2009-06-26 14:03:49 UTC (rev 90631)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRADefaultNSMetaData.java	2009-06-26 14:14:38 UTC (rev 90632)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.rar.jboss;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * A JBossRAMetaData.
- * 
- * @author Jeff Zhang
- * @version $Revision$
- */
- at XmlRootElement(name="jboss-ra")
- at JBossXmlSchema(
-      ignoreUnresolvedFieldOrClass=false,
-      elementFormDefault=XmlNsForm.QUALIFIED,
-      normalizeSpace=true,
-      strict=false)
-public class JBossRADefaultNSMetaData extends IdMetaDataImpl
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -8041048198795930659L;
-   
-   private List<RaConfigPropertyMetaData> raConfigProps;
-
-   @XmlElement(name="ra-config-property")
-   public void setRaConfigProps(List<RaConfigPropertyMetaData> raConfigProps) {
-      this.raConfigProps = raConfigProps;
-   }
-
-   public List<RaConfigPropertyMetaData> getRaConfigProps() {
-      return raConfigProps;
-   }
-   
- 
-}

Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRAMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRAMetaData.java	2009-06-26 14:03:49 UTC (rev 90631)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRAMetaData.java	2009-06-26 14:14:38 UTC (rev 90632)
@@ -22,17 +22,9 @@
 package org.jboss.metadata.rar.jboss;
 
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
 import org.jboss.metadata.javaee.support.IdMetaDataImpl;
 
-import org.jboss.xb.annotations.JBossXmlSchema;
-
 /**
  * A JBossRAMetaData.
  * 
@@ -41,13 +33,6 @@
  * @author Jeff Zhang
  * @version $Revision: 75672 $
  */
- at XmlRootElement(name="jboss-ra", namespace="http://www.jboss.org/schema/ra")
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = "http://www.jboss.org/schema/ra", prefix = "ra")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="http://www.jboss.org/schema/ra",
-      elementFormDefault=XmlNsForm.QUALIFIED,
-      normalizeSpace=true)
 public class JBossRAMetaData extends IdMetaDataImpl
 {
    /** The serialVersionUID */
@@ -63,6 +48,4 @@
    public List<RaConfigPropertyMetaData> getRaConfigProps() {
       return raConfigProps;
    }
-   
- 
 }

Modified: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/annotation/rar/RarAnnotationUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/annotation/rar/RarAnnotationUnitTestCase.java	2009-06-26 14:03:49 UTC (rev 90631)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/annotation/rar/RarAnnotationUnitTestCase.java	2009-06-26 14:14:38 UTC (rev 90632)
@@ -37,7 +37,7 @@
  * Test injection targets for web components.
  * If multiple classes have the same reference, the injection target must not be merged.
  * 
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @author Jeff Zhang
  * @version $Revision$
  */
 public class RarAnnotationUnitTestCase extends TestCase

Modified: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10DefaultNSUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10DefaultNSUnitTestCase.java	2009-06-26 14:03:49 UTC (rev 90631)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10DefaultNSUnitTestCase.java	2009-06-26 14:14:38 UTC (rev 90632)
@@ -21,8 +21,7 @@
 */
 package org.jboss.test.metadata.rar;
 
-import org.jboss.metadata.rar.jboss.JBossRADefaultNSMetaData;
-import org.jboss.metadata.rar.spec.JCA16DefaultNSMetaData;
+import org.jboss.metadata.rar.jboss.JBossRA10DefaultNSMetaData;
 import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
 import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
 
@@ -40,7 +39,7 @@
    public static SchemaBindingResolver initResolver()
    {
       MutableSchemaResolver resolver = MetaDataSchemaResolverFactory.createSchemaResolver();
-      resolver.mapLocationToClass("jboss-ra", JBossRADefaultNSMetaData.class);
+      resolver.mapLocationToClass("jboss-ra", JBossRA10DefaultNSMetaData.class);
       return resolver;
    }   
 
@@ -51,7 +50,7 @@
 
    public void testBasic() throws Exception
    {
-      JBossRADefaultNSMetaData jbossRA = unmarshal(JBossRADefaultNSMetaData.class);
+      JBossRA10DefaultNSMetaData jbossRA = unmarshal(JBossRA10DefaultNSMetaData.class);
       assertNotNull(jbossRA);
    }
 }

Modified: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java	2009-06-26 14:03:49 UTC (rev 90631)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java	2009-06-26 14:14:38 UTC (rev 90632)
@@ -21,8 +21,11 @@
 */
 package org.jboss.test.metadata.rar;
 
-import org.jboss.metadata.rar.jboss.JBossRAMetaData;
+import org.jboss.metadata.rar.jboss.JBossRA10MetaData;
+import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
 import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
 
 /**
  * Test JCA jboss-ra.xml metadata.
@@ -32,6 +35,13 @@
  */
 public class JbossRA10UnitTestCase extends AbstractJavaEEMetaDataTest
 {
+   public static SchemaBindingResolver initResolver()
+   {
+      MutableSchemaResolver resolver = MetaDataSchemaResolverFactory.createSchemaResolver();
+      resolver.mapLocationToClass("http://www.jboss.org/schema/jboss-ra_1_0.xsd", JBossRA10MetaData.class);
+      return resolver;
+   }
+   
    public JbossRA10UnitTestCase(String name)
    {
       super(name);
@@ -39,7 +49,7 @@
 
    public void testBasic() throws Exception
    {
-      JBossRAMetaData jbossRA = unmarshal(JBossRAMetaData.class);
+      JBossRA10MetaData jbossRA = unmarshal(JBossRA10MetaData.class);
       assertNotNull(jbossRA);
       assertEquals(jbossRA.getRaConfigProps().size(), 9);
       assertEquals(jbossRA.getRaConfigProps().get(0).getValue(), "XMLOVERRIDE");

Modified: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DefaultNSUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DefaultNSUnitTestCase.java	2009-06-26 14:03:49 UTC (rev 90631)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DefaultNSUnitTestCase.java	2009-06-26 14:14:38 UTC (rev 90632)
@@ -51,5 +51,7 @@
    {
       JCA15DefaultNSMetaData connector = unmarshal(JCA15DefaultNSMetaData.class);
       assertNotNull(connector);
+      assertEquals(connector.getVersion(), "1.5");
    }
+   
 }

Modified: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15DefaultNS_testDefaultNS.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15DefaultNS_testDefaultNS.xml	2009-06-26 14:03:49 UTC (rev 90631)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15DefaultNS_testDefaultNS.xml	2009-06-26 14:14:38 UTC (rev 90632)
@@ -2,7 +2,7 @@
 
 <!-- $Id: $ -->
 
-<connector>
+<connector version="1.5">
 
    <vendor-name>Red Hat Middleware LLC</vendor-name>
    <eis-type>JMS 1.1 Server</eis-type>

More information about the jboss-cvs-commits mailing list