Merged ant plugins to one.

This commit is contained in:
Willem Cazander 2013-04-08 21:44:16 +02:00
parent 179c0f3bfe
commit 37d249eb24
18 changed files with 288 additions and 448 deletions

View file

@ -39,14 +39,14 @@ import org.x4o.xml.io.X4OSchemaWriter;
* @author Willem Cazander
* @version 1.0 Aug 22, 2012
*/
public class X4OSchemaWriterExecutor {
public class X4OWriteLanguageSchemaExecutor {
private String language = null;
private String languageNamespaceUri = null;
private File basePath;
static public void main(String argu[]) {
X4OSchemaWriterExecutor languageSchema = new X4OSchemaWriterExecutor();
X4OWriteLanguageSchemaExecutor languageSchema = new X4OWriteLanguageSchemaExecutor();
List<String> arguList = Arrays.asList(argu);
Iterator<String> arguIterator = arguList.iterator();
boolean printStack = false;
@ -85,11 +85,7 @@ public class X4OSchemaWriterExecutor {
languageSchema.execute();
} catch (ElementException e1) {
e = e1;
} catch (InstantiationException e2) {
e = e2;
} catch (IllegalAccessException e3) {
e = e3;
}
}
if (e!=null) {
System.err.println("Error while schema writing: "+e.getMessage());
if (printStack) {
@ -102,7 +98,7 @@ public class X4OSchemaWriterExecutor {
}
}
public void execute() throws ElementException, InstantiationException, IllegalAccessException {
public void execute() throws ElementException {
// Start xsd generator
X4ODriver<?> driver = X4ODriverManager.getX4ODriver(getLanguage());
X4OSchemaWriter xsd = driver.createSchemaWriter(driver.getLanguageVersionDefault());

View file

@ -21,11 +21,13 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.eld;
package org.x4o.xml.eld.xsd;
import java.io.File;
import org.x4o.xml.eld.xsd.X4OSchemaWriterExecutor;
import org.x4o.xml.eld.CelDriver;
import org.x4o.xml.eld.EldDriver;
import org.x4o.xml.eld.xsd.X4OWriteLanguageSchemaExecutor;
import org.x4o.xml.test.swixml.SwiXmlDriver;
import junit.framework.TestCase;
@ -36,7 +38,7 @@ import junit.framework.TestCase;
* @author Willem Cazander
* @version 1.0 Auh 16, 2012
*/
public class EldSchemaTest extends TestCase {
public class X4OWriteLanguageSchemaExecutorTest extends TestCase {
private File getTempPath(String dir) throws Exception {
File tempFile = File.createTempFile("test-path", ".tmp");
@ -51,27 +53,27 @@ public class EldSchemaTest extends TestCase {
}
public void testEldSchema() throws Exception {
X4OSchemaWriterExecutor writer = new X4OSchemaWriterExecutor();
X4OWriteLanguageSchemaExecutor writer = new X4OWriteLanguageSchemaExecutor();
writer.setBasePath(getTempPath("junit-xsd-eld"));
writer.setLanguage(EldDriver.LANGUAGE_NAME);
writer.execute();
}
public void testEldCoreSchema() throws Exception {
X4OSchemaWriterExecutor writer = new X4OSchemaWriterExecutor();
X4OWriteLanguageSchemaExecutor writer = new X4OWriteLanguageSchemaExecutor();
writer.setBasePath(getTempPath("junit-xsd-cel"));
writer.setLanguage(CelDriver.LANGUAGE_NAME);
writer.execute();
}
public void testSwiXmlSchema() throws Exception {
X4OSchemaWriterExecutor writer = new X4OSchemaWriterExecutor();
X4OWriteLanguageSchemaExecutor writer = new X4OWriteLanguageSchemaExecutor();
writer.setBasePath(getTempPath("junit-xsd-swixml2"));
writer.setLanguage(SwiXmlDriver.LANGUAGE_NAME);
writer.execute();
}
public void testEldDocMain() throws Exception {
X4OSchemaWriterExecutor.main(new String[] {"-p",getTempPath("junit-xsd-main").getAbsolutePath(),"-l",EldDriver.LANGUAGE_NAME});
X4OWriteLanguageSchemaExecutor.main(new String[] {"-p",getTempPath("junit-xsd-main").getAbsolutePath(),"-l",EldDriver.LANGUAGE_NAME});
}
}