Skip to content

Commit

Permalink
Issue #720
Browse files Browse the repository at this point in the history
Aggiornate librerie installer.
Eliminate librerie installer non necessarie.
Corretti script dopo aggiornamento nomi jar.
  • Loading branch information
pintorig committed Jul 29, 2024
1 parent 089c529 commit 29ccfe6
Show file tree
Hide file tree
Showing 23 changed files with 16 additions and 16 deletions.
14 changes: 7 additions & 7 deletions src/main/resources/setup/core/install.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@ set LIBRARIES=%ROOT_OPENSPCOOP%\installer\lib
set ANTINSTALLER_LIBRARIES=%LIBRARIES%\antinstaller

REM # Installer from command line classpath
set CLASSPATH=%LIBRARIES%\shared\xercesImpl-2.9.1.jar
set CLASSPATH=%LIBRARIES%\shared\xercesImpl-2.12.2.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\xml-apis_antinstaller0.8b.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-installer-0.8b.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ai-icons-eclipse_antinstaller0.8b.jar

REM # JGoodies Look And Feel
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\jgoodies-edited-1_2_2.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\jgoodies-edited-1.2.2-gov4j-1.jar

REM # minimal ANT classpath requirements
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-1.8.0.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-launcher-1.8.0.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-1.10.11.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-launcher-1.10.11.jar
set CLASSPATH=%CLASSPATH%;%ROOT_OPENSPCOOP%\installer\setup\deploy\resources

REM # minimal regular expression env
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-apache-regexp-1.8.0.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-apache-regexp-1.10.11.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\jakarta-regexp-1.5.jar

REM # unix tasks
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-nodeps-1.8.0.jar
set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-trax.jar
REM # set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-nodeps-1.8.0.jar
REM # set CLASSPATH=%CLASSPATH%;%ANTINSTALLER_LIBRARIES%\ant-trax.jar

%COMMAND% -classpath %CLASSPATH% org.tp23.antinstaller.runtime.ExecInstall %INTERFACE% %ROOT_OPENSPCOOP%\installer\setup

Expand Down
14 changes: 7 additions & 7 deletions src/main/resources/setup/core/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,26 @@ LIBRARIES=${ROOT_OPENSPCOOP}/installer/lib
ANTINSTALLER_LIBRARIES=${LIBRARIES}/antinstaller

# Installer from command line classpath
CLASSPATH=${LIBRARIES}/shared/xercesImpl-2.9.1.jar
CLASSPATH=${LIBRARIES}/shared/xercesImpl-2.12.2.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/xml-apis_antinstaller0.8b.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-installer-0.8b.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ai-icons-eclipse_antinstaller0.8b.jar

# JGoodies Look And Feel
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/jgoodies-edited-1_2_2.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/jgoodies-edited-1.2.2-gov4j-1.jar

# minimal ANT classpath requirements
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-1.8.0.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-launcher-1.8.0.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-1.10.11.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-launcher-1.10.11.jar
CLASSPATH=${CLASSPATH}:${ROOT_OPENSPCOOP}/installer/setup/deploy/resources

# minimal regular expression env
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-apache-regexp-1.8.0.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-apache-regexp-1.10.11.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/jakarta-regexp-1.5.jar

# unix tasks
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-nodeps-1.8.0.jar
CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-trax.jar
# CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-nodeps-1.8.0.jar
# CLASSPATH=${CLASSPATH}:${ANTINSTALLER_LIBRARIES}/ant-trax.jar

COMMAND=$JAVA_HOME/bin/java

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<hidden property="antinstaller_product_version" value="PRODUCT_VERSION" />

<comment explanatoryText="GovPay - Porta di Accesso al Nodo dei Pagamenti SPC - http://www.gov4j.it/govpay" />
<comment explanatoryText="Copyright (c) 2014-2022 Link.it srl (http://www.link.it)." />
<comment explanatoryText="Copyright (c) 2014-2024 Link.it srl (http://www.link.it)." />
<comment explanatoryText="" />
<comment explanatoryText="This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version." />
<comment explanatoryText="This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." />
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/setup/core/installer/setup/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<java classname="org.openspcoop2.utils.crypt.Password" fork="true" outputproperty="antinstaller_principal_pwd_md5">
<arg value="${antinstaller_principal_pwd}" />
<classpath>
<path location="${librerie}/shared/openspcoop2_utils-crypt-3.2.0.jar"/>
<path location="${librerie}/shared/openspcoop2_utils-crypt-3.2.1.jar"/>
</classpath>
</java>

Expand Down

0 comments on commit 29ccfe6

Please sign in to comment.