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 {
