Skip to content

Commit

Permalink
FUSETOOLS-3189 - Have wsdl2rest compatible with java 11
Browse files Browse the repository at this point in the history
- put all in same bundle as:
-- a different version of jaxb (core/impl/api/xjc) is required different
than the one provided by jbosstools.common.jaxb
-- apache servicemix doesn't provide a bundle for this newer version
-- due to some split packages, seems cannot provide it in a different
bundle (even if there should surely be a way to do it)
-- also needs to provide javax.ws
- set xsd external access to all for xsd when launching wsdl2rest
transformation. Same workaround applied than for Data Transformation

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
  • Loading branch information
apupier committed Mar 14, 2019
1 parent 1b4f190 commit 781ef1e
Show file tree
Hide file tree
Showing 15 changed files with 516 additions and 496 deletions.
Expand Up @@ -143,13 +143,6 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.fusesource.ide.wsdl2rest"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.fusesource.ide.wsdl2rest.ui"
download-size="0"
Expand Down
105 changes: 103 additions & 2 deletions editor/plugins/org.fusesource.ide.wsdl2rest.ui/.classpath
@@ -1,11 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<classpathentry exported="true" kind="lib" path="libs/policy.jar"/>
<classpathentry exported="true" kind="lib" path="libs/saaj-impl.jar"/>
<classpathentry exported="true" kind="lib" path="libs/sdo-eclipselink-plugin.jar"/>
<classpathentry exported="true" kind="lib" path="libs/stax-ex.jar"/>
<classpathentry exported="true" kind="lib" path="libs/streambuffer.jar"/>
<classpathentry exported="true" kind="lib" path="libs/txw2.jar"/>
<classpathentry exported="true" kind="lib" path="libs/validation-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/woodstox-core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/commonj.sdo.jar"/>
<classpathentry exported="true" kind="lib" path="libs/FastInfoset.jar"/>
<classpathentry exported="true" kind="lib" path="libs/gmbal-api-only.jar"/>
<classpathentry exported="true" kind="lib" path="libs/ha-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/istack-commons-runtime.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javax.activation-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javax.activation.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javax.json.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javax.jws-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javax.persistence-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javax.xml.soap-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxb-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxb-jxc.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxb-runtime.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxws-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxws-eclipselink-plugin.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxws-rt.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxws-tools.jar"/>
<classpathentry exported="true" kind="lib" path="libs/mail.jar"/>
<classpathentry exported="true" kind="lib" path="libs/management-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/mimepull.jar"/>
<classpathentry exported="true" kind="lib" path="libs/org.eclipse.persistence.asm.jar"/>
<classpathentry exported="true" kind="lib" path="libs/org.eclipse.persistence.core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/org.eclipse.persistence.moxy.jar"/>
<classpathentry exported="true" kind="lib" path="libs/org.eclipse.persistence.sdo.jar"/>
<classpathentry exported="true" kind="lib" path="libs/plexus-archiver.jar"/>
<classpathentry exported="true" kind="lib" path="libs/plexus-container-default.jar"/>
<classpathentry exported="true" kind="lib" path="libs/plexus-io.jar"/>
<classpathentry exported="true" kind="lib" path="libs/plexus-utils.jar"/>
<classpathentry exported="true" kind="lib" path="libs/slf4j-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/slf4j-log4j12.jar"/>
<classpathentry exported="true" kind="lib" path="libs/spring-aop.jar"/>
<classpathentry exported="true" kind="lib" path="libs/spring-beans.jar"/>
<classpathentry exported="true" kind="lib" path="libs/spring-context.jar"/>
<classpathentry exported="true" kind="lib" path="libs/spring-core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/spring-expression.jar"/>
<classpathentry exported="true" kind="lib" path="libs/spring-tx.jar"/>
<classpathentry exported="true" kind="lib" path="libs/stax2-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/velocity.jar"/>
<classpathentry exported="true" kind="lib" path="libs/woodstox-core-asl.jar"/>
<classpathentry exported="true" kind="lib" path="libs/wsdl2rest-impl.jar"/>
<classpathentry exported="true" kind="lib" path="libs/wsdl2rest-util.jar"/>
<classpathentry exported="true" kind="lib" path="libs/wsdl4j.jar"/>
<classpathentry exported="true" kind="lib" path="libs/xml-resolver.jar"/>
<classpathentry exported="true" kind="lib" path="libs/xmlschema-core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/ant-launcher.jar"/>
<classpathentry exported="true" kind="lib" path="libs/ant-nodeps.jar"/>
<classpathentry exported="true" kind="lib" path="libs/ant.jar"/>
<classpathentry exported="true" kind="lib" path="libs/args4j.jar"/>
<classpathentry exported="true" kind="lib" path="libs/asm.jar"/>
<classpathentry exported="true" kind="lib" path="libs/camel-core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/camel-spring.jar"/>
<classpathentry exported="true" kind="lib" path="libs/classworlds.jar"/>
<classpathentry exported="true" kind="lib" path="libs/commons-beanutils.jar"/>
<classpathentry exported="true" kind="lib" path="libs/commons-collections.jar"/>
<classpathentry exported="true" kind="lib" path="libs/commons-digester.jar"/>
<classpathentry exported="true" kind="lib" path="libs/commons-lang.jar"/>
<classpathentry exported="true" kind="lib" path="libs/commons-logging.jar"/>
<classpathentry exported="true" kind="lib" path="libs/commons-validator.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-codegen-plugin.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-rt-bindings-soap.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-rt-databinding-jaxb.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-rt-frontend-jaxrs.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-rt-javascript.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-rt-rs-extension-providers.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-rt-transports-http-jetty.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-rt-transports-http.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-rt-wsdl.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-tools-common.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-tools-validator.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-tools-wsdlto-core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-tools-wsdlto-databinding-jaxb.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-tools-wsdlto-frontend-javascript.jar"/>
<classpathentry exported="true" kind="lib" path="libs/cxf-tools-wsdlto-frontend-jaxws.jar"/>
<classpathentry exported="true" kind="lib" path="libs/hamcrest-core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javaparser-core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javax.annotation-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javax.servlet-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/javax.ws.rs-api.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxb-core.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxb-impl.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxb-xjc.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jetty-continuation.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jetty-http.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jetty-io.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jetty-security.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jetty-server.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jetty-util.jar"/>
<classpathentry exported="true" kind="lib" path="libs/junit.jar"/>
<classpathentry exported="true" kind="lib" path="libs/log4j.jar"/>
<classpathentry exported="true" kind="lib" path="libs/maven-artifact-resolver.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
105 changes: 102 additions & 3 deletions editor/plugins/org.fusesource.ide.wsdl2rest.ui/META-INF/MANIFEST.MF
Expand Up @@ -24,11 +24,110 @@ Require-Bundle: org.eclipse.ui,
org.fusesource.ide.camel.model.service.core,
org.fusesource.ide.camel.editor,
org.eclipse.m2e.core,
org.fusesource.ide.wsdl2rest,
org.jboss.tools.common.jaxb;resolution:=optional
javax.activation;bundle-version="1.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-ClassPath: .,
libs/ant-launcher.jar,
libs/ant-nodeps.jar,
libs/ant.jar,
libs/args4j.jar,
libs/asm.jar,
libs/camel-core.jar,
libs/camel-spring.jar,
libs/classworlds.jar,
libs/commons-beanutils.jar,
libs/commons-collections.jar,
libs/commons-digester.jar,
libs/commons-lang.jar,
libs/commons-logging.jar,
libs/commons-validator.jar,
libs/cxf-codegen-plugin.jar,
libs/cxf-core.jar,
libs/cxf-rt-bindings-soap.jar,
libs/cxf-rt-databinding-jaxb.jar,
libs/cxf-rt-frontend-jaxrs.jar,
libs/cxf-rt-javascript.jar,
libs/cxf-rt-rs-extension-providers.jar,
libs/cxf-rt-transports-http-jetty.jar,
libs/cxf-rt-transports-http.jar,
libs/cxf-rt-wsdl.jar,
libs/cxf-tools-common.jar,
libs/cxf-tools-validator.jar,
libs/cxf-tools-wsdlto-core.jar,
libs/cxf-tools-wsdlto-databinding-jaxb.jar,
libs/cxf-tools-wsdlto-frontend-javascript.jar,
libs/cxf-tools-wsdlto-frontend-jaxws.jar,
libs/hamcrest-core.jar,
libs/javaparser-core.jar,
libs/javax.annotation-api.jar,
libs/javax.servlet-api.jar,
libs/javax.ws.rs-api.jar,
libs/jaxb-core.jar,
libs/jaxb-impl.jar,
libs/jaxb-xjc.jar,
libs/jetty-continuation.jar,
libs/jetty-http.jar,
libs/jetty-io.jar,
libs/jetty-security.jar,
libs/jetty-server.jar,
libs/jetty-util.jar,
libs/junit.jar,
libs/log4j.jar,
libs/maven-artifact-resolver.jar,
libs/plexus-archiver.jar,
libs/plexus-container-default.jar,
libs/plexus-io.jar,
libs/plexus-utils.jar,
libs/slf4j-api.jar,
libs/slf4j-log4j12.jar,
libs/spring-aop.jar,
libs/spring-beans.jar,
libs/spring-context.jar,
libs/spring-core.jar,
libs/spring-expression.jar,
libs/spring-tx.jar,
libs/stax2-api.jar,
libs/velocity.jar,
libs/woodstox-core-asl.jar,
libs/wsdl2rest-impl.jar,
libs/wsdl2rest-util.jar,
libs/wsdl4j.jar,
libs/xml-resolver.jar,
libs/xmlschema-core.jar,
libs/commonj.sdo.jar,
libs/FastInfoset.jar,
libs/gmbal-api-only.jar,
libs/ha-api.jar,
libs/istack-commons-runtime.jar,
libs/javax.activation-api.jar,
libs/javax.activation.jar,
libs/javax.json.jar,
libs/javax.jws-api.jar,
libs/javax.persistence-api.jar,
libs/javax.xml.soap-api.jar,
libs/jaxb-api.jar,
libs/jaxb-jxc.jar,
libs/jaxb-runtime.jar,
libs/jaxws-api.jar,
libs/jaxws-eclipselink-plugin.jar,
libs/jaxws-rt.jar,
libs/jaxws-tools.jar,
libs/mail.jar,
libs/management-api.jar,
libs/mimepull.jar,
libs/org.eclipse.persistence.asm.jar,
libs/org.eclipse.persistence.core.jar,
libs/org.eclipse.persistence.moxy.jar,
libs/org.eclipse.persistence.sdo.jar,
libs/policy.jar,
libs/saaj-impl.jar,
libs/sdo-eclipselink-plugin.jar,
libs/stax-ex.jar,
libs/streambuffer.jar,
libs/txw2.jar,
libs/validation-api.jar,
libs/woodstox-core.jar
Export-Package:
org.fusesource.ide.wsdl2rest.ui.internal,
org.fusesource.ide.wsdl2rest.ui.wizard,
Expand Down
102 changes: 101 additions & 1 deletion editor/plugins/org.fusesource.ide.wsdl2rest.ui/build.properties
Expand Up @@ -3,4 +3,104 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
OSGI-INF/,\
icons/
icons/,\
libs/ant-launcher.jar,\
libs/ant-nodeps.jar,\
libs/ant.jar,\
libs/args4j.jar,\
libs/asm.jar,\
libs/camel-core.jar,\
libs/camel-spring.jar,\
libs/classworlds.jar,\
libs/commons-beanutils.jar,\
libs/commons-collections.jar,\
libs/commons-digester.jar,\
libs/commons-lang.jar,\
libs/commons-logging.jar,\
libs/commons-validator.jar,\
libs/cxf-codegen-plugin.jar,\
libs/cxf-core.jar,\
libs/cxf-rt-bindings-soap.jar,\
libs/cxf-rt-databinding-jaxb.jar,\
libs/cxf-rt-frontend-jaxrs.jar,\
libs/cxf-rt-javascript.jar,\
libs/cxf-rt-rs-extension-providers.jar,\
libs/cxf-rt-transports-http-jetty.jar,\
libs/cxf-rt-transports-http.jar,\
libs/cxf-rt-wsdl.jar,\
libs/cxf-tools-common.jar,\
libs/cxf-tools-validator.jar,\
libs/cxf-tools-wsdlto-core.jar,\
libs/cxf-tools-wsdlto-databinding-jaxb.jar,\
libs/cxf-tools-wsdlto-frontend-javascript.jar,\
libs/cxf-tools-wsdlto-frontend-jaxws.jar,\
libs/hamcrest-core.jar,\
libs/javaparser-core.jar,\
libs/javax.annotation-api.jar,\
libs/javax.servlet-api.jar,\
libs/javax.ws.rs-api.jar,\
libs/jaxb-core.jar,\
libs/jaxb-impl.jar,\
libs/jaxb-xjc.jar,\
libs/jetty-continuation.jar,\
libs/jetty-http.jar,\
libs/jetty-io.jar,\
libs/jetty-security.jar,\
libs/jetty-server.jar,\
libs/jetty-util.jar,\
libs/junit.jar,\
libs/log4j.jar,\
libs/maven-artifact-resolver.jar,\
libs/plexus-archiver.jar,\
libs/plexus-container-default.jar,\
libs/plexus-io.jar,\
libs/plexus-utils.jar,\
libs/slf4j-api.jar,\
libs/slf4j-log4j12.jar,\
libs/spring-aop.jar,\
libs/spring-beans.jar,\
libs/spring-context.jar,\
libs/spring-core.jar,\
libs/spring-expression.jar,\
libs/spring-tx.jar,\
libs/stax2-api.jar,\
libs/velocity.jar,\
libs/woodstox-core-asl.jar,\
libs/wsdl2rest-impl.jar,\
libs/wsdl2rest-util.jar,\
libs/wsdl4j.jar,\
libs/xml-resolver.jar,\
libs/xmlschema-core.jar,\
libs/commonj.sdo.jar,\
libs/FastInfoset.jar,\
libs/gmbal-api-only.jar,\
libs/ha-api.jar,\
libs/istack-commons-runtime.jar,\
libs/javax.activation-api.jar,\
libs/javax.activation.jar,\
libs/javax.json.jar,\
libs/javax.jws-api.jar,\
libs/javax.persistence-api.jar,\
libs/javax.xml.soap-api.jar,\
libs/jaxb-api.jar,\
libs/jaxb-jxc.jar,\
libs/jaxb-runtime.jar,\
libs/jaxws-api.jar,\
libs/jaxws-eclipselink-plugin.jar,\
libs/jaxws-rt.jar,\
libs/jaxws-tools.jar,\
libs/mail.jar,\
libs/management-api.jar,\
libs/mimepull.jar,\
libs/org.eclipse.persistence.asm.jar,\
libs/org.eclipse.persistence.core.jar,\
libs/org.eclipse.persistence.moxy.jar,\
libs/org.eclipse.persistence.sdo.jar,\
libs/policy.jar,\
libs/saaj-impl.jar,\
libs/sdo-eclipselink-plugin.jar,\
libs/stax-ex.jar,\
libs/streambuffer.jar,\
libs/txw2.jar,\
libs/validation-api.jar,\
libs/woodstox-core.jar

0 comments on commit 781ef1e

Please sign in to comment.