Author: fanningpj
Date: Wed May 22 13:29:56 2024
New Revision: 1917899
URL: http://svn.apache.org/viewvc?rev=1917899&view=rev
Log:
removed Sun J2EE files due to licensing concerns
Removed:
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/j2ee/
Modified:
xmlbeans/trunk/build.gradle
xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
Modified: xmlbeans/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.gradle?rev=1917899&r1=1917898&r2=1917899&view=diff
==============================================================================
--- xmlbeans/trunk/build.gradle (original)
+++ xmlbeans/trunk/build.gradle Wed May 22 13:29:56 2024
@@ -445,7 +445,6 @@ rat {
'**/zvon*.xml',
'**/xmldsig-core-schema.xsd',
'src/test/resources/xbean/xmlobject/japanese',
- 'src/test/resources/xbean/compile/scomp/j2ee',
'src/test/resources/xbean/dom/W3C/level2/core/files',
'src/test/resources/xbean/xmlobject/soap-envelope.xsd',
'src/test/resources/xbean/xmlobject/soap12-encoding.xsd',
Modified:
xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java?rev=1917899&r1=1917898&r2=1917899&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
(original)
+++ xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
Wed May 22 13:29:56 2024
@@ -135,38 +135,6 @@ public class CompilationTests {
"</xs:schema>\n",
};
-
- @Test
- void testJ2EE() {
- deltree(xbeanOutput("compile/scomp/j2ee"));
- // First, compile schema
- File srcdir = xbeanOutput("compile/scomp/j2ee/j2eeconfigxml/src");
- File classesdir =
xbeanOutput("compile/scomp/j2ee/j2eeconfigxml/classes");
- File outputjar = xbeanOutput("compile/scomp/j2ee/j2eeconfigxml.jar");
- Parameters params = new Parameters();
- params.setXsdFiles(
- xbeanCase("j2ee/application-client_1_4.xsd"),
- xbeanCase("j2ee/application_1_4.xsd"),
- xbeanCase("j2ee/connector_1_5.xsd"),
- xbeanCase("j2ee/ejb-jar_2_1.xsd"),
- xbeanCase("j2ee/j2ee_1_4.xsd"),
- xbeanCase("j2ee/jsp_2_0.xsd"),
- xbeanCase("j2ee/web-app_2_4.xsd"),
- xbeanCase("j2ee/XML.xsd"));
- params.setSrcDir(srcdir);
- params.setClassesDir(classesdir);
- params.setOutputJar(outputjar);
-
params.setMdefNamespaces(Collections.singleton("http://java.sun.com/xml/ns/j2ee";));
- List<XmlError> errors = new ArrayList<>();
- params.setErrorListener(errors);
- boolean result = SchemaCompiler.compile(params);
- StringWriter message = new StringWriter();
- if (!result)
- dumpErrors(errors, new PrintWriter(message));
- assertTrue(result, "Build failed:" + message);
- assertTrue(outputjar.exists(), "Cannot find " + outputjar);
- }
-
@Test
void testIncrementalCompilation() throws IOException, XmlException {
File[] files = new File[]{
@@ -192,7 +160,7 @@ public class CompilationTests {
XmlOptions options = (new XmlOptions()).setErrorListener(errors);
SchemaTypeSystem builtin = XmlBeans.getBuiltinTypeSystem();
system = XmlBeans.compileXsd(schemas, builtin, options);
- assertNotNull(system, "Compilation failed during inititial compile.");
+ assertNotNull(system, "Compilation failed during initial compile.");
System.out.println("-= Initial Compile =-");
for (int i = 0; i < system.globalTypes().length; i++) {
@@ -332,41 +300,6 @@ public class CompilationTests {
}
@Test
- @Disabled
- public void testDownload() {
- deltree(xbeanOutput("compile/scomp/include"));
-
- {
- // First, compile schema without download and verify failure
- File srcdir = xbeanOutput("compile/scomp/include/shouldfail/src");
- File classesdir =
xbeanOutput("compile/scomp/include/shouldfail/classes");
- File outputjar =
xbeanOutput("compile/scomp/include/shouldfail.jar");
- Parameters params = new Parameters();
- params.setXsdFiles(xbeanCase("compile/scomp/j2ee/j2ee_1_4.xsd"));
- params.setSrcDir(srcdir);
- params.setClassesDir(classesdir);
- params.setOutputJar(outputjar);
- assertFalse(SchemaCompiler.compile(params), "Build should have
failed");
- assertFalse(outputjar.exists(), "Should not have created " +
outputjar);
- }
-
- {
- // now turn on download and verify success
- File srcdir =
xbeanOutput("compile/scomp/include/shouldsucceed/src");
- File classesdir =
xbeanOutput("compile/scomp/include/shouldsucceed/classes");
- File outputjar =
xbeanOutput("compile/scomp/include/shouldsucceed.jar");
- Parameters params = new Parameters();
- params.setDownload(true);
- params.setXsdFiles(xbeanCase("compile/scomp/j2ee/j2ee_1_4.xsd"));
- params.setSrcDir(srcdir);
- params.setClassesDir(classesdir);
- params.setOutputJar(outputjar);
- assertTrue(SchemaCompiler.compile(params), "Build failed");
- assertTrue(outputjar.exists(), "Cannot find " + outputjar);
- }
- }
-
- @Test
void testPricequote() {
deltree(xbeanOutput("compile/scomp/pricequote"));
// First, compile schema
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
