[jboss-cvs] JBossAS SVN: r80392 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/javaee/jboss and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2008-11-03 10:41:26 -0500 (Mon, 03 Nov 2008)
New Revision: 80392

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/MethodAttributeMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
   projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java
Log:
JBMETA-139 type namig convention

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/MethodAttributeMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/MethodAttributeMetaData.java	2008-11-03 15:22:45 UTC (rev 80391)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/MethodAttributeMetaData.java	2008-11-03 15:41:26 UTC (rev 80392)
@@ -31,7 +31,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
- at XmlType(name="jboss-methodType", propOrder={"methodName", "readOnly", "idempotent", "transactionTimeout"})
+ at XmlType(name="methodType", propOrder={"methodName", "readOnly", "idempotent", "transactionTimeout"})
 public class MethodAttributeMetaData extends NamedMetaData
 {
    /** The serialVersionUID */

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	2008-11-03 15:22:45 UTC (rev 80391)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java	2008-11-03 15:41:26 UTC (rev 80392)
@@ -46,7 +46,7 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
- at XmlType(name = "jboss-service-refType", propOrder={"serviceRefName", "serviceClass",
+ at XmlType(name = "service-refType", propOrder={"serviceRefName", "serviceClass",
       "serviceQname", "configName", "configFile", "handlerChain", "JBossPortComponentRef", "wsdlOverride"})
 public class JBossServiceReferenceMetaData extends ServiceReferenceMetaData
 {

Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd	2008-11-03 15:22:45 UTC (rev 80391)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd	2008-11-03 15:41:26 UTC (rev 80392)
@@ -437,7 +437,7 @@
                       maxOccurs="unbounded"/>
          <xsd:element name="ejb-local-ref" type="jboss:ejb-local-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="service-ref" type="jboss:jboss-service-refType" minOccurs="0"
+         <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"
@@ -691,7 +691,7 @@
 
    <!-- **************************************************** -->
 
-   <xsd:complexType name="jboss-methodType">
+   <xsd:complexType name="methodType">
       <xsd:annotation>
          <xsd:documentation> The method element is used to specify attributes for one method or all
             those matching a pattern startingstring*. </xsd:documentation>
@@ -928,7 +928,7 @@
       </xsd:annotation>
 
       <xsd:sequence>
-         <xsd:element name="method" type="jboss:jboss-methodType" maxOccurs="unbounded"/>
+         <xsd:element name="method" type="jboss:methodType" maxOccurs="unbounded"/>
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
    </xsd:complexType>
@@ -944,7 +944,7 @@
 
       <xsd:sequence>
          <xsd:element name="class" type="javaee:xsdStringType" minOccurs="0"/>
-         <xsd:element name="method" type="jboss:jboss-methodType"/>
+         <xsd:element name="method" type="jboss:methodType"/>
          <xsd:element name="delivery" type="javaee:xsdStringType" minOccurs="0"/>
          <xsd:element name="priority" type="javaee:xsdIntegerType" minOccurs="0"/>
       </xsd:sequence>
@@ -1570,7 +1570,7 @@
       </xsd:sequence>
    </xsd:complexType>
 
-   <xsd:complexType name="jboss-service-refType">
+   <xsd:complexType name="service-refType">
       <xsd:annotation>
          <xsd:documentation>
             <![CDATA[     
@@ -1936,7 +1936,7 @@
       </xsd:annotation>
 
       <xsd:sequence>
-         <xsd:element name="method" type="jboss:jboss-methodType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="method" type="jboss:methodType" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
    </xsd:complexType>
@@ -2146,7 +2146,7 @@
    <!-- Bring service-refGroup into jboss namespace from javaee_web_services_client_1_2 -->
    <xsd:group name="service-refGroup">
       <xsd:sequence>
-         <xsd:element name="service-ref" type="jboss:jboss-service-refType"
+         <xsd:element name="service-ref" type="jboss:service-refType"
             minOccurs="0" maxOccurs="unbounded">
             <xsd:key name="service-ref_handler-name-key">
                <xsd:selector xpath="javaee:handler" />

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java	2008-11-03 15:22:45 UTC (rev 80391)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java	2008-11-03 15:41:26 UTC (rev 80392)
@@ -130,7 +130,7 @@
    public void configureLogging()
    {
       super.configureLogging();
-      enableTrace(getClass().getName());
+      //enableTrace(getClass().getName());
    }
    
    public void testJBoss50() throws Exception