Skip to content

Commit 4006a22

Browse files
rpastranarpastrana
authored
Merge pull request hpcc-systems#412 from rpastrana/JAPI-332-ESP712xupdate
Japi 332 WsClient update with ESP 7.12.x
2 parents 03e4c6b + 54435a5 commit 4006a22

File tree

1,771 files changed

+616690
-734635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,771 files changed

+616690
-734635
lines changed

‎wsclient/pom.xml

Lines changed: 40 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
</configuration>
173173
</execution>
174174
<execution>
175-
<id>filespray116</id>
175+
<id>filespray120</id>
176176
<phase>process-resources</phase>
177177
<goals>
178178
<goal>wsdl2code</goal>
@@ -182,20 +182,20 @@
182182
<flattenFiles>true</flattenFiles>
183183
<unpackClasses>true</unpackClasses>
184184
<databindingName>adb</databindingName>
185-
<packageName>org.hpccsystems.ws.client.gen.axis2.filespray.v1_16</packageName>
186-
<wsdlFile>src/main/resources/WSDLs/WsFileSpray-117.wsdl</wsdlFile>
185+
<packageName>org.hpccsystems.ws.client.gen.axis2.filespray.v1_20</packageName>
186+
<wsdlFile>src/main/resources/WSDLs/WsFileSpray-120.wsdl</wsdlFile>
187187
<syncMode>sync</syncMode>
188-
<wsdlVersion>1.16</wsdlVersion>
188+
<wsdlVersion>1.20</wsdlVersion>
189189
<namespaceURIs>
190190
<namespaceURI>
191191
<uri>urn:hpccsystems:ws:filespray</uri>
192-
<packageName>org.hpccsystems.ws.client.gen.axis2.filespray.v1_16</packageName>
192+
<packageName>org.hpccsystems.ws.client.gen.axis2.filespray.v1_20</packageName>
193193
</namespaceURI>
194194
</namespaceURIs>
195195
</configuration>
196196
</execution>
197197
<execution>
198-
<id>filespray117</id>
198+
<id>wsdfu155</id>
199199
<phase>process-resources</phase>
200200
<goals>
201201
<goal>wsdl2code</goal>
@@ -205,60 +205,14 @@
205205
<flattenFiles>true</flattenFiles>
206206
<unpackClasses>true</unpackClasses>
207207
<databindingName>adb</databindingName>
208-
<packageName>org.hpccsystems.ws.client.gen.axis2.filespray.v1_17</packageName>
209-
<wsdlFile>src/main/resources/WSDLs/WsFileSpray-117.wsdl</wsdlFile>
210-
<syncMode>sync</syncMode>
211-
<wsdlVersion>1.17</wsdlVersion>
212-
<namespaceURIs>
213-
<namespaceURI>
214-
<uri>urn:hpccsystems:ws:filespray</uri>
215-
<packageName>org.hpccsystems.ws.client.gen.axis2.filespray.v1_17</packageName>
216-
</namespaceURI>
217-
</namespaceURIs>
218-
</configuration>
219-
</execution>
220-
<execution>
221-
<id>wsdfu151</id>
222-
<phase>process-resources</phase>
223-
<goals>
224-
<goal>wsdl2code</goal>
225-
</goals>
226-
<configuration>
227-
<outputDirectory>src/main/java</outputDirectory>
228-
<flattenFiles>true</flattenFiles>
229-
<unpackClasses>true</unpackClasses>
230-
<databindingName>adb</databindingName>
231-
<packageName>org.hpccsystems.ws.client.gen.axis2.wsdfu.v1_51</packageName>
232-
<wsdlFile>src/main/resources/WSDLs/WsDFU-151.wsdl</wsdlFile>
233-
<wsdlVersion>1.51</wsdlVersion>
234-
<syncMode>sync</syncMode>
235-
<namespaceURIs>
236-
<namespaceURI>
237-
<uri>urn:hpccsystems:ws:wsdfu</uri>
238-
<packageName>org.hpccsystems.ws.client.gen.axis2.wsdfu.v1_51</packageName>
239-
</namespaceURI>
240-
</namespaceURIs>
241-
</configuration>
242-
</execution>
243-
<execution>
244-
<id>wsdfu150</id>
245-
<phase>process-resources</phase>
246-
<goals>
247-
<goal>wsdl2code</goal>
248-
</goals>
249-
<configuration>
250-
<outputDirectory>src/main/java</outputDirectory>
251-
<flattenFiles>true</flattenFiles>
252-
<unpackClasses>true</unpackClasses>
253-
<databindingName>adb</databindingName>
254-
<packageName>org.hpccsystems.ws.client.gen.axis2.wsdfu.v1_50</packageName>
255-
<wsdlFile>src/main/resources/WSDLs/WsDFU-150.wsdl</wsdlFile>
256-
<wsdlVersion>1.50</wsdlVersion>
208+
<packageName>org.hpccsystems.ws.client.gen.axis2.wsdfu.v1_55</packageName>
209+
<wsdlFile>src/main/resources/WSDLs/WsDFU-155.wsdl</wsdlFile>
210+
<wsdlVersion>1.55</wsdlVersion>
257211
<syncMode>sync</syncMode>
258212
<namespaceURIs>
259213
<namespaceURI>
260214
<uri>urn:hpccsystems:ws:wsdfu</uri>
261-
<packageName>org.hpccsystems.ws.client.gen.axis2.wsdfu.v1_50</packageName>
215+
<packageName>org.hpccsystems.ws.client.gen.axis2.wsdfu.v1_55</packageName>
262216
</namespaceURI>
263217
</namespaceURIs>
264218
</configuration>
@@ -310,7 +264,7 @@
310264
</configuration>
311265
</execution>
312266
<execution>
313-
<id>wstopology128</id>
267+
<id>wstopology130</id>
314268
<phase>process-resources</phase>
315269
<goals>
316270
<goal>wsdl2code</goal>
@@ -320,20 +274,20 @@
320274
<flattenFiles>true</flattenFiles>
321275
<unpackClasses>true</unpackClasses>
322276
<databindingName>adb</databindingName>
323-
<packageName>org.hpccsystems.ws.client.gen.axis2.wstopology.v1_28</packageName>
324-
<wsdlFile>src/main/resources/WSDLs/WsTopology-128.wsdl</wsdlFile>
325-
<wsdlVersion>1.28</wsdlVersion>
277+
<packageName>org.hpccsystems.ws.client.gen.axis2.wstopology.v1_30</packageName>
278+
<wsdlFile>src/main/resources/WSDLs/WsTopology-130.wsdl</wsdlFile>
279+
<wsdlVersion>1.30</wsdlVersion>
326280
<syncMode>sync</syncMode>
327281
<namespaceURIs>
328282
<namespaceURI>
329283
<uri>urn:hpccsystems:ws:wstopology</uri>
330-
<packageName>org.hpccsystems.ws.client.gen.axis2.wstopology.v1_28</packageName>
284+
<packageName>org.hpccsystems.ws.client.gen.axis2.wstopology.v1_30</packageName>
331285
</namespaceURI>
332286
</namespaceURIs>
333287
</configuration>
334288
</execution>
335289
<execution>
336-
<id>wssmc121</id>
290+
<id>wssmc123</id>
337291
<phase>process-resources</phase>
338292
<goals>
339293
<goal>wsdl2code</goal>
@@ -343,20 +297,20 @@
343297
<flattenFiles>true</flattenFiles>
344298
<unpackClasses>true</unpackClasses>
345299
<databindingName>adb</databindingName>
346-
<packageName>org.hpccsystems.ws.client.gen.axis2.wssmc.v1_21</packageName>
347-
<wsdlFile>src/main/resources/WSDLs/WsSMC-121.wsdl</wsdlFile>
348-
<wsdlVersion>1.21</wsdlVersion>
300+
<packageName>org.hpccsystems.ws.client.gen.axis2.wssmc.v1_23</packageName>
301+
<wsdlFile>src/main/resources/WSDLs/WsSMC-123.wsdl</wsdlFile>
302+
<wsdlVersion>1.23</wsdlVersion>
349303
<syncMode>sync</syncMode>
350304
<namespaceURIs>
351305
<namespaceURI>
352306
<uri>urn:hpccsystems:ws:wssmc</uri>
353-
<packageName>org.hpccsystems.ws.client.gen.axis2.wssmc.v1_21</packageName>
307+
<packageName>org.hpccsystems.ws.client.gen.axis2.wssmc.v1_23</packageName>
354308
</namespaceURI>
355309
</namespaceURIs>
356310
</configuration>
357311
</execution>
358312
<execution>
359-
<id>wspp103</id>
313+
<id>wspp104</id>
360314
<phase>process-resources</phase>
361315
<goals>
362316
<goal>wsdl2code</goal>
@@ -366,20 +320,20 @@
366320
<flattenFiles>true</flattenFiles>
367321
<unpackClasses>true</unpackClasses>
368322
<databindingName>adb</databindingName>
369-
<packageName>org.hpccsystems.ws.client.gen.axis2.wspackageprocess.v1_03</packageName>
370-
<wsdlFile>src/main/resources/WSDLs/WsPackageProcess-103.wsdl</wsdlFile>
371-
<wsdlVersion>1.03</wsdlVersion>
323+
<packageName>org.hpccsystems.ws.client.gen.axis2.wspackageprocess.v1_04</packageName>
324+
<wsdlFile>src/main/resources/WSDLs/WsPackageProcess-104.wsdl</wsdlFile>
325+
<wsdlVersion>1.04</wsdlVersion>
372326
<syncMode>sync</syncMode>
373327
<namespaceURIs>
374328
<namespaceURI>
375329
<uri>urn:hpccsystems:ws:wspackageprocess</uri>
376-
<packageName>org.hpccsystems.ws.client.gen.axis2.wspackageprocess.v1_03</packageName>
330+
<packageName>org.hpccsystems.ws.client.gen.axis2.wspackageprocess.v1_04</packageName>
377331
</namespaceURI>
378332
</namespaceURIs>
379333
</configuration>
380334
</execution>
381335
<execution>
382-
<id>wswu175</id>
336+
<id>wswu179</id>
383337
<phase>process-resources</phase>
384338
<goals>
385339
<goal>wsdl2code</goal>
@@ -389,14 +343,14 @@
389343
<flattenFiles>true</flattenFiles>
390344
<unpackClasses>true</unpackClasses>
391345
<databindingName>adb</databindingName>
392-
<packageName>org.hpccsystems.ws.client.gen.axis2.wsworkunits.v1_75</packageName>
393-
<wsdlFile>src/main/resources/WSDLs/WsWorkunits-175.wsdl</wsdlFile>
394-
<wsdlVersion>1.75</wsdlVersion>
346+
<packageName>org.hpccsystems.ws.client.gen.axis2.wsworkunits.v1_79</packageName>
347+
<wsdlFile>src/main/resources/WSDLs/WsWorkunits-179.wsdl</wsdlFile>
348+
<wsdlVersion>1.79</wsdlVersion>
395349
<syncMode>sync</syncMode>
396350
<namespaceURIs>
397351
<namespaceURI>
398352
<uri>urn:hpccsystems:ws:wsworkunits</uri>
399-
<packageName>org.hpccsystems.ws.client.gen.axis2.wsworkunits.v1_75</packageName>
353+
<packageName>org.hpccsystems.ws.client.gen.axis2.wsworkunits.v1_79</packageName>
400354
</namespaceURI>
401355
</namespaceURIs>
402356
</configuration>
@@ -517,7 +471,7 @@
517471
</configuration>
518472
</execution>
519473
<execution>
520-
<id>wssql105</id>
474+
<id>wssql305</id>
521475
<phase>process-resources</phase>
522476
<goals>
523477
<goal>wsdl2code</goal>
@@ -527,20 +481,20 @@
527481
<flattenFiles>true</flattenFiles>
528482
<unpackClasses>true</unpackClasses>
529483
<databindingName>adb</databindingName>
530-
<packageName>org.hpccsystems.ws.client.gen.axis2.wssql.v1_05</packageName>
531-
<wsdlFile>src/main/resources/WSDLs/WsSQL-105.wsdl</wsdlFile>
532-
<wsdlVersion>1.05</wsdlVersion>
484+
<packageName>org.hpccsystems.ws.client.gen.axis2.wssql.v3_05</packageName>
485+
<wsdlFile>src/main/resources/WSDLs/WsSQL-305.wsdl</wsdlFile>
486+
<wsdlVersion>3.05</wsdlVersion>
533487
<syncMode>sync</syncMode>
534488
<namespaceURIs>
535489
<namespaceURI>
536490
<uri>urn:hpccsystems:ws:wssql</uri>
537-
<packageName>org.hpccsystems.ws.client.gen.axis2.wssql.v1_05</packageName>
491+
<packageName>org.hpccsystems.ws.client.gen.axis2.wssql.v3_05</packageName>
538492
</namespaceURI>
539493
</namespaceURIs>
540494
</configuration>
541495
</execution>
542496
<execution>
543-
<id>wsstore101</id>
497+
<id>wsstore102</id>
544498
<phase>process-resources</phase>
545499
<goals>
546500
<goal>wsdl2code</goal>
@@ -550,14 +504,14 @@
550504
<flattenFiles>true</flattenFiles>
551505
<unpackClasses>true</unpackClasses>
552506
<databindingName>adb</databindingName>
553-
<packageName>org.hpccsystems.ws.client.gen.axis2.wsstore.v1_01</packageName>
554-
<wsdlFile>src/main/resources/WSDLs/WsStore-101.wsdl</wsdlFile>
555-
<wsdlVersion>1.01</wsdlVersion>
507+
<packageName>org.hpccsystems.ws.client.gen.axis2.wsstore.v1_02</packageName>
508+
<wsdlFile>src/main/resources/WSDLs/WsStore-102.wsdl</wsdlFile>
509+
<wsdlVersion>1.02</wsdlVersion>
556510
<syncMode>sync</syncMode>
557511
<namespaceURIs>
558512
<namespaceURI>
559513
<uri>urn:hpccsystems:ws:wsstore</uri>
560-
<packageName>org.hpccsystems.ws.client.gen.axis2.wsstore.v1_01</packageName>
514+
<packageName>org.hpccsystems.ws.client.gen.axis2.wsstore.v1_02</packageName>
561515
</namespaceURI>
562516
</namespaceURIs>
563517
</configuration>

‎wsclient/src/main/java/org/hpccsystems/ws/client/HPCCFileSprayClient.java

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,34 @@
2828
import org.apache.axis2.client.Stub;
2929
import org.apache.logging.log4j.LogManager;
3030
import org.apache.logging.log4j.Logger;
31-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.Copy;
32-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.CopyResponse;
33-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.DFUWorkunitsActionResponse;
34-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.DeleteDropZoneFilesRequest;
35-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.DropZone;
36-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.DropZoneFileSearchRequest;
37-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.DropZoneFileSearchResponse;
38-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.DropZoneFilesRequest;
39-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.DropZoneFilesResponse;
40-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.EspSoapFault;
41-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.EspStringArray;
42-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.FileListRequest;
43-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.FileListResponse;
44-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.FileSprayPingRequest;
45-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.FileSprayStub;
46-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.GetDFUWorkunit;
47-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.GetDFUWorkunitResponse;
48-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.GetDFUWorkunits;
49-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.GetDFUWorkunitsResponse;
50-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.PhysicalFileStruct;
51-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.ProgressRequest;
52-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.ProgressResponse;
53-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.Rename;
54-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.RenameResponse;
55-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.SprayFixed;
56-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.SprayFixedResponse;
57-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.SprayResponse;
58-
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_17.SprayVariable;
31+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.Copy;
32+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.CopyResponse;
33+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.DFUWorkunitsActionResponse;
34+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.DeleteDropZoneFilesRequest;
35+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.DropZone;
36+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.DropZoneFileSearchRequest;
37+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.DropZoneFileSearchResponse;
38+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.DropZoneFilesRequest;
39+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.DropZoneFilesResponse;
40+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.EspSoapFault;
41+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.EspStringArray;
42+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.FileListRequest;
43+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.FileListResponse;
44+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.FileSprayPingRequest;
45+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.FileSprayStub;
46+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.GetDFUWorkunit;
47+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.GetDFUWorkunitResponse;
48+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.GetDFUWorkunits;
49+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.GetDFUWorkunitsResponse;
50+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.PhysicalFileStruct;
51+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.ProgressRequest;
52+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.ProgressResponse;
53+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.Rename;
54+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.RenameResponse;
55+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.SprayFixed;
56+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.SprayFixedResponse;
57+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.SprayResponse;
58+
import org.hpccsystems.ws.client.gen.axis2.filespray.v1_20.SprayVariable;
5959
import org.hpccsystems.ws.client.utils.Connection;
6060
import org.hpccsystems.ws.client.utils.DelimitedDataOptions;
6161
import org.hpccsystems.ws.client.utils.EqualsUtil;

0 commit comments

Comments
 (0)