From 43e4631960845d75566207897c1e52e2ab01583e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Thu, 21 Jun 2018 08:43:16 +0200
Subject: [PATCH] orche: use jax-ws-catalog.xml for wsdl location
---
.../.settings/org.eclipse.core.resources.prefs | 1 -
haas-java-client/pom.xml | 9 +++++----
.../src/main/resources/META-INF/jax-ws-catalog.xml | 11 +++++++++++
.../resources/META-INF}/wsdl/DataTransferWs.wsdl | 0
.../resources/META-INF}/wsdl/FileTransferWs.wsdl | 0
.../resources/META-INF}/wsdl/JobManagementWs.wsdl | 0
.../META-INF}/wsdl/UserAndLimitationManagementWs.wsdl | 0
7 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 haas-java-client/src/main/resources/META-INF/jax-ws-catalog.xml
rename haas-java-client/src/{ => main/resources/META-INF}/wsdl/DataTransferWs.wsdl (100%)
rename haas-java-client/src/{ => main/resources/META-INF}/wsdl/FileTransferWs.wsdl (100%)
rename haas-java-client/src/{ => main/resources/META-INF}/wsdl/JobManagementWs.wsdl (100%)
rename haas-java-client/src/{ => main/resources/META-INF}/wsdl/UserAndLimitationManagementWs.wsdl (100%)
diff --git a/haas-java-client/.settings/org.eclipse.core.resources.prefs b/haas-java-client/.settings/org.eclipse.core.resources.prefs
index 4201b5d0..8c22793c 100644
--- a/haas-java-client/.settings/org.eclipse.core.resources.prefs
+++ b/haas-java-client/.settings/org.eclipse.core.resources.prefs
@@ -4,5 +4,4 @@ encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding//target/generated-sources/wsimport=UTF-8
-encoding//target/jaxws/wsimport/java=UTF-8
encoding/<project>=UTF-8
diff --git a/haas-java-client/pom.xml b/haas-java-client/pom.xml
index e46654cf..af890646 100644
--- a/haas-java-client/pom.xml
+++ b/haas-java-client/pom.xml
@@ -51,11 +51,12 @@
<configuration>
<!-- using wsdl from an url -->
<wsdlUrls>
- <wsdlUrl>http://haas.vsb.cz/HaasWsFiji/UserAndLimitationManagementWs.asmx?WSDL</wsdlUrl>
- <wsdlUrl>http://haas.vsb.cz/HaasWsFiji/JobManagementWs.asmx?WSDL</wsdlUrl>
- <wsdlUrl>http://haas.vsb.cz/HaasWsFiji/DataTransferWs.asmx?WSDL</wsdlUrl>
- <wsdlUrl>http://haas.vsb.cz/HaasWsFiji/FileTransferWs.asmx?WSDL</wsdlUrl>
+ <wsdlUrl>http://localhost/wsdl/UserAndLimitationManagementWs.wsdl</wsdlUrl>
+ <wsdlUrl>http://localhost/wsdl/JobManagementWs.wsdl</wsdlUrl>
+ <wsdlUrl>http://localhost/wsdl/DataTransferWs.wsdl</wsdlUrl>
+ <wsdlUrl>http://localhost/wsdl/FileTransferWs.wsdl</wsdlUrl>
</wsdlUrls>
+ <catalog>${project.basedir}/src/main/resources/META-INF/jax-ws-catalog.xml</catalog>
<!-- or using wsdls file directory -->
<!-- <wsdlDirectory>src/wsdl</wsdlDirectory> -->
<!-- which wsdl file -->
diff --git a/haas-java-client/src/main/resources/META-INF/jax-ws-catalog.xml b/haas-java-client/src/main/resources/META-INF/jax-ws-catalog.xml
new file mode 100644
index 00000000..d2217d4a
--- /dev/null
+++ b/haas-java-client/src/main/resources/META-INF/jax-ws-catalog.xml
@@ -0,0 +1,11 @@
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
+ prefer="system">
+ <system systemId="http://localhost/wsdl/DataTransferWs.wsdl"
+ uri="wsdl/DataTransferWs.wsdl" />
+ <system systemId="http://localhost/wsdl/FileTransferWs.wsdl"
+ uri="wsdl/FileTransferWs.wsdl" />
+ <system systemId="http://localhost/wsdl/JobManagementWs.wsdl"
+ uri="wsdl/JobManagementWs.wsdl" />
+ <system systemId="http://localhost/wsdl/UserAndLimitationManagementWs.wsdl"
+ uri="wsdl/UserAndLimitationManagementWs.wsdl" />
+</catalog>
\ No newline at end of file
diff --git a/haas-java-client/src/wsdl/DataTransferWs.wsdl b/haas-java-client/src/main/resources/META-INF/wsdl/DataTransferWs.wsdl
similarity index 100%
rename from haas-java-client/src/wsdl/DataTransferWs.wsdl
rename to haas-java-client/src/main/resources/META-INF/wsdl/DataTransferWs.wsdl
diff --git a/haas-java-client/src/wsdl/FileTransferWs.wsdl b/haas-java-client/src/main/resources/META-INF/wsdl/FileTransferWs.wsdl
similarity index 100%
rename from haas-java-client/src/wsdl/FileTransferWs.wsdl
rename to haas-java-client/src/main/resources/META-INF/wsdl/FileTransferWs.wsdl
diff --git a/haas-java-client/src/wsdl/JobManagementWs.wsdl b/haas-java-client/src/main/resources/META-INF/wsdl/JobManagementWs.wsdl
similarity index 100%
rename from haas-java-client/src/wsdl/JobManagementWs.wsdl
rename to haas-java-client/src/main/resources/META-INF/wsdl/JobManagementWs.wsdl
diff --git a/haas-java-client/src/wsdl/UserAndLimitationManagementWs.wsdl b/haas-java-client/src/main/resources/META-INF/wsdl/UserAndLimitationManagementWs.wsdl
similarity index 100%
rename from haas-java-client/src/wsdl/UserAndLimitationManagementWs.wsdl
rename to haas-java-client/src/main/resources/META-INF/wsdl/UserAndLimitationManagementWs.wsdl
--
GitLab