Skip to content
This repository has been archived by the owner on Mar 6, 2024. It is now read-only.

Commit

Permalink
Changed SOAP login API
Browse files Browse the repository at this point in the history 
The Login API has been split in 2
LoginCsp
LoginPsc
  • Loading branch information
@mdaneri
mdaneri committed Jun 22, 2022
1 parent d63270b commit 9f7e2e7
Show file tree
Hide file tree
Showing 12 changed files with 7,132 additions and 7,030 deletions.
11,524 changes: 5,816 additions & 5,708 deletions PowerShell/Sapi/SapiService.cs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/eclipse/safekeeping-cxf.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.vmware.safekeeping.cxf.App"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="safekeeping-cxf"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--interactive --securePort 8443 --port 8080 --debug"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--interactive --securePort 8443 --port 8080 --debug -statusPage off"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="safekeeping-cxf"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms7G -Xmx20G -server"/>
</launchConfiguration>
797 changes: 410 additions & 387 deletions lib/sapi/SapiService.wsdl
View file

Large diffs are not rendered by default.

338 changes: 175 additions & 163 deletions lib/sapi/SapiService_metadata1.xsd
View file

Large diffs are not rendered by default.

Binary file modified lib/sapi/sapi-src.jar
View file
Binary file not shown.
Binary file modified lib/sapi/sapi.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion prepare.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if "%OS%"=="Windows_NT" setlocal
set PWSH7="%ProgramFiles%\PowerShell\7\pwsh.exe"
set PWSH6="%ProgramFiles%\PowerShell\6\pwsh.exe"
set PWSH="%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe"
set HELPMESSAGE=prepare.cmd -jdk ^<version^> ^| -Reset
set HELPMESSAGE=prepare.cmd -jdk ^<version^> ^| -Clean
if exist %PWSH6%. set PWSH=%PWSH6%
if exist %PWSH7%. set PWSH=%PWSH7%

Expand Down
48 changes: 12 additions & 36 deletions prepare.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
Configure Safekeeping Dev enviroment
.PARAMETER Jdk
Specify the JAVA version to use to build and distribuite Safekeeping
.PARAMETER Reset
.PARAMETER Clean
Cleans and remove any Java JDK library file
.EXAMPLE
PS> .\Prepare.ps1 -Jdk 11
Configure Safekeeping to be built with JDK version 11
.EXAMPLE
PS> .\Prepare.ps1 -Reset
PS> .\Prepare.ps1 -Clean
Clean from any JDK file
.SYNOPSIS
Used to configure Safekeeping development enviroment
#>
param (
[Int] [ValidateRange(8,11)] [Parameter (Mandatory=$True,Position=0, HelpMessage="Java version to use ",ParameterSetName="Java")] # Specify the JAVA version to use to build and distribuite Safekeeping
$Jdk ,
[Parameter(Mandatory=$True,ParameterSetName="Clean")] [switch]$Reset
$Jdk ,
[Parameter(Mandatory=$True,ParameterSetName="Clean")] [switch]$Clean
)

Function DeGZip-File{
Expand Down Expand Up @@ -124,7 +124,7 @@ Function CleanUp() {



if ($Reset){
if ($Clean){
Define-Variable
cleanUp
Write-Host Done
Expand All @@ -133,47 +133,23 @@ Function CleanUp() {
switch($Jdk){
8 {
$JdkVersion="VERSION_1_8"
$ver="8u282"
$rev="08"
$ver="8u332"
$rev="09"
$VR=$ver+"b"+$rev
$jdkFolder="jdk$ver-b$rev"
$openJdkUrlPath="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk$ver-b$rev"
$jdkFolder="jdk$ver-b$rev"
$openJdkUrlPath="https://github.com/adoptium/temurin8-binaries/releases/download/jdk$ver-b$rev"
$jreWinFileName="OpenJDK8U-jre_x64_windows_hotspot_"+$VR+".zip"
$jreLinuxFileName="OpenJDK8U-jre_x64_linux_hotspot_"+$VR+".tar.gz"
$jdkWinFileName="OpenJDK8U-jdk_x64_windows_hotspot_"+$VR+".zip"
$jdkLinuxFileName="OpenJDK8U-jdk_x64_linux_hotspot_"+$VR+".tar.gz"
}
9 {
$JdkVersion="VERSION_1_9"
$ver="9.0.4"
$rev="11"
$VR=$ver+"_"+$rev
$jdkFolder="jdk-$ver+$rev"
$openJdkUrlPath="https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-$ver%2B$rev"
$jreWinFileName="OpenJDK9U-jre_x64_windows_hotspot_"+$VR+".zip"
$jreLinuxFileName="OpenJDK9U-jre_x64_linux_hotspot_"+$VR+".tar.gz"
$jdkWinFileName="OpenJDK9U-jdk_x64_windows_hotspot_"+$VR+".zip"
$jdkLinuxFileName="OpenJDK9U-jdk_x64_linux_hotspot_"+$VR+".tar.gz"
}
10 {
$JdkVersion="VERSION_1_10"
$ver="10.0.2"
$rev="13"
$VR=$ver+"_"+$rev
$jdkFolder="jdk-$ver+$rev"
$openJdkUrlPath="https://github.com/AdoptOpenJDK/openjdk10-binaries/releases/download/jdk-$ver%2B$rev"
$jreWinFileName="OpenJDK10U-jre_x64_windows_hotspot_"+$VR+".zip"
$jreLinuxFileName="OpenJDK10U-jre_x64_linux_hotspot_"+$VR+".tar.gz"
$jdkWinFileName="OpenJDK10U-jdk_x64_windows_hotspot_"+$VR+".zip"
$jdkLinuxFileName="OpenJDK10U-jdk_x64_linux_hotspot_"+$VR+".tar.gz"
}
11 {
$JdkVersion="VERSION_11"
$ver="11.0.10"
$rev="9"
$ver="11.0.15"
$rev="10"
$VR=$ver+"_"+$rev
$jdkFolder="jdk-$ver+$rev"
$openJdkUrlPath="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$ver%2B$rev"
$openJdkUrlPath="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-$ver%2B$rev"
$jreWinFileName="OpenJDK11U-jre_x64_windows_hotspot_"+$VR+".zip"
$jreLinuxFileName="OpenJDK11U-jre_x64_linux_hotspot_"+$VR+".tar.gz"
$jdkWinFileName="OpenJDK11U-jdk_x64_windows_hotspot_"+$VR+".zip"
Expand Down
40 changes: 5 additions & 35 deletions prepare.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,66 +80,36 @@ case "$1" in
VR=$ver"b"$rev
jdkFolder="jdk$ver-b$rev"
jreFolder="$jdkFolder-jre"
openJdkUrlPath="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk$ver-b$rev"
openJdkUrlPath="https://github.com/adoptium/temurin8-binaries/releases/download/jdk$ver-b$rev"
jreWinFileName="OpenJDK8U-jre_x64_windows_hotspot_$VR.zip"
jreLinuxFileName="OpenJDK8U-jre_x64_linux_hotspot_$VR.tar.gz"
jdkWinFileName="OpenJDK8U-jdk_x64_windows_hotspot_$VR.zip"
jdkLinuxFileName="OpenJDK8U-jdk_x64_linux_hotspot_$VR.tar.gz"
;;
-jdk9)
JdkVersion="VERSION_1_9"
ver="9.0.4"
rev="11"
VR=$ver"_"$rev
jdkFolder="jdk$ver-b$rev"
jreFolder="$jdkFolder-jre"
openJdkUrlPath="https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-$ver%2B$rev"
jreWinFileName="OpenJDK9U-jre_x64_windows_hotspot_$VR.zip"
jreLinuxFileName="OpenJDK9U-jre_x64_linux_hotspot_$VR.tar.gz"
jdkWinFileName="OpenJDK9U-jdk_x64_windows_hotspot_$VR.zip"
jdkLinuxFileName="OpenJDK9U-jdk_x64_linux_hotspot_$VR.tar.gz"

;;
-jdk10)
JdkVersion="VERSION_1_10"
ver="10.0.2"
rev="13"
subRev="1"
VR=$ver"_"$rev
jdkFolder="jdk$ver-b$rev"
jreFolder="$jdkFolder-jre"
openJdkUrlPath="https://github.com/AdoptOpenJDK/openjdk10-binaries/releases/download/jdk-$ver%2B$rev$subRev"
jreWinFileName="OpenJDK10U-jre_x64_windows_hotspot_$VR.zip"
jreLinuxFileName="OpenJDK10U-jre_x64_linux_hotspot_$VR.tar.gz"
jdkWinFileName="OpenJDK10U-jdk_x64_windows_hotspot_$VR.zip"
jdkLinuxFileName="OpenJDK10U-jdk_x64_linux_hotspot_$VR.tar.gz"
;;
-jdk11)
JdkVersion="VERSION_11"
ver="11.0.10"
rev="9"
VR=$ver"_"$rev
jdkFolder="jdk$ver-b$rev"
jreFolder="$jdkFolder-jre"
openJdkUrlPath="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$ver%2B$rev"
openJdkUrlPath="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-$ver%2B$rev
jreWinFileName="OpenJDK11U-jre_x64_windows_hotspot_$VR.zip"
jreLinuxFileName="OpenJDK11U-jre_x64_linux_hotspot_$VR.tar.gz"
jdkWinFileName="OpenJDK11U-jdk_x64_windows_hotspot_$VR.zip"
jdkLinuxFileName="OpenJDK11U-jdk_x64_linux_hotspot_$VR.tar.gz"
;;
-reset)
-clean)
defineVariable
cleanUp
echo Done
exit
;;
*)
echo Configure Safekeeping to use a specific OpenJava version:
echo -jdk8 Use Java 1.8
echo -jdk9 Use Java 1.9
echo -jdk10 Use Java 1.10
echo -jdk8 Use Java 1.8
echo -jdk11 Use Java 11
echo -reset Reverse any change made by the script
echo -clean Reverse any change made by the script
exit
;;
esac
Expand Down
4 changes: 2 additions & 2 deletions safekeeping-cxf-test/src/main/java/com/vmware/safekeeping/cxf/test/App.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,14 @@ private ResultActionConnectSso login(final boolean csp) throws InternalCoreResul
cspOptions.setRefreshToken("Yk0957HMA3deUWHCKCXLP7PuQ1xE7F7liaC8H4ykZulsEguLlrKNEqadquYTfheK");
cspOptions.setTokenExchangeServer("https://vcenter.sddc-44-233-221-247.vmwarevmc.com/");

loginResult = this.sapi.login(cspOptions);
loginResult = this.sapi.loginCsp(cspOptions);
} else {
final PscConnectOptions pscOptions = new PscConnectOptions();
pscOptions.setBase64(false);
pscOptions.setAuthServer(this.server);
pscOptions.setUser(this.user);
pscOptions.setPassword(new String(this.password));
loginResult = this.sapi.login(pscOptions);
loginResult = this.sapi.loginPsc(pscOptions);
}
return loginResult;
}
Expand Down
8 changes: 6 additions & 2 deletions safekeeping-cxf/src/main/java/com/vmware/safekeeping/cxf/Sapi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@
import com.vmware.safekeeping.external.type.RestoreVappManagedInfo;
import com.vmware.safekeeping.external.type.RestoreVmManagedInfo;
import com.vmware.safekeeping.external.type.options.BackupOptions;
import com.vmware.safekeeping.external.type.options.ConnectOptions;
import com.vmware.safekeeping.external.type.options.CspConnectOptions;
import com.vmware.safekeeping.external.type.options.ExtensionOptions;
import com.vmware.safekeeping.external.type.options.PscConnectOptions;
import com.vmware.safekeeping.external.type.options.RepositoryOptions;
import com.vmware.safekeeping.external.type.options.RestoreOptions;
import com.vmware.safekeeping.external.type.options.VirtualBackupOptions;
Expand Down Expand Up @@ -200,7 +201,10 @@ Task listArchive(@WebParam(name = "options") ArchiveListOptions options)
throws UnrecognizedToken, InvalidOptions, InternalCoreResult;

@WebMethod
ResultActionConnectSso login(@WebParam(name = "options") ConnectOptions options) throws InternalCoreResult;
ResultActionConnectSso loginCsp(@WebParam(name = "options") CspConnectOptions options) throws InternalCoreResult;

@WebMethod
ResultActionConnectSso loginPsc(@WebParam(name = "options") PscConnectOptions options) throws InternalCoreResult;

@WebMethod
ResultActionDisconnectSso logout() throws UnrecognizedToken, InternalCoreResult;
Expand Down
Loading

0 comments on commit 9f7e2e7

Please sign in to comment.