Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code review / Testing changes #30

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 26 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "WSDL Generation",
"type": "shell",
"command": "python",
"args": ["wsclient/utils/wsInterfaceUpdater.py", "-b", "${input:branchName}", "-t", "${input:hpccHost}"]
}
],
//172.17.58.37
"inputs": [
{
"id": "hpccHost",
"description": "Enter HPCC Host",
"default": "localhost",
"type": "promptString"
},
{
"id": "branchName",
"description": "Enter Branch Name",
"default": "candidate-9.0.x",
"type": "promptString"
}
]
}
45 changes: 45 additions & 0 deletions wsclient/utils/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Generate all services 9.0.x",
"type": "python",
"request": "launch",
"program": "/home/ubuntu/GIT/generate-wsdl/generate-wsdl",
"console": "integratedTerminal",
"justMyCode": true,
"args": ["-b", "candidate-9.0.x"],
"cwd": "${workspaceFolder}"
},
{
"name": "wsdl updater help",
"type": "python",
"request": "launch",
"program": "/home/ubuntu/GIT/generate-wsdl/generate-wsdl",
"console": "integratedTerminal",
"justMyCode": true,
"args": ["-h"],
"cwd": "${workspaceFolder}"
},
{
"name": "Generate wssmc",
"type": "python",
"request": "launch",
"program": "/home/ubuntu/GIT/generate-wsdl/generate-wsdl",
"console": "integratedTerminal",
"justMyCode": true,
"args": ["-b", "candidate-9.0.x", "-s", "wsdfu"]
},
{
"type": "java",
"name": "Axis2ADBStubWrapperMaker",
"request": "launch",
"mainClass": "org.hpccsystems.ws.client.utils.Axis2ADBStubWrapperMaker",
"projectName": "wsclient",
"args": "servicename=wssmc outputpackage=org.hpccsystems.ws.client.wrappers targetpackage=org.hpccsystems.ws.client.gen.axis2.wssmc.latest servicename=WsSMC outputdir=/home/ubuntu/GIT/generate-wsdl/hpcc4j/wsclient/src/main/java"
}
]
}
70 changes: 70 additions & 0 deletions wsclient/utils/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
wsclient utils
==============

## WS Interface Update Tool
This utility updates the WsClient web service client interface to match the latest interface as defined by the target version of ESP

### Dependancies

- Python 3
#### ESP based solution
- Running HPCC instance with accessible ESP

#### ESDL based solution
- git client tool - Clones HPCC-Platform and HPCC4J locally
- esdl - HPCC-Platform's esdl client tool, included in client tools install package, or can be built from source Should be on system path.

### Usage

```console
usage: generate-wsdl [-h] [-s SERVICE] [-b BRANCH] [-u USER] [-v] [-d] [-l] [-e]

optional arguments:
-h, --help show this help message and exit
-s SERVICE, --service SERVICE

Service to target for wsdl generation
default: all
example: wsdfu

-b BRANCH, --branch BRANCH

Branch to target for wsdl generation
default: master
example: hpcc4j-8.8.X

-u USER, --user USER
User for repository fetch
default: hpcc-systems
example: mygithubusername
-t HPCCHOST, --targethpcchost HPCCHOST
Running HPCC host to fetch WSDLs
default: localhost
-p HPCCPORT, --hpccport HPCCPORT Running HPCC Port to fetch WSDLs
default: 8010

-v, --verbose Give more verbose information
-d, --debug Ouput debugging information
-l, --list-services List available services for stubcode generation
-e, --esdlwsdl Generate WSDLs from ESDL
```

Example usage:

```console
python3 generate-wsdl -s wssmc
```

The above example fetches WSDLs from ESP on http://localhost:8010, determines if wssmc's interface has been updated in HPCC-Platform/esp.
If wssmc has been updated, the latest WSDL is generated, latest stub code and wrappers are generated.


```console
python3 generate-wsdl -b candidate-9.0.x -s wssmc -e
```

The above example clones HPCC-Platform and HPCC4J's candidate-9.0.x branches, determines if wssmc's interface has been updated in HPCC-Platform/esp.
If wssmc has been updated, the latest WSDL is generated, latest stub code and wrappers are generated.