Return-Path: 
 <scm-return-4844-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 64121 invoked from network); 26 Aug 2004 11:42:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 26 Aug 2004 11:42:09 -0000
Received: (qmail 86187 invoked by uid 500); 26 Aug 2004 11:42:09 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 86024 invoked by uid 500); 26 Aug 2004 11:42:07 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
list-post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 85984 invoked by uid 500); 26 Aug 2004 11:42:06 -0000
Delivered-To: apmail-incubator-geronimo-cvs@apache.org
Received: (qmail 85979 invoked by uid 99); 26 Aug 2004 11:42:06 -0000
X-ASF-Spam-Status: No, hits=-2.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Thu, 26 Aug 2004 04:42:05 -0700
Received: (qmail 64086 invoked by uid 1782); 26 Aug 2004 11:42:05 -0000
Date: 26 Aug 2004 11:42:05 -0000
Message-ID: <20040826114205.64085.qmail@minotaur.apache.org>
From: gdamour@apache.org
To: incubator-geronimo-cvs@apache.org
Subject: cvs commit:
 incubator-geronimo/specs/schema/src/java/org/apache/geronimo/schema
 SchemaConversionUtils.java
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

gdamour     2004/08/26 04:42:04

  Modified:    specs/schema/src/test-data/j2ee_1_3dtd
                        JNDIEnvironmentRefsGroupTestExpected.xml
                        JNDIEnvironmentRefsGroupTestSource.xml
               specs/schema/src/java/org/apache/geronimo/schema
                        SchemaConversionUtils.java
  Log:
  Sort the env-entry elements.
  
  Revision  Changes    Path
  1.2       +24 -4     incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestExpected.xml
  
  Index: JNDIEnvironmentRefsGroupTestExpected.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestExpected.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JNDIEnvironmentRefsGroupTestExpected.xml	17 Jun 2004 23:49:25 -0000	1.1
  +++ JNDIEnvironmentRefsGroupTestExpected.xml	26 Aug 2004 11:42:04 -0000	1.2
  @@ -4,8 +4,18 @@
       <web-app>
           <something>something</something>
           <taglib>taglib</taglib>
  -        <env-entry>enventry1</env-entry>
  -        <env-entry>enventry2</env-entry>
  +        <env-entry>
  +            <description>description1</description>
  +            <env-entry-name>env-entry-name1</env-entry-name>
  +            <env-entry-type>env-entry-type1</env-entry-type>
  +            <env-entry-value>env-entry-value1</env-entry-value>
  +        </env-entry>
  +        <env-entry>
  +            <description>description2</description>
  +            <env-entry-name>env-entry-name2</env-entry-name>
  +            <env-entry-type>env-entry-type2</env-entry-type>
  +            <env-entry-value>env-entry-value2</env-entry-value>
  +        </env-entry>
           <ejb-ref>ejbref1</ejb-ref>
           <ejb-ref>ejbref2</ejb-ref>
           <ejb-local-ref>ejblocalref1</ejb-local-ref>
  @@ -22,8 +32,18 @@
       <session-bean>
           <something>something</something>
           <transaction-type>transactiontype</transaction-type>
  -        <env-entry>enventry1</env-entry>
  -        <env-entry>enventry2</env-entry>
  +        <env-entry>
  +            <description>description1</description>
  +            <env-entry-name>env-entry-name1</env-entry-name>
  +            <env-entry-type>env-entry-type1</env-entry-type>
  +            <env-entry-value>env-entry-value1</env-entry-value>
  +        </env-entry>
  +        <env-entry>
  +            <description>description2</description>
  +            <env-entry-name>env-entry-name2</env-entry-name>
  +            <env-entry-type>env-entry-type2</env-entry-type>
  +            <env-entry-value>env-entry-value2</env-entry-value>
  +        </env-entry>
           <ejb-ref>ejbref1</ejb-ref>
           <ejb-ref>ejbref2</ejb-ref>
           <ejb-local-ref>ejblocalref1</ejb-local-ref>
  
  
  
  1.2       +24 -4     incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestSource.xml
  
  Index: JNDIEnvironmentRefsGroupTestSource.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestSource.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JNDIEnvironmentRefsGroupTestSource.xml	17 Jun 2004 23:49:25 -0000	1.1
  +++ JNDIEnvironmentRefsGroupTestSource.xml	26 Aug 2004 11:42:04 -0000	1.2
  @@ -11,8 +11,18 @@
           <security-constraint>securityconstraint</security-constraint>
           <login-config>loginconfig</login-config>
           <security-role>securityrole</security-role>
  -        <env-entry>enventry1</env-entry>
  -        <env-entry>enventry2</env-entry>
  +        <env-entry>
  +            <env-entry-type>env-entry-type1</env-entry-type>
  +            <env-entry-name>env-entry-name1</env-entry-name>
  +            <env-entry-value>env-entry-value1</env-entry-value>
  +            <description>description1</description>
  +        </env-entry>
  +        <env-entry>
  +            <env-entry-value>env-entry-value2</env-entry-value>
  +            <env-entry-type>env-entry-type2</env-entry-type>
  +            <env-entry-name>env-entry-name2</env-entry-name>
  +            <description>description2</description>
  +        </env-entry>
           <ejb-ref>ejbref1</ejb-ref>
           <ejb-ref>ejbref2</ejb-ref>
           <ejb-local-ref>ejblocalref1</ejb-local-ref>
  @@ -22,8 +32,18 @@
       <session-bean>
           <something>something</something>
           <transaction-type>transactiontype</transaction-type>
  -        <env-entry>enventry1</env-entry>
  -        <env-entry>enventry2</env-entry>
  +        <env-entry>
  +            <env-entry-type>env-entry-type1</env-entry-type>
  +            <env-entry-name>env-entry-name1</env-entry-name>
  +            <env-entry-value>env-entry-value1</env-entry-value>
  +            <description>description1</description>
  +        </env-entry>
  +        <env-entry>
  +            <env-entry-value>env-entry-value2</env-entry-value>
  +            <env-entry-type>env-entry-type2</env-entry-type>
  +            <env-entry-name>env-entry-name2</env-entry-name>
  +            <description>description2</description>
  +        </env-entry>
           <ejb-ref>ejbref1</ejb-ref>
           <ejb-ref>ejbref2</ejb-ref>
           <ejb-local-ref>ejblocalref1</ejb-local-ref>
  
  
  
  1.7       +19 -1     incubator-geronimo/specs/schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
  
  Index: SchemaConversionUtils.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/specs/schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SchemaConversionUtils.java	4 Aug 2004 21:48:31 -0000	1.6
  +++ SchemaConversionUtils.java	26 Aug 2004 11:42:04 -0000	1.7
  @@ -277,6 +277,24 @@
           moveElements("resource-ref", moveable, cursor);
           moveElements("resource-env-ref", moveable, cursor);
           moveElements("message-destination-ref", moveable, cursor);
  +        if (cursor.toPrevSibling()) {
  +            do {
  +                String name = cursor.getName().getLocalPart();
  +                if ("env-entry".equals(name)) {
  +                    cursor.push();
  +                    cursor.toFirstChild();
  +                    convertToDescriptionGroup(cursor, moveable);
  +                    convertToEnvEntryGroup(cursor, moveable);
  +                    cursor.pop();
  +                }
  +            } while (cursor.toPrevSibling());
  +        }
  +    }
  +    
  +    public static void convertToEnvEntryGroup(XmlCursor cursor, XmlCursor moveable) {
  +        moveElements("env-entry-name", moveable, cursor);
  +        moveElements("env-entry-type", moveable, cursor);
  +        moveElements("env-entry-value", moveable, cursor);
       }
   
       public static void validateDD(XmlObject dd) throws XmlException {