[eclipse-jbosstools/f19: 29/36] Add ws.wise.ui-deps.patch

Gerard Ryan galileo at fedoraproject.org
Sun Aug 18 15:23:18 UTC 2013


commit 4ec308cc1657bc4dee5dc2bc462522539b8470f5
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sun Aug 18 12:12:36 2013 +0100

    Add ws.wise.ui-deps.patch

 eclipse-jbosstools-ws.wise.ui-deps.patch |  273 ++++++++++++++++++++++++++++++
 eclipse-jbosstools.spec                  |    8 +
 2 files changed, 281 insertions(+), 0 deletions(-)
---
diff --git a/eclipse-jbosstools-ws.wise.ui-deps.patch b/eclipse-jbosstools-ws.wise.ui-deps.patch
new file mode 100644
index 0000000..05af30a
--- /dev/null
+++ b/eclipse-jbosstools-ws.wise.ui-deps.patch
@@ -0,0 +1,273 @@
+--- jbosstools-webservices/plugins/org.jboss.tools.ws.wise.ui/META-INF/MANIFEST.MF.orig	2013-08-04 13:34:40.801740521 +0100
++++ jbosstools-webservices/plugins/org.jboss.tools.ws.wise.ui/META-INF/MANIFEST.MF	2013-08-04 13:38:25.065629235 +0100
+@@ -11,65 +11,64 @@
+  org.apache.xml.resolver;bundle-version="1.2.0"
+ Bundle-ActivationPolicy: lazy
+ Bundle-ClassPath: .,
+- lib/asm-3.3.1.jar,
+- lib/commons-codec-1.2.jar,
+- lib/commons-collections-3.2.1.jar,
+- lib/commons-httpclient-3.1.jar,
+- lib/commons-io-1.4.jar,
+- lib/commons-lang-2.4.jar,
+- lib/commons-logging-1.0.4.jar,
+- lib/cxf-api-2.6.4.jar,
+- lib/cxf-rt-bindings-coloc-2.6.4.jar,
+- lib/cxf-rt-bindings-object-2.6.4.jar,
+- lib/cxf-rt-bindings-soap-2.6.4.jar,
+- lib/cxf-rt-bindings-xml-2.6.4.jar,
+- lib/cxf-rt-core-2.6.4.jar,
+- lib/cxf-rt-databinding-jaxb-2.6.4.jar,
+- lib/cxf-rt-frontend-jaxws-2.6.4.jar,
+- lib/cxf-rt-frontend-simple-2.6.4.jar,
+- lib/cxf-rt-transports-http-2.6.4.jar,
+- lib/cxf-rt-transports-local-2.6.4.jar,
+- lib/cxf-rt-ws-addr-2.6.4.jar,
+- lib/cxf-rt-ws-mex-2.6.4.jar,
+- lib/cxf-rt-ws-policy-2.6.4.jar,
+- lib/cxf-tools-common-2.6.4.jar,
+- lib/cxf-tools-validator-2.6.4.jar,
+- lib/cxf-tools-wsdlto-core-2.6.4.jar,
+- lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar,
+- lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar,
+- lib/cxf-xjc-boolean-2.6.0.jar,
+- lib/cxf-xjc-dv-2.6.0.jar,
+- lib/cxf-xjc-ts-2.6.0.jar,
+- lib/dtdparser-1.21.jar,
+- lib/freemarker-2.3.11.jar,
+- lib/javassist-3.10.0.GA.jar,
+- lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar,
+- lib/jboss-jaxws-api_2.2_spec-1.0.0.Final.jar,
+- lib/jboss-logging-3.1.2.GA.jar,
+- lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar,
+- lib/jbossws-api-1.0.1.Final.jar,
+- lib/jbossws-common-2.1.1.Final.jar,
+- lib/jbossws-common-tools-1.1.0.Final.jar,
+- lib/jbossws-cxf-client-4.1.1.Final.jar,
+- lib/jbossws-cxf-factories-4.1.1.Final.jar,
+- lib/jbossws-spi-2.1.1.Final.jar,
+- lib/jsr181-api-1.0-MR1.jar,
+- lib/log4j-1.2.16.jar,
+- lib/milyn-commons-1.2.1.jar,
+- lib/milyn-smooks-core-1.2.1.jar,
+- lib/milyn-smooks-javabean-1.2.1.jar,
+- lib/milyn-smooks-rules-1.2.1.jar,
+- lib/milyn-smooks-validation-1.2.1.jar,
+- lib/mvel2-2.0.9.jar,
+- lib/neethi-3.0.2.jar,
+- lib/opencsv-1.8.jar,
+- lib/stax-api-1.0-2.jar,
+- lib/velocity-1.7.jar,
+- lib/xmlschema-core-2.0.3.jar,
+- lib/xpp3_min-1.1.3.4.O.jar,
+- lib/xstream-1.2.2.jar,
+- lib/jaxb-impl-2.2.5.1.jar,
+- lib/jaxb-xjc-2.2.5.1.jar,
+- lib/wise-core-2.0.2.Final.jar,
+- lib/wise-core-cxf-2.0.2.Final.jar
++ lib/asm.jar,
++ lib/commons-codec.jar,
++ lib/commons-collections.jar,
++ lib/commons-httpclient.jar,
++ lib/commons-io.jar,
++ lib/commons-lang.jar,
++ lib/commons-logging.jar,
++ lib/cxf-api.jar,
++ lib/cxf-rt-bindings-coloc.jar,
++ lib/cxf-rt-bindings-object.jar,
++ lib/cxf-rt-bindings-soap.jar,
++ lib/cxf-rt-bindings-xml.jar,
++ lib/cxf-rt-core.jar,
++ lib/cxf-rt-databinding-jaxb.jar,
++ lib/cxf-rt-frontend-jaxws.jar,
++ lib/cxf-rt-frontend-simple.jar,
++ lib/cxf-rt-transports-http.jar,
++ lib/cxf-rt-transports-local.jar,
++ lib/cxf-rt-ws-addr.jar,
++ lib/cxf-rt-ws-mex.jar,
++ lib/cxf-rt-ws-policy.jar,
++ lib/cxf-tools-common.jar,
++ lib/cxf-tools-validator.jar,
++ lib/cxf-tools-wsdlto-core.jar,
++ lib/cxf-tools-wsdlto-databinding-jaxb.jar,
++ lib/cxf-tools-wsdlto-frontend-jaxws.jar,
++ lib/cxf-xjc-boolean.jar,
++ lib/cxf-xjc-dv.jar,
++ lib/cxf-xjc-ts.jar,
++ lib/dtdparser.jar,
++ lib/freemarker.jar,
++ lib/javassist.jar,
++ lib/jboss-jaxb-api_2.2_spec.jar,
++ lib/jboss-jaxws-api_2.2_spec.jar,
++ lib/jboss-logging.jar,
++ lib/jboss-saaj-api_1.3_spec.jar,
++ lib/jbossws-api.jar,
++ lib/jbossws-common.jar,
++ lib/jbossws-common-tools.jar,
++ lib/jbossws-cxf-client.jar,
++ lib/jbossws-cxf-factories.jar,
++ lib/jbossws-spi.jar,
++ lib/log4j.jar,
++ lib/milyn-commons.jar,
++ lib/milyn-smooks-core.jar,
++ lib/milyn-smooks-javabean.jar,
++ lib/milyn-smooks-rules.jar,
++ lib/milyn-smooks-validation.jar,
++ lib/mvel2.jar,
++ lib/neethi.jar,
++ lib/opencsv.jar,
++ lib/stax-api.jar,
++ lib/velocity.jar,
++ lib/xmlschema-core.jar,
++ lib/xpp3_min.jar,
++ lib/xstream.jar,
++ lib/jaxb-impl.jar,
++ lib/jaxb-xjc.jar,
++ lib/wise-core.jar,
++ lib/wise-core-cxf.jar
+ Export-Package: org.jboss.wise.ui.internal.util
+--- jbosstools-webservices/plugins/org.jboss.tools.ws.wise.ui/pom.xml.orig	2013-08-04 13:39:56.508952863 +0100
++++ jbosstools-webservices/plugins/org.jboss.tools.ws.wise.ui/pom.xml	2013-08-04 13:40:47.170024126 +0100
+@@ -50,6 +50,7 @@
+               <excludeScope>system</excludeScope>
+               <outputDirectory>lib</outputDirectory>
+               <excludeArtifactIds>xml-resolver,wsdl4j</excludeArtifactIds>
++              <stripVersion>true</stripVersion>
+             </configuration>
+           </execution>
+         </executions>
+@@ -71,4 +72,4 @@
+     </plugins>
+   </build>
+   
+-</project>
+\ No newline at end of file
++</project>
+--- jbosstools-webservices/plugins/org.jboss.tools.ws.wise.ui/build.properties.orig	2013-08-04 14:11:50.454865718 +0100
++++ jbosstools-webservices/plugins/org.jboss.tools.ws.wise.ui/build.properties	2013-08-04 14:16:39.374569138 +0100
+@@ -3,65 +3,64 @@
+ # following files are pulled in via Maven (run Maven Generate Sources)
+ bin.includes = META-INF/,\
+                .,\
+-               lib/asm-3.3.1.jar,\
+-               lib/commons-codec-1.2.jar,\
+-               lib/commons-collections-3.2.1.jar,\
+-               lib/commons-httpclient-3.1.jar,\
+-               lib/commons-io-1.4.jar,\
+-               lib/commons-lang-2.4.jar,\
+-               lib/commons-logging-1.0.4.jar,\
+-               lib/cxf-api-2.6.4.jar,\
+-               lib/cxf-rt-bindings-coloc-2.6.4.jar,\
+-               lib/cxf-rt-bindings-object-2.6.4.jar,\
+-               lib/cxf-rt-bindings-soap-2.6.4.jar,\
+-               lib/cxf-rt-bindings-xml-2.6.4.jar,\
+-               lib/cxf-rt-core-2.6.4.jar,\
+-               lib/cxf-rt-databinding-jaxb-2.6.4.jar,\
+-               lib/cxf-rt-frontend-jaxws-2.6.4.jar,\
+-               lib/cxf-rt-frontend-simple-2.6.4.jar,\
+-               lib/cxf-rt-transports-http-2.6.4.jar,\
+-               lib/cxf-rt-transports-local-2.6.4.jar,\
+-               lib/cxf-rt-ws-addr-2.6.4.jar,\
+-               lib/cxf-rt-ws-mex-2.6.4.jar,\
+-               lib/cxf-rt-ws-policy-2.6.4.jar,\
+-               lib/cxf-tools-common-2.6.4.jar,\
+-               lib/cxf-tools-validator-2.6.4.jar,\
+-               lib/cxf-tools-wsdlto-core-2.6.4.jar,\
+-               lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar,\
+-               lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar,\
+-               lib/cxf-xjc-boolean-2.6.0.jar,\
+-               lib/cxf-xjc-dv-2.6.0.jar,\
+-               lib/cxf-xjc-ts-2.6.0.jar,\
+-               lib/dtdparser-1.21.jar,\
+-               lib/freemarker-2.3.11.jar,\
+-               lib/javassist-3.10.0.GA.jar,\
+-               lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar,\
+-               lib/jboss-jaxws-api_2.2_spec-1.0.0.Final.jar,\
+-               lib/jboss-logging-3.1.2.GA.jar,\
+-               lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar,\
+-               lib/jbossws-api-1.0.1.Final.jar,\
+-               lib/jbossws-common-2.1.1.Final.jar,\
+-               lib/jbossws-common-tools-1.1.0.Final.jar,\
+-               lib/jbossws-cxf-client-4.1.1.Final.jar,\
+-               lib/jbossws-cxf-factories-4.1.1.Final.jar,\
+-               lib/jbossws-spi-2.1.1.Final.jar,\
+-               lib/jsr181-api-1.0-MR1.jar,\
+-               lib/log4j-1.2.16.jar,\
+-               lib/milyn-commons-1.2.1.jar,\
+-               lib/milyn-smooks-core-1.2.1.jar,\
+-               lib/milyn-smooks-javabean-1.2.1.jar,\
+-               lib/milyn-smooks-rules-1.2.1.jar,\
+-               lib/milyn-smooks-validation-1.2.1.jar,\
+-               lib/mvel2-2.0.9.jar,\
+-               lib/neethi-3.0.2.jar,\
+-               lib/opencsv-1.8.jar,\
+-               lib/stax-api-1.0-2.jar,\
+-               lib/velocity-1.7.jar,\
+-               lib/wise-core-2.0.2.Final.jar,\
+-               lib/wise-core-cxf-2.0.2.Final.jar,\
+-               lib/xmlschema-core-2.0.3.jar,\
+-               lib/xpp3_min-1.1.3.4.O.jar,\
+-               lib/xstream-1.2.2.jar,\
+-               lib/jaxb-impl-2.2.5.1.jar,\
+-               lib/jaxb-xjc-2.2.5.1.jar,\
++               lib/asm.jar,\
++               lib/commons-codec.jar,\
++               lib/commons-collections.jar,\
++               lib/commons-httpclient.jar,\
++               lib/commons-io.jar,\
++               lib/commons-lang.jar,\
++               lib/commons-logging.jar,\
++               lib/cxf-api.jar,\
++               lib/cxf-rt-bindings-coloc.jar,\
++               lib/cxf-rt-bindings-object.jar,\
++               lib/cxf-rt-bindings-soap.jar,\
++               lib/cxf-rt-bindings-xml.jar,\
++               lib/cxf-rt-core.jar,\
++               lib/cxf-rt-databinding-jaxb.jar,\
++               lib/cxf-rt-frontend-jaxws.jar,\
++               lib/cxf-rt-frontend-simple.jar,\
++               lib/cxf-rt-transports-http.jar,\
++               lib/cxf-rt-transports-local.jar,\
++               lib/cxf-rt-ws-addr.jar,\
++               lib/cxf-rt-ws-mex.jar,\
++               lib/cxf-rt-ws-policy.jar,\
++               lib/cxf-tools-common.jar,\
++               lib/cxf-tools-validator.jar,\
++               lib/cxf-tools-wsdlto-core.jar,\
++               lib/cxf-tools-wsdlto-databinding-jaxb.jar,\
++               lib/cxf-tools-wsdlto-frontend-jaxws.jar,\
++               lib/cxf-xjc-boolean.jar,\
++               lib/cxf-xjc-dv.jar,\
++               lib/cxf-xjc-ts.jar,\
++               lib/dtdparser.jar,\
++               lib/freemarker.jar,\
++               lib/javassist.jar,\
++               lib/jboss-jaxb-api_2.2_spec.jar,\
++               lib/jboss-jaxws-api_2.2_spec.jar,\
++               lib/jboss-logging.jar,\
++               lib/jboss-saaj-api_1.3_spec.jar,\
++               lib/jbossws-api.jar,\
++               lib/jbossws-common.jar,\
++               lib/jbossws-common-tools.jar,\
++               lib/jbossws-cxf-client.jar,\
++               lib/jbossws-cxf-factories.jar,\
++               lib/jbossws-spi.jar,\
++               lib/log4j.jar,\
++               lib/milyn-commons.jar,\
++               lib/milyn-smooks-core.jar,\
++               lib/milyn-smooks-javabean.jar,\
++               lib/milyn-smooks-rules.jar,\
++               lib/milyn-smooks-validation.jar,\
++               lib/mvel2.jar,\
++               lib/neethi.jar,\
++               lib/opencsv.jar,\
++               lib/stax-api.jar,\
++               lib/velocity.jar,\
++               lib/wise-core.jar,\
++               lib/wise-core-cxf.jar,\
++               lib/xmlschema-core.jar,\
++               lib/xpp3_min.jar,\
++               lib/xstream.jar,\
++               lib/jaxb-impl.jar,\
++               lib/jaxb-xjc.jar,\
+                plugin.xml
diff --git a/eclipse-jbosstools.spec b/eclipse-jbosstools.spec
index 75de07f..b88df45 100644
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@ -48,6 +48,9 @@ Patch23:        %{name}-as.mgmt.as71-4.0.0.patch
 # Update refs from bundled deps in Openshift, to symlinked deps from Fedora
 Patch24:        %{name}-openshift-bundledjarnames.patch
 
+# Use unversioned deps in org.jboss.tools.ws.wise.ui
+Patch25:        %{name}-ws.wise.ui-deps.patch
+
 BuildArch:      noarch
 
 BuildRequires:  ant >= 1.8.4
@@ -98,6 +101,10 @@ BuildRequires:  tycho
 BuildRequires:  tycho-extras
 BuildRequires:  velocity >= 1.7-4
 BuildRequires:  xerces-j2 >= 2.11.0-11
+BuildRequires:  mvn(org.jboss.jdf:stacks-client)
+BuildRequires:  mvn(org.jboss.wise:wise-core)
+BuildRequires:  mvn(org.jboss.wise:wise-core-cxf)
+BuildRequires:  mvn(org.jboss.ws:jbossws-parent)
 
 Requires:       java
 Requires:       jpackage-utils
@@ -487,6 +494,7 @@ for pom in ${disable_site_module}; do %pom_disable_module site jbosstools-${pom}
 %patch22
 %patch23
 %patch24
+%patch25
 
 # Add Fedora version to OSGi version qualifier
 %pom_xpath_remove pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:format jbosstools-build/parent


More information about the scm-commits mailing list