From 52e823434de83a5a8d7d94a1f0082292ea7f8535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Thu, 14 Mar 2019 11:13:25 +0100 Subject: [PATCH] FUSETOOLS-3189 - Have wsdl2rest compatible with java 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 --- .../feature.xml | 7 - .../.classpath | 105 ++++++++- .../META-INF/MANIFEST.MF | 105 ++++++++- .../build.properties | 102 ++++++++- .../org.fusesource.ide.wsdl2rest.ui/pom.xml | 200 ++++++++++++++++++ .../wsdl2rest/ui/wizard/Wsdl2RestWizard.java | 10 + .../org.fusesource.ide.wsdl2rest/.classpath | 77 ------- .../org.fusesource.ide.wsdl2rest/.project | 34 --- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 8 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../META-INF/MANIFEST.MF | 88 -------- .../build.properties | 70 ------ .../org.fusesource.ide.wsdl2rest/pom.xml | 199 ----------------- editor/plugins/pom.xml | 1 - 15 files changed, 516 insertions(+), 496 deletions(-) delete mode 100644 editor/plugins/org.fusesource.ide.wsdl2rest/.classpath delete mode 100644 editor/plugins/org.fusesource.ide.wsdl2rest/.project delete mode 100644 editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.core.resources.prefs delete mode 100644 editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.jdt.core.prefs delete mode 100644 editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.m2e.core.prefs delete mode 100644 editor/plugins/org.fusesource.ide.wsdl2rest/META-INF/MANIFEST.MF delete mode 100644 editor/plugins/org.fusesource.ide.wsdl2rest/build.properties delete mode 100644 editor/plugins/org.fusesource.ide.wsdl2rest/pom.xml diff --git a/editor/features/org.fusesource.ide.camel.editor.feature/feature.xml b/editor/features/org.fusesource.ide.camel.editor.feature/feature.xml index 77fc7a3bb4..ac9b427431 100644 --- a/editor/features/org.fusesource.ide.camel.editor.feature/feature.xml +++ b/editor/features/org.fusesource.ide.camel.editor.feature/feature.xml @@ -143,13 +143,6 @@ version="0.0.0" unpack="false"/> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest.ui/META-INF/MANIFEST.MF b/editor/plugins/org.fusesource.ide.wsdl2rest.ui/META-INF/MANIFEST.MF index 13fe5be920..9fd07bc260 100644 --- a/editor/plugins/org.fusesource.ide.wsdl2rest.ui/META-INF/MANIFEST.MF +++ b/editor/plugins/org.fusesource.ide.wsdl2rest.ui/META-INF/MANIFEST.MF @@ -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, diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest.ui/build.properties b/editor/plugins/org.fusesource.ide.wsdl2rest.ui/build.properties index d981884b90..a28ccd18dc 100644 --- a/editor/plugins/org.fusesource.ide.wsdl2rest.ui/build.properties +++ b/editor/plugins/org.fusesource.ide.wsdl2rest.ui/build.properties @@ -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 diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest.ui/pom.xml b/editor/plugins/org.fusesource.ide.wsdl2rest.ui/pom.xml index 1b220af9b6..7e80b22582 100644 --- a/editor/plugins/org.fusesource.ide.wsdl2rest.ui/pom.xml +++ b/editor/plugins/org.fusesource.ide.wsdl2rest.ui/pom.xml @@ -12,4 +12,204 @@ eclipse-plugin Red Hat Fuse Tooling :: Camel Editor :: Plugins :: Wsdl2Rest UI + + 2.21.0.fuse-710018-redhat-00001 + 3.1.11.fuse-710022-redhat-00001 + 1.7.0.redhat-5 + 2.33 + 2.5.1 + 2.1.0.redhat-1 + 2.3.1 + 2.1 + 2.3.0 + 1.6.3.redhat-2 + 1.6 + + 0.8.0.fuse-720034 + 3.2.1 + 2.4 + 2.0.8 + + + + + + org.apache.camel + camel-parent + ${version.apache.camel} + import + pom + + + + + + + args4j + args4j + ${version.args4j} + + + com.github.javaparser + javaparser-core + ${version.javaparser} + + + org.apache.camel + camel-spring + + + org.apache.cxf + cxf-codegen-plugin + ${version.apache.cxf} + + + org.apache.cxf + cxf-rt-rs-extension-providers + + + org.apache.cxf + cxf-rt-transports-http-jetty + + + org.apache.velocity + velocity + ${version.apache.velocity} + + + wsdl4j + wsdl4j + ${version.wsdl4j} + + + commons-lang + commons-lang + ${version.commons.lang} + + + commons-validator + commons-validator + ${version.commons.validator} + + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs.api} + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + + log4j + log4j + + + commons-collections + commons-collections + ${version.commons.collections} + + + oro + oro + ${version.oro} + + + com.sun.xml.ws + jaxws-ri + ${version.jaxws-ri} + pom + + + javax.xml.ws + jaxws-api + ${version.jaxws-api} + + + javax.xml.bind + jaxb-api + ${version.jaxb-api} + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-wsdl2rest + generate-resources + + copy + + + true + ${basedir}/libs/ + false + + + + org.jboss.fuse.wsdl2rest + wsdl2rest-impl + ${version.wsdl2rest} + + + + org.jboss.fuse.wsdl2rest + wsdl2rest-util + ${version.wsdl2rest} + + + + + + copy-dependencies + generate-sources + + copy-dependencies + + + system + true + ${basedir}/libs/ + false + + + + + + + maven-clean-plugin + + + + ${basedir}/libs + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + ban-uberjars + + true + + + + + + + + \ No newline at end of file diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest.ui/src/org/fusesource/ide/wsdl2rest/ui/wizard/Wsdl2RestWizard.java b/editor/plugins/org.fusesource.ide.wsdl2rest.ui/src/org/fusesource/ide/wsdl2rest/ui/wizard/Wsdl2RestWizard.java index ab689807b4..b61e4384c0 100644 --- a/editor/plugins/org.fusesource.ide.wsdl2rest.ui/src/org/fusesource/ide/wsdl2rest/ui/wizard/Wsdl2RestWizard.java +++ b/editor/plugins/org.fusesource.ide.wsdl2rest.ui/src/org/fusesource/ide/wsdl2rest/ui/wizard/Wsdl2RestWizard.java @@ -62,6 +62,7 @@ public class Wsdl2RestWizard extends Wizard implements INewWizard { private static final String APACHE_CAMEL_GROUP_ID = "org.apache.camel"; //$NON-NLS-1$ + private static final String JAVAX_XML_ACCESS_EXTERNAL_SCHEMA = "javax.xml.accessExternalSchema"; //$NON-NLS-1$ /** * Collection of settings used by the wsdl2rest utility. @@ -110,7 +111,10 @@ public boolean performFinish() { @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { + + final String initialValue_AccessExternalSchema = System.getProperty(JAVAX_XML_ACCESS_EXTERNAL_SCHEMA); try { + System.setProperty(JAVAX_XML_ACCESS_EXTERNAL_SCHEMA, "all"); generate(monitor); } catch (Exception e) { Wsdl2RestUIActivator.pluginLog().logError(e); @@ -120,6 +124,12 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException, Inte UIMessages.wsdl2RestWizardErrorMessage, new Status(IStatus.ERROR, Wsdl2RestUIActivator.PLUGIN_ID, e.getMessage(), e)); throw new InvocationTargetException(e); + } finally { + if (initialValue_AccessExternalSchema != null) { + System.setProperty(JAVAX_XML_ACCESS_EXTERNAL_SCHEMA, initialValue_AccessExternalSchema); + } else { + System.clearProperty(JAVAX_XML_ACCESS_EXTERNAL_SCHEMA); + } } } }); diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest/.classpath b/editor/plugins/org.fusesource.ide.wsdl2rest/.classpath deleted file mode 100644 index 792bc40822..0000000000 --- a/editor/plugins/org.fusesource.ide.wsdl2rest/.classpath +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest/.project b/editor/plugins/org.fusesource.ide.wsdl2rest/.project deleted file mode 100644 index dde9b48852..0000000000 --- a/editor/plugins/org.fusesource.ide.wsdl2rest/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.fusesource.ide.wsdl2rest - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.core.resources.prefs b/editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.jdt.core.prefs b/editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6e80039d3b..0000000000 --- a/editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.m2e.core.prefs b/editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb..0000000000 --- a/editor/plugins/org.fusesource.ide.wsdl2rest/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest/META-INF/MANIFEST.MF b/editor/plugins/org.fusesource.ide.wsdl2rest/META-INF/MANIFEST.MF deleted file mode 100644 index f0bc9b5dc6..0000000000 --- a/editor/plugins/org.fusesource.ide.wsdl2rest/META-INF/MANIFEST.MF +++ /dev/null @@ -1,88 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Fuse wsdl2rest Wrapper Plugin -Bundle-SymbolicName: org.fusesource.ide.wsdl2rest -Bundle-Version: 11.2.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.fusesource.ide.foundation.core, - org.fusesource.ide.camel.model.service.core, - org.fusesource.ide.camel.model.service.impl, - org.eclipse.jdt.core, - org.eclipse.jdt, - org.apache.xerces -Bundle-ClassPath: ., - libs/args4j.jar, - libs/camel-spring.jar, - libs/commons-lang.jar, - libs/commons-validator.jar, - libs/cxf-codegen-plugin.jar, - libs/cxf-rt-rs-extension-providers.jar, - libs/cxf-rt-transports-http-jetty.jar, - libs/javaparser-core.jar, - libs/javax.ws.rs-api.jar, - libs/slf4j-api.jar, - libs/slf4j-log4j12.jar, - libs/velocity.jar, - libs/wsdl2rest-impl.jar, - libs/wsdl2rest-util.jar, - libs/wsdl4j.jar, - libs/log4j.jar, - libs/ant-launcher.jar, - libs/ant-nodeps.jar, - libs/ant.jar, - libs/asm.jar, - libs/camel-core.jar, - libs/classworlds.jar, - libs/commons-beanutils.jar, - libs/commons-collections.jar, - libs/commons-digester.jar, - libs/commons-logging.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-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/javax.annotation-api.jar, - libs/javax.servlet-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/maven-artifact-resolver.jar, - libs/plexus-archiver.jar, - libs/plexus-container-default.jar, - libs/plexus-io.jar, - libs/plexus-utils.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/woodstox-core-asl.jar, - libs/xml-resolver.jar, - libs/xmlschema-core.jar -Export-Package: org.apache.commons.validator.routines;x-friends:="org.fusesource.ide.wsdl2rest.ui", - org.jboss.fuse.wsdl2rest;x-friends:="org.fusesource.ide.wsdl2rest.ui", - org.jboss.fuse.wsdl2rest.impl;x-friends:="org.fusesource.ide.wsdl2rest.ui", - org.jboss.fuse.wsdl2rest.impl.codegen;x-friends:="org.fusesource.ide.wsdl2rest.ui", - org.jboss.fuse.wsdl2rest.impl.service;x-friends:="org.fusesource.ide.wsdl2rest.ui", - org.jboss.fuse.wsdl2rest.impl.writer;x-friends:="org.fusesource.ide.wsdl2rest.ui", - org.jboss.fuse.wsdl2rest.util;x-friends:="org.fusesource.ide.wsdl2rest.ui" -Bundle-Vendor: Red Hat diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest/build.properties b/editor/plugins/org.fusesource.ide.wsdl2rest/build.properties deleted file mode 100644 index 1e7316d55d..0000000000 --- a/editor/plugins/org.fusesource.ide.wsdl2rest/build.properties +++ /dev/null @@ -1,70 +0,0 @@ -bin.includes = META-INF/,\ - .,\ - libs/,\ - libs/args4j.jar,\ - libs/camel-spring.jar,\ - libs/commons-lang.jar,\ - libs/commons-validator.jar,\ - libs/cxf-codegen-plugin.jar,\ - libs/cxf-rt-rs-extension-providers.jar,\ - libs/cxf-rt-transports-http-jetty.jar,\ - libs/javaparser-core.jar,\ - libs/javax.ws.rs-api.jar,\ - libs/slf4j-api.jar,\ - libs/slf4j-log4j12.jar,\ - libs/velocity.jar,\ - libs/wsdl2rest-impl.jar,\ - libs/wsdl2rest-util.jar,\ - libs/wsdl4j.jar,\ - libs/log4j.jar,\ - libs/ant-launcher.jar,\ - libs/ant-nodeps.jar,\ - libs/ant.jar,\ - libs/asm.jar,\ - libs/camel-core.jar,\ - libs/classworlds.jar,\ - libs/commons-beanutils.jar,\ - libs/commons-collections.jar,\ - libs/commons-digester.jar,\ - libs/commons-logging.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-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/javax.annotation-api.jar,\ - libs/javax.servlet-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/maven-artifact-resolver.jar,\ - libs/plexus-archiver.jar,\ - libs/plexus-container-default.jar,\ - libs/plexus-io.jar,\ - libs/plexus-utils.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/woodstox-core-asl.jar,\ - libs/xml-resolver.jar,\ - libs/xmlschema-core.jar diff --git a/editor/plugins/org.fusesource.ide.wsdl2rest/pom.xml b/editor/plugins/org.fusesource.ide.wsdl2rest/pom.xml deleted file mode 100644 index 58f29d4856..0000000000 --- a/editor/plugins/org.fusesource.ide.wsdl2rest/pom.xml +++ /dev/null @@ -1,199 +0,0 @@ - - 4.0.0 - - - org.fusesource.ide.editor - plugins - 11.2.0-SNAPSHOT - .. - - - org.fusesource.ide.wsdl2rest - eclipse-plugin - Red Hat Fuse Tooling :: Camel Editor :: Plugins :: Wsdl2Rest Implementation - - - 2.21.0.fuse-710018-redhat-00001 - 3.1.11.fuse-710022-redhat-00001 - 1.7.0.redhat-5 - 2.33 - 2.5.1 - 2.1.0.redhat-1 - 1.6.3.redhat-2 - 1.6 - - 0.8.0.fuse-720034 - 3.2.1 - 2.4 - 2.0.8 - - - - - - org.apache.camel - camel-parent - ${version.apache.camel} - import - pom - - - - - - - args4j - args4j - ${version.args4j} - - - com.github.javaparser - javaparser-core - ${version.javaparser} - - - org.apache.camel - camel-spring - - - org.apache.cxf - cxf-codegen-plugin - ${version.apache.cxf} - - - org.apache.cxf - cxf-rt-rs-extension-providers - - - org.apache.cxf - cxf-rt-transports-http-jetty - - - org.apache.velocity - velocity - ${version.apache.velocity} - - - wsdl4j - wsdl4j - ${version.wsdl4j} - - - commons-lang - commons-lang - ${version.commons.lang} - - - commons-validator - commons-validator - ${version.commons.validator} - - - javax.ws.rs - javax.ws.rs-api - ${version.javax.ws.rs.api} - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - - log4j - log4j - - - commons-collections - commons-collections - ${version.commons.collections} - - - oro - oro - ${version.oro} - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-wsdl2rest - generate-resources - - copy - - - true - ${basedir}/libs/ - false - - - - org.jboss.fuse.wsdl2rest - wsdl2rest-impl - ${version.wsdl2rest} - - - - org.jboss.fuse.wsdl2rest - wsdl2rest-util - ${version.wsdl2rest} - - - - - - copy-dependencies - generate-sources - - copy-dependencies - - - system - true - ${basedir}/libs/ - false - - - - - - - maven-clean-plugin - - - - ${basedir}/libs - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - ban-uberjars - - true - - - - - - - - diff --git a/editor/plugins/pom.xml b/editor/plugins/pom.xml index df0c04127a..61c4121fc3 100644 --- a/editor/plugins/pom.xml +++ b/editor/plugins/pom.xml @@ -18,7 +18,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.fusesource.ide.launcher.ui org.fusesource.ide.project org.fusesource.ide.projecttemplates - org.fusesource.ide.wsdl2rest org.fusesource.ide.wsdl2rest.ui