djencks 2004/07/25 01:18:00
Modified: specs/schema/src/java/org/apache/geronimo/schema
SchemaConversionUtils.java
specs/schema/src/test-data/j2ee_1_3dtd web-23.xml web-24.xml
Added: specs/schema/src/test/org/apache/geronimo/schema
SchemaConversionUtilsTest.java
specs/schema/src/test-data/j2ee_1_3dtd web-1-23.xml
web-1-24.xml
Removed: specs/schema/src/test/org/apache/geronimo/schema/xsl
EJB20To21TransformTest.java
Log:
fix an off by one bug, more tests, and rename test class to correspond to
what it's testing
Revision Changes Path
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SchemaConversionUtils.java 6 Jul 2004 17:12:58 -0000 1.3
+++ SchemaConversionUtils.java 25 Jul 2004 08:18:00 -0000 1.4
@@ -93,7 +93,7 @@
cursor.toFirstChild();
convertToDescriptionGroup(cursor, moveable);
convertToJNDIEnvironmentRefsGroup(cursor, moveable);
- while (cursor.toNextSibling()) {
+ do {
String name = cursor.getName().getLocalPart();
if ("filter".equals(name) || "servlet".equals(name)) {
cursor.push();
@@ -105,7 +105,7 @@
}
cursor.pop();
}
- }
+ } while (cursor.toNextSibling());
} finally {
cursor.dispose();
1.1
incubator-geronimo/specs/schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
Index: SchemaConversionUtilsTest.java
===================================================================
/**
*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.geronimo.schema;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
import junit.framework.TestCase;
/**
* ejb 1.1 dtd appears to be a subset of ejb 2.0 dtd so the same xsl should
* work for both.
*
* @version $Revision: 1.1 $ $Date: 2004/07/25 08:18:00 $
*
* */
public class SchemaConversionUtilsTest extends TestCase {
//comment on validity of j2ee 1.4 schemas: validation doesn't work...
// From: "Radu Preotiuc-Pietro" <[EMAIL PROTECTED]>
// Date: Tue Jun 15, 2004 3:37:50 PM US/Pacific
// To: <[EMAIL PROTECTED]>
// Subject: RE: Problem with validate -- xsb schema file missing/wrong
name
// Reply-To: [EMAIL PROTECTED]
//
// Unfortunately, there is an issue in XmlBeans v1 having to do with
duplicate id constraints definitions.
// XmlBeans v2 does not have this issue.
// Also, these ejb Schemas are techically incorrect because they
violate the id constraint uniqueness rule (at least when processed together,
you could try and compile each one separately)
// So, there are a couple of options:
// 1. you hand-edit the schemas to rename those problematic id
constraints
// 2. you upgrade to v2
// Well, there is a third alternative, which is a fix integrated in
XmlBeans v1, may or may not be feasible
//
// Radu
//I've taken option (1) and fixed the schemas
public void testXMLBeansTransform() throws Exception {
File srcXml = new File("src/test-data/j2ee_1_3dtd/ejb-jar.xml");
File expectedOutputXml = new
File("src/test-data/j2ee_1_3dtd/ejb-jar-21.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
SchemaConversionUtils.validateDD(expected);
xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
// System.out.println(xmlObject.toString());
// System.out.println(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
//make sure trying to convert twice has no bad effects
XmlCursor cursor2 = xmlObject.newCursor();
try {
String schemaLocationURL =
"http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";;
String version = "2.1";
assertFalse(SchemaConversionUtils.convertToSchema(cursor2,
schemaLocationURL, version));
} finally {
cursor2.dispose();
}
boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences after reconverting to schema: " + problems,
ok2);
//do the whole transform twice...
xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences after reconverting to ejb schema: " +
problems, ok3);
}
public void testOrderDescriptionGroup() throws Exception {
File srcXml = new
File("src/test-data/j2ee_1_3dtd/DescriptionGroupTestSource.xml");
File expectedOutputXml = new
File("src/test-data/j2ee_1_3dtd/DescriptionGroupTestExpected.xml");
XmlObject srcObject = XmlObject.Factory.parse(srcXml);
XmlCursor srcCursor = srcObject.newCursor();
XmlCursor moveable = srcObject.newCursor();
try {
srcCursor.toFirstChild();
srcCursor.toFirstChild();
assertTrue(srcCursor.getName().toString(),
"filter".equals(srcCursor.getName().getLocalPart()));
do {
srcCursor.push();
srcCursor.toFirstChild();
SchemaConversionUtils.convertToDescriptionGroup(srcCursor,
moveable);
srcCursor.pop();
} while (srcCursor.toNextSibling());
} finally {
srcCursor.dispose();
}
// System.out.println(srcObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(srcObject, expected, problems);
assertTrue("Differences: " + problems, ok);
}
public void testOrderJNDIEnvironmentRefsGroup() throws Exception {
File srcXml = new
File("src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestSource.xml");
File expectedOutputXml = new
File("src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestExpected.xml");
XmlObject srcObject = XmlObject.Factory.parse(srcXml);
XmlCursor srcCursor = srcObject.newCursor();
XmlCursor moveable = srcObject.newCursor();
try {
srcCursor.toFirstChild();
srcCursor.toFirstChild();
assertTrue(srcCursor.getName().toString(),
"web-app".equals(srcCursor.getName().getLocalPart()));
do {
srcCursor.push();
srcCursor.toFirstChild();
srcCursor.toNextSibling();
srcCursor.toNextSibling();
moveable.toCursor(srcCursor);
SchemaConversionUtils.convertToJNDIEnvironmentRefsGroup(srcCursor, moveable);
srcCursor.pop();
} while (srcCursor.toNextSibling());
} finally {
srcCursor.dispose();
}
// System.out.println(srcObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(srcObject, expected, problems);
assertTrue("Differences: " + problems, ok);
}
public void testWeb23To24Transform() throws Exception {
File srcXml = new File("src/test-data/j2ee_1_3dtd/web-23.xml");
File expectedOutputXml = new
File("src/test-data/j2ee_1_3dtd/web-24.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok2);
}
public void testWeb23To24OtherTransform() throws Exception {
File srcXml = new File("src/test-data/j2ee_1_3dtd/web-1-23.xml");
File expectedOutputXml = new
File("src/test-data/j2ee_1_3dtd/web-1-24.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
System.out.println(xmlObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok2);
}
public void testEJB21To21DoesNothing() throws Exception {
File srcXml = new File("src/test-data/j2ee_1_4schema/ejb-jar.xml");
File expectedOutputXml = new
File("src/test-data/j2ee_1_4schema/ejb-jar.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
}
private boolean compareXmlObjects(XmlObject xmlObject, XmlObject
expectedObject, List problems) {
XmlCursor test = xmlObject.newCursor();
XmlCursor expected = expectedObject.newCursor();
boolean similar = true;
int elementCount = 0;
while (toNextStartToken(test)) {
elementCount++;
if (!toNextStartToken(expected)) {
problems.add("test longer than expected at element: " +
elementCount);
return false;
}
String actualChars = test.getName().getLocalPart();
String expectedChars = expected.getName().getLocalPart();
if (!actualChars.equals(expectedChars)) {
problems.add("Different elements at elementCount: " +
elementCount + ", test: " + actualChars + ", expected: " + expectedChars);
similar = false;
}
test.toNextToken();
expected.toNextToken();
}
return similar;
}
private boolean toNextStartToken(XmlCursor cursor) {
while (!cursor.isStart()) {
if (!cursor.hasNextToken()) {
return false;
}
cursor.toNextToken();
}
return true;
}
}
1.3 +15 -0
incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/web-23.xml
Index: web-23.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/web-23.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web-23.xml 6 Jul 2004 17:12:58 -0000 1.2
+++ web-23.xml 25 Jul 2004 08:18:00 -0000 1.3
@@ -42,5 +42,20 @@
<role-name>me</role-name>
</run-as>
</servlet>
+ <servlet>
+ <servlet-name>myOtherServlet</servlet-name>
+ <display-name>servletDisplayName</display-name>
+ <description>ServletDescription</description>
+ <servlet-class>MyServletClass</servlet-class>
+ <init-param>
+ <param-name>paramName</param-name>
+ <param-value>value</param-value>
+ <description>description</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ <run-as>
+ <role-name>me</role-name>
+ </run-as>
+ </servlet>
</web-app>
1.3 +15 -0
incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/web-24.xml
Index: web-24.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/web-24.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web-24.xml 6 Jul 2004 17:12:58 -0000 1.2
+++ web-24.xml 25 Jul 2004 08:18:00 -0000 1.3
@@ -42,5 +42,20 @@
<role-name>me</role-name>
</run-as>
</servlet>
+ <servlet>
+ <description>ServletDescription</description>
+ <display-name>servletDisplayName</display-name>
+ <servlet-name>myOtherServlet</servlet-name>
+ <servlet-class>MyServletClass</servlet-class>
+ <init-param>
+ <description>description</description>
+ <param-name>paramName</param-name>
+ <param-value>value</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ <run-as>
+ <role-name>me</role-name>
+ </run-as>
+ </servlet>
</web-app>
1.1
incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/web-1-23.xml
Index: web-1-23.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
<servlet>
<servlet-name>JetspeedContainer</servlet-name>
<display-name>Jetspeed Container</display-name>
<description>MVC Servlet for Jetspeed Portlet Applications</description>
<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
<init-param>
<param-name>registerAtInit</param-name>
<param-value>1</param-value>
</init-param>
<init-param>
<param-name>portletApplication</param-name>
<param-value>RssPortlet-enhanced</param-value>
</init-param>
<load-on-startup>100</load-on-startup>
</servlet>
<servlet>
<servlet-name>JetspeedContainer2</servlet-name>
<display-name>Jetspeed Container</display-name>
<description>MVC Servlet for Jetspeed Portlet Applications</description>
<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
<init-param>
<param-name>registerAtInit</param-name>
<param-value>1</param-value>
</init-param>
<init-param>
<param-name>portletApplication</param-name>
<param-value>RssPortlet-enhanced</param-value>
</init-param>
<load-on-startup>100</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>JetspeedContainer</servlet-name>
<url-pattern>/container/*</url-pattern>
</servlet-mapping>
</web-app>
1.1
incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/web-1-24.xml
Index: web-1-24.xml
===================================================================
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; version="2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://java.sun.com/xml/ns/j2ee";>
<servlet>
<description>MVC Servlet for Jetspeed Portlet Applications</description>
<display-name>Jetspeed Container</display-name>
<servlet-name>JetspeedContainer</servlet-name>
<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
<init-param>
<param-name>registerAtInit</param-name>
<param-value>1</param-value>
</init-param>
<init-param>
<param-name>portletApplication</param-name>
<param-value>RssPortlet-enhanced</param-value>
</init-param>
<load-on-startup>100</load-on-startup>
</servlet>
<servlet>
<description>MVC Servlet for Jetspeed Portlet Applications</description>
<display-name>Jetspeed Container</display-name>
<servlet-name>JetspeedContainer2</servlet-name>
<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
<init-param>
<param-name>registerAtInit</param-name>
<param-value>1</param-value>
</init-param>
<init-param>
<param-name>portletApplication</param-name>
<param-value>RssPortlet-enhanced</param-value>
</init-param>
<load-on-startup>100</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>JetspeedContainer</servlet-name>
<url-pattern>/container/*</url-pattern>
</servlet-mapping>
</web-app>
