Skip to content

Commit

Permalink
Remove XMLBeans support
Browse files Browse the repository at this point in the history
Issue: SPR-13796
  • Loading branch information
jhoeller committed Jul 4, 2016
1 parent 770f0c0 commit d0aa607
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 879 deletions.
25 changes: 2 additions & 23 deletions spring-oxm/oxm.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
configurations {
castor
xjc
xmlbeans
jibx
}
dependencies {
castor "org.codehaus.castor:castor-anttasks:1.4.1"
castor "org.apache.velocity:velocity:1.7"
xjc "com.sun.xml.bind:jaxb-xjc:2.1.17"
xmlbeans "org.apache.xmlbeans:xmlbeans:2.6.0"
jibx "org.jibx:jibx-bind:1.2.6"
jibx "bcel:bcel:5.1"
}
Expand Down Expand Up @@ -39,7 +37,7 @@ task genCastor {
castor(types: "j2", warnings: false, file: orderSchema, todir: sourcesDir,
package: "org.springframework.oxm.castor", properties: castorBuilderProperties)

javac(destdir: classesDir, source: 1.6, target: 1.6, debug: true,
javac(destdir: classesDir, source: 1.8, target: 1.8, debug: true,
debugLevel: "lines,vars,source", classpath: configurations.castor.asPath) {
src(path: sourcesDir)
include(name: "**/*.java")
Expand Down Expand Up @@ -74,7 +72,7 @@ task genJaxb {
produces(dir: sourcesDir, includes: "**/*.java")
}

javac(destdir: classesDir, source: 1.6, target: 1.6, debug: true,
javac(destdir: classesDir, source: 1.8, target: 1.8, debug: true,
debugLevel: "lines,vars,source",
classpath: configurations.castor.asPath) {
src(path: sourcesDir)
Expand All @@ -91,25 +89,6 @@ task genJaxb {
}
}

task genXmlbeans {
ext.classesDir = "${buildDir}/classes/xmlbeans"

inputs.files flightSchema
outputs.dir classesDir

doLast() {
project.ant {
taskdef name: "xmlbeans",
classname: "org.apache.xmlbeans.impl.tool.XMLBean",
classpath: configurations.xmlbeans.asPath

xmlbeans(classgendir: classesDir, schema: flightSchema,
compiler: "modern", verbose: "false",
classpath: configurations.xmlbeans.asPath)
}
}
}

// add jibx binding to the normal test compilation process
// INCOMPATIBLE WITH OPENJDK 8 b89+
def jibxEnabled = project.properties.get("testGroups")?.toLowerCase()?.split(",")?.contains("custom_compilation")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -28,12 +28,10 @@
public class OxmNamespaceHandler extends NamespaceHandlerSupport {

@Override
@SuppressWarnings("deprecation")
public void init() {
registerBeanDefinitionParser("jaxb2-marshaller", new Jaxb2MarshallerBeanDefinitionParser());
registerBeanDefinitionParser("jibx-marshaller", new JibxMarshallerBeanDefinitionParser());
registerBeanDefinitionParser("castor-marshaller", new CastorMarshallerBeanDefinitionParser());
registerBeanDefinitionParser("xmlbeans-marshaller", new XmlBeansMarshallerBeanDefinitionParser());
}

}

This file was deleted.

Loading

0 comments on commit d0aa607

Please sign in to comment.