From ddba9fb95754bc506723c8e760036983c73c5a69 Mon Sep 17 00:00:00 2001 From: Gaetano Savo Date: Thu, 20 Mar 2025 07:12:33 +0100 Subject: [PATCH] Upgrade a jboss 8 --- .gitignore | 6 +- .vscode/settings.json | 5 +- README.md | 33 ++++++----- build-and-deploy.ps1 | 35 +++++------- checkout-projects.ps1 | 124 ++++++++++++++++++++++++++++++++++++++++++ start-jboss.ps1 | 18 +++--- stop-jboss.ps1 | 6 +- unpack_ear.ps1 | 52 ++++++++++++++++++ 8 files changed, 231 insertions(+), 48 deletions(-) create mode 100644 checkout-projects.ps1 create mode 100644 unpack_ear.ps1 diff --git a/.gitignore b/.gitignore index 5d7032f..5e13219 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,9 @@ *.log # Project directories -arm_am*/ +arm*/ asset-gui/ +AmazonAWS.S3/ +aspose-manager/ +data-quality/ +shared-javaEE/ diff --git a/.vscode/settings.json b/.vscode/settings.json index c5f3f6b..6c92d5a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,6 @@ { - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "disabled", + "svn.delete.ignoredRulesForDeletedFiles": [ + "target" + ] } \ No newline at end of file diff --git a/README.md b/README.md index 8cf8f3b..6800fc6 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,33 @@ # SVN Project Checkout Steps ## Richieste -- voglio scaricare il progetto su https://svn.armundia.com/svn/PRJarm_am/branches/ISPBEstero/ADV360-BES-JB74/arm_am-pom -- scarica anche https://svn.armundia.com/svn/PRJarm_am/branches/ISPBEstero/ADV360-BES-JB74/asset-gui +- voglio scaricare il progetto su https://svn.armundia.com/svn/PRJarm_am/branches/ISPBEstero/ADV360-BES-JB8_B2024_2/arm_am-pom +- scarica anche https://svn.armundia.com/svn/PRJarm_am/branches/ISPBEstero/ADV360-BES-JB8_B2024_2/asset-gui - crea un readme con le richieste che ho fatto -- crea uno script powershell che fa il build ed il deploy di arm_am-pom su C:\Dev2012\BUILDERS\jboss-eap-7.4 +- crea uno script powershell che fa il build ed il deploy di arm_am-pom su C:\Dev2012\BUILDERS\jboss-eap-8.0 - il pom è nel folder arm_am-pom -- java 8 è su C:\Dev2012\BUILDERS\java\jdk1.8.0_291 +- java 17 è su C:\Dev2012\BUILDERS\java\jdk-17.0.9 - aggiorna il readme -- deve usare standalone-ADVC-full.xml +- deve usare standalone-full-ADV360-BES-EAP_8_POSTGRES.xml - voglio compilare e lanciare il progetto asset-gui - jboss deve usare le opzioni "-DIDServer=GS -Dbtf.PathToParse=C:\Dev2012\advc0\in -Djava.awt.headless=true -DFilOptimize=true -DMTH_VALID_JB=internal -DskQueueElab=GS -DskQueueWrite=GS -DmtSession=GS" + +- C:\Dev2012\BUILDERS\jboss-eap-8.0\bin\add-user.bat" -u admin -p admin.123 -g SuperUser --silent + +dir $env:USERPROFILE\.m2\repository\com\armundia -Recurse | Where-Object { $_.Name -like "*.pom" } + ## Projects Downloaded 1. ARM AM POM Project ``` -svn checkout https://svn.armundia.com/svn/PRJarm_am/branches/ISPBEstero/ADV360-BES-JB74/arm_am-pom +svn checkout https://svn.armundia.com/svn/PRJarm_am/branches/ISPBEstero/ADV360-BES-JB8_B2024_2/arm_am-pom ``` 2. Asset GUI Project ``` -svn checkout https://svn.armundia.com/svn/PRJarm_am/branches/ISPBEstero/ADV360-BES-JB74/asset-gui +svn checkout https://svn.armundia.com/svn/PRJarm_am/branches/ISPBEstero/ADV360-BES-JB8_B2024_2/asset-gui ``` Both projects were checked out at revision 132783. @@ -45,16 +50,16 @@ Both projects were checked out at revision 132783. ## Build and Deployment Scripts ### start-jboss.ps1 -PowerShell script to start JBoss EAP 7.4 server: -- Uses Java 8 from `C:\Dev2012\BUILDERS\java\jdk1.8.0_291` -- Uses `standalone-ADVC-full.xml` configuration +PowerShell script to start JBoss EAP 8.0 server: +- Uses Java 17 from `C:\Dev2012\BUILDERS\java\jdk-17.0.9` +- Uses `standalone-full-ADV360-BES-EAP_8_POSTGRES.xml` configuration - Starts JBoss in standalone mode with debug enabled - Binds to all interfaces (0.0.0.0) - Management console available at http://localhost:9990 -- JBoss logs location: `C:\Dev2012\BUILDERS\jboss-eap-7.4\standalone\log\server.log` +- JBoss logs location: `C:\Dev2012\BUILDERS\jboss-eap-8.0\standalone\log\server.log` ### stop-jboss.ps1 -PowerShell script to stop JBoss EAP 7.4 server: +PowerShell script to stop JBoss EAP 8.0 server: - Finds and stops the JBoss process safely - Waits to ensure process is fully stopped @@ -93,10 +98,10 @@ PowerShell script to build and run the asset-gui project: ``` 4. Monitor deployment: -- Check JBoss logs at `C:\Dev2012\BUILDERS\jboss-eap-7.4\standalone\log\server.log` +- Check JBoss logs at `C:\Dev2012\BUILDERS\jboss-eap-8.0\standalone\log\server.log` - Access JBoss admin console at http://localhost:9990 - Access asset-gui frontend at http://localhost:3000 ## Required Configuration -- JBoss configuration file: `standalone-ADVC-full.xml` must be present in `C:\Dev2012\BUILDERS\jboss-eap-7.4\standalone\configuration\` +- JBoss configuration file: `standalone-full-ADV360-BES-EAP_8_POSTGRES.xml` must be present in `C:\Dev2012\BUILDERS\jboss-eap-8.0\standalone\configuration\` - Node.js must be installed to build and run asset-gui diff --git a/build-and-deploy.ps1 b/build-and-deploy.ps1 index 8335ecd..5a7a535 100644 --- a/build-and-deploy.ps1 +++ b/build-and-deploy.ps1 @@ -1,11 +1,11 @@ -# PowerShell script for building and deploying arm_am-pom to JBoss EAP 7.4 +# PowerShell script for building and deploying arm_am-pom to JBoss EAP 8.0 # Configuration -$JBOSS_HOME = "C:\Dev2012\BUILDERS\jboss-eap-7.4" -$PROJECT_DIR = "C:\Dev2012\source\WindSurf\adv\arm_am-pom" +$JBOSS_HOME = "C:\Dev2012\BUILDERS\jboss-eap-8.0" +$PROJECT_DIR = "C:\Dev2012\source\WindSurf\adv8\arm_am-pom" $DEPLOYMENT_DIR = "$JBOSS_HOME\standalone\deployments" $MAVEN_PROFILE = "adv360-DEV" # Default development profile -$JAVA_HOME = "C:\Dev2012\BUILDERS\java\jdk1.8.0_291" # Path to Java 8 +$JAVA_HOME = "C:\Dev2012\BUILDERS\java\jdk-17.0.9" # Path to Java 17 # Store the original directory $originalDirectory = Get-Location @@ -21,7 +21,7 @@ Write-Host "Starting build and deploy process..." -ForegroundColor Green # Check if Java exists if (-not (Test-Path $JAVA_HOME)) { - Write-Host "Error: Java 8 not found at $JAVA_HOME" -ForegroundColor Red + Write-Host "Error: Java 17 not found at $JAVA_HOME" -ForegroundColor Red Set-Location $originalDirectory # Restore original directory exit 1 } @@ -47,34 +47,29 @@ if (-not (Test-Path $PROJECT_DIR)) { # Navigate to project directory Set-Location $PROJECT_DIR -# Clean and build the project with Maven -Write-Host "Building project with Maven using profile $MAVEN_PROFILE..." -ForegroundColor Yellow -Write-Host "Current directory: $(Get-Location)" -ForegroundColor Yellow +# Build process +Write-Host "Building project with profile $MAVEN_PROFILE..." -ForegroundColor Yellow -# First build the parent and modules with debug output -Write-Host "Building parent POM..." -ForegroundColor Yellow -& "$env:JAVA_HOME\bin\java" -version -mvn clean install -N -P$MAVEN_PROFILE -X +# Build parent +mvn clean install -N "-P$MAVEN_PROFILE" if ($LASTEXITCODE -ne 0) { Write-Host "Maven parent build failed!" -ForegroundColor Red - Set-Location $originalDirectory # Restore original directory + Set-Location $originalDirectory exit 1 } -# Build the EJB module first with debug output -Write-Host "Building EJB module..." -ForegroundColor Yellow +# Build EJB module Set-Location "$PROJECT_DIR\arm_am-ejb" -mvn clean install -DskipTests -P$MAVEN_PROFILE -X +mvn clean install -DskipTests "-P$MAVEN_PROFILE" if ($LASTEXITCODE -ne 0) { Write-Host "Maven EJB module build failed!" -ForegroundColor Red Set-Location $originalDirectory # Restore original directory exit 1 } -# Build the WAR module with debug output -Write-Host "Building WAR module..." -ForegroundColor Yellow +# Build WAR module Set-Location "$PROJECT_DIR\arm_am" -mvn clean install -DskipTests -P$MAVEN_PROFILE -X +mvn clean install -DskipTests "-P$MAVEN_PROFILE" if ($LASTEXITCODE -ne 0) { Write-Host "Maven WAR module build failed!" -ForegroundColor Red Set-Location $originalDirectory # Restore original directory @@ -84,7 +79,7 @@ if ($LASTEXITCODE -ne 0) { # Finally build the EAR module with debug output Write-Host "Building EAR module..." -ForegroundColor Yellow Set-Location "$PROJECT_DIR\arm_am-ear" -mvn clean package -DskipTests -P$MAVEN_PROFILE -X +mvn clean package -DskipTests "-P$MAVEN_PROFILE" if ($LASTEXITCODE -ne 0) { Write-Host "Maven EAR module build failed!" -ForegroundColor Red Set-Location $originalDirectory # Restore original directory diff --git a/checkout-projects.ps1 b/checkout-projects.ps1 new file mode 100644 index 0000000..a4037aa --- /dev/null +++ b/checkout-projects.ps1 @@ -0,0 +1,124 @@ +# PowerShell script to checkout arm_am-pom and asset-gui projects + +# Configuration +$SVN_BASE_URL = "https://svn.armundia.com/svn/PRJarm_am/branches/ISPBEstero/ADV360-BES-JB8_B2024_2" +$SVN_BASE_URL_BW2_LIB = "https://svn.armundia.com/svn/PRJbw2/branches/LIB-JK10" +$SVN_BASE_URL_ARM_LIB = "https://svn.armundia.com/svn/PRJarm_am/branches/LIB-JK10" +$WORKSPACE_DIR = "C:\Dev2012\source\WindSurf\adv8" + +# Project paths +$PROJECTS = @{ + "arm_am-pom" = "$SVN_BASE_URL/arm_am-pom" + "asset-gui" = "$SVN_BASE_URL/asset-gui" + "AmazonAWS.S3" = "$SVN_BASE_URL_BW2_LIB/AmazonAWS.S3" + "arm-core-batch" = "$SVN_BASE_URL_ARM_LIB/arm-batch-module" + "arm-core-document" = "$SVN_BASE_URL_BW2_LIB/arm-core-document-ispb" + "arm-core-event" = "$SVN_BASE_URL_BW2_LIB/arm-core-event" + "arm-core-perfo" = "$SVN_BASE_URL_ARM_LIB/arm-perfo-ispb" + "arm-core-print" = "$SVN_BASE_URL/arm-core-print/arm-core-print" + "arm-core-querybuilder" = "$SVN_BASE_URL_ARM_LIB/arm-core-querybuilder" + "arm-core-quest" = "$SVN_BASE_URL/arm-core-quest" + "arm-core-users" = "$SVN_BASE_URL_ARM_LIB/arm-core-users" + "arm-core-utility" = "$SVN_BASE_URL_ARM_LIB/arm-core-utility" + "arm-core-utility-extra" = "$SVN_BASE_URL_ARM_LIB/arm-core-utility-extra" + "arm-core-var" = "$SVN_BASE_URL_ARM_LIB/arm-calcolo-VaR" + "arm-fileExporter" = "$SVN_BASE_URL_ARM_LIB/arm-fileExporter" + "arm-limiti" = "$SVN_BASE_URL_ARM_LIB/arm-limiti" + "arm-quadratore-portafogli" = "$SVN_BASE_URL_ARM_LIB/arm-quadratore-portafogli" + "arm-util" = "$SVN_BASE_URL_ARM_LIB/arm-util" + "aspose-manager" = "$SVN_BASE_URL/arm-core-print/aspose-manager" + "data-quality" = "$SVN_BASE_URL_ARM_LIB/data-quality-default" + "shared-javaEE" = "$SVN_BASE_URL_ARM_LIB/Shared-JavaEE" + } + +# Create workspace directory if it doesn't exist +if (-not (Test-Path $WORKSPACE_DIR)) { + New-Item -ItemType Directory -Path $WORKSPACE_DIR -Force +} + +# Function to checkout or update a project +function Checkout-Project { + param ( + [string]$projectName, + [string]$svnUrl, + [string]$targetDir + ) + + $projectPath = Join-Path $targetDir $projectName + + if (Test-Path $projectPath) { + Write-Host "Updating $projectName..." -ForegroundColor Yellow + Set-Location $projectPath + svn update + } else { + Write-Host "Checking out $projectName..." -ForegroundColor Yellow + Set-Location $targetDir + svn checkout $svnUrl $projectName + } + + if ($LASTEXITCODE -eq 0) { + Write-Host "$projectName successfully checked out/updated" -ForegroundColor Green + } else { + Write-Host "Error checking out/updating $projectName" -ForegroundColor Red + } +} + +# Store the original directory +$originalDirectory = Get-Location + +try { + # Checkout/update each project + foreach ($project in $PROJECTS.GetEnumerator()) { + Checkout-Project -projectName $project.Key -svnUrl $project.Value -targetDir $WORKSPACE_DIR + } + + # Array of projects to build in order + $BUILD_ORDER = @( + # Base libraries + # "shared-javaEE", # Base Java EE utilities + # "arm-core-utility", # core utilities + # "arm-core-utility-extra", # additional utilities + # "arm-util", # general utilities + + # # Core functionality + # "arm-core-document", # Document handling + # "arm-core-event", # Event system + # "arm-core-users", # User management + # "arm-core-querybuilder", # Query building + # "arm-core-print", # Printing system + + # # Business modules + "arm-core-quest"#, # Questionnaires + # "arm-core-batch", # Batch processing + # "arm-core-perfo", # Performance + # "arm-core-var", # Risk calculation + # "arm-fileExporter", # File export + # "arm-limiti", # Limits management + # "arm-quadratore-portafogli", # Portfolio management + + # # Additional components + # "data-quality", # Data quality + # "AmazonAWS.S3", # AWS S3 integration + # "aspose-manager" # Document processing + ) + + # Build each project in order + foreach ($project in $BUILD_ORDER) { + Write-Host "Building $project..." -ForegroundColor Yellow + Set-Location (Join-Path $WORKSPACE_DIR $project) + mvn clean install -DskipTests + + if ($LASTEXITCODE -eq 0) { + Write-Host "$project successfully built and installed" -ForegroundColor Green + } else { + Write-Host "Error building $project" -ForegroundColor Red + exit 1 + } + } + +} catch { + Write-Host "An error occurred: $_" -ForegroundColor Red +} finally { + # Restore original directory + Set-Location $originalDirectory +} diff --git a/start-jboss.ps1 b/start-jboss.ps1 index a121fcf..a215031 100644 --- a/start-jboss.ps1 +++ b/start-jboss.ps1 @@ -1,8 +1,8 @@ -# PowerShell script to start JBoss EAP 7.4 +# PowerShell script to start JBoss EAP 8.0 # Configuration -$JBOSS_HOME = "C:\Dev2012\BUILDERS\jboss-eap-7.4" -$JAVA_HOME = "C:\Dev2012\BUILDERS\java\jdk1.8.0_291" +$JBOSS_HOME = "C:\Dev2012\BUILDERS\jboss-eap-8.0" +$JAVA_HOME = "C:\Dev2012\BUILDERS\java\jdk-17.0.9" # Function to check if JBoss is already running function Is-JBossRunning { @@ -13,7 +13,7 @@ function Is-JBossRunning { # Check if Java exists if (-not (Test-Path $JAVA_HOME)) { - Write-Host "Error: Java 8 not found at $JAVA_HOME" -ForegroundColor Red + Write-Host "Error: Java 17 not found at $JAVA_HOME" -ForegroundColor Red exit 1 } @@ -24,7 +24,7 @@ if (-not (Test-Path $JBOSS_HOME)) { } # Check if configuration file exists -$configFile = "$JBOSS_HOME\standalone\configuration\standalone-ADVCsvil-full.xml" +$configFile = "$JBOSS_HOME\standalone\configuration\standalone-full-ADV360-BES-EAP_8_POSTGRES.xml" if (-not (Test-Path $configFile)) { Write-Host "Error: Configuration file not found at $configFile" -ForegroundColor Red exit 1 @@ -44,10 +44,10 @@ if (Is-JBossRunning) { exit 0 } -Write-Host "Starting JBoss EAP 7.4..." -ForegroundColor Green +Write-Host "Starting JBoss EAP 8.0..." -ForegroundColor Green Write-Host "Using Java from: $JAVA_HOME" -ForegroundColor Yellow Write-Host "JBoss Home: $JBOSS_HOME" -ForegroundColor Yellow -Write-Host "Using configuration: standalone-ADVCsvil-full.xml" -ForegroundColor Yellow +Write-Host "Using configuration: standalone-full-ADV360-BES-EAP_8_POSTGRES.xml" -ForegroundColor Yellow # Start JBoss in standalone mode $startScript = "$JBOSS_HOME\bin\standalone.bat" @@ -71,10 +71,10 @@ Write-Host "JVM Options: $env:JAVA_OPTS" -ForegroundColor Yellow Write-Host "Remote debugging enabled on port 8787" -ForegroundColor Cyan # Create the command line arguments -$cmdArgs = "-c standalone-ADVCsvil-full.xml --debug -b 0.0.0.0 -bmanagement 0.0.0.0" +$cmdArgs = "-c standalone-full-ADV360-BES-EAP_8_POSTGRES.xml --debug -b 0.0.0.0 -bmanagement 0.0.0.0" # Start JBoss - Modified to use Start-Process with RedirectStandardOutput -$logFile = "$JBOSS_HOME\standalone\log\server.log" +$logFile = "$JBOSS_HOME\standalone\log\server-info.log" $processStartInfo = @{ FilePath = $startScript ArgumentList = $cmdArgs diff --git a/stop-jboss.ps1 b/stop-jboss.ps1 index 0b3c4eb..fddc8ed 100644 --- a/stop-jboss.ps1 +++ b/stop-jboss.ps1 @@ -1,9 +1,9 @@ -# PowerShell script to stop JBoss EAP 7.4 +# PowerShell script to stop JBoss EAP 8.0 # Configuration -$JBOSS_HOME = "C:\Dev2012\BUILDERS\jboss-eap-7.4" +$JBOSS_HOME = "C:\Dev2012\BUILDERS\jboss-eap-8.0" -Write-Host "Stopping JBoss EAP 7.4..." -ForegroundColor Yellow +Write-Host "Stopping JBoss EAP 8.0..." -ForegroundColor Yellow # Find and stop JBoss process $jbossProcess = Get-CimInstance Win32_Process -Filter "Name = 'java.exe'" | diff --git a/unpack_ear.ps1 b/unpack_ear.ps1 new file mode 100644 index 0000000..8cc82fb --- /dev/null +++ b/unpack_ear.ps1 @@ -0,0 +1,52 @@ +$sourceFile = "C:\Dev2012\BUILDERS\jboss-eap-8.0\standalone\deployments\adv360-ear.ear" +$destinationPath = ".\arm_am-unpacked" + +# Remove destination directory if it exists +if (Test-Path -Path $destinationPath) { + Remove-Item -Path $destinationPath -Recurse -Force + Write-Host "Removed existing directory: $destinationPath" +} + +# Create destination directory +if (-not (Test-Path -Path $destinationPath)) { + New-Item -ItemType Directory -Path $destinationPath -Force +} + +# Rename .ear to .zip temporarily to use Expand-Archive +$tempZipPath = $sourceFile -replace '\.ear$', '.zip' +Copy-Item -Path $sourceFile -Destination $tempZipPath + +# Extract the EAR contents +Expand-Archive -Path $tempZipPath -DestinationPath $destinationPath -Force + +# Clean up temporary zip file +Remove-Item -Path $tempZipPath + +Write-Host "EAR file extracted to $destinationPath" + +# Function to unpack archive files (war/ejb) +function Expand-JavaArchive { + param ( + [string]$archivePath, + [string]$destinationPath + ) + + $tempZipPath = $archivePath -replace '\.(war|jar)$', '.zip' + Copy-Item -Path $archivePath -Destination $tempZipPath + + # Create extraction directory + if (-not (Test-Path -Path $destinationPath)) { + New-Item -ItemType Directory -Path $destinationPath -Force + } + + # Extract contents + Expand-Archive -Path $tempZipPath -DestinationPath $destinationPath -Force + Remove-Item -Path $tempZipPath + Write-Host "Extracted $archivePath to $destinationPath" +} + +# Find and extract WAR and EJB files +Get-ChildItem -Path $destinationPath -Recurse -Include "*.war", "*-ejbx.jar" | ForEach-Object { + $extractPath = Join-Path (Split-Path -Parent $_.FullName) ($_.BaseName + "_unpacked") + Expand-JavaArchive -archivePath $_.FullName -destinationPath $extractPath +}