This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 04515f3f50 standalone distribution working again
04515f3f50 is described below
commit 04515f3f507968fa992f2e3349a9ca4f36752e5d
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Jul 4 09:42:00 2024 +0200
standalone distribution working again
---
standalone/pom.xml | 5 ++---
standalone/src/main/resources/setenv.bat | 2 +-
standalone/src/main/resources/setenv.sh | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/standalone/pom.xml b/standalone/pom.xml
index e5804e1ae2..1d1702844f 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -139,6 +139,7 @@ under the License.
<copy
todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes"
overwrite="true">
<fileset dir="${project.build.outputDirectory}/core"/>
</copy>
+ <copy
file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"
todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib"
overwrite="true"/>
<copy
file="../fit/core-reference/target/test-classes/saml.keystore.jks"
todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes"
overwrite="true"/>
<!-- Syncope console -->
@@ -193,9 +194,7 @@ under the License.
<replacetoken><![CDATA[<Service
name="Catalina">]]></replacetoken>
<replacevalue><![CDATA[<Service name="Catalina">
-<Connector protocol="org.apache.coyote.http11.Http11NioProtocol" port="9443"
maxThreads="200"
-scheme="https" secure="true" SSLEnabled="true"
keystoreFile="conf/keystore.jks" keystorePass="password"
-keystoreType="JKS" clientAuth="false" sslProtocol="TLS"/>]]></replacevalue>
+<Connector SSLEnabled="true" URIEncoding="UTF-8" connectionTimeout="20000"
emptySessionPath="cargo.tomcat.connector.emptySessionPath"
maxParameterCount="1000" port="9443"
protocol="HTTP/1.1"><SSLHostConfig><Certificate
certificateKeystoreFile="conf/keystore.jks"
certificateKeystorePassword="password"
type="RSA"/></SSLHostConfig></Connector>]]></replacevalue>
</replace>
<replace
file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8009"
value="${cargo.tomcat.ajp.port}"/>
<replace
file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8005"
value="${cargo.rmi.port}"/>
diff --git a/standalone/src/main/resources/setenv.bat
b/standalone/src/main/resources/setenv.bat
index e58be0879e..14fd4c56bd 100644
--- a/standalone/src/main/resources/setenv.bat
+++ b/standalone/src/main/resources/setenv.bat
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-set JAVA_OPTS=-Djava.awt.headless=true -Dfile.encoding=UTF-8
-Djavax.net.ssl.trustStore=%CATALINA_HOME%\conf\keystore.jks
-Dsyncope.connid.location=connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}
-Dsyncope.conf.dir=%CATALINA_HOME%\webapps\syncope\WEB-INF\classes
-Dsyncope.log.dir=%CATALINA_HOME%\logs -Dspring.profiles.active=embedded,all
-server -Xms2048m -Xmx2048m -XX:NewSize=256m -XX:MaxNewSize=256m
-DCATALINA_HOME=%CATALINA_HOME%
+set JAVA_OPTS=-Djava.awt.headless=true -Dfile.encoding=UTF-8
-Djavax.net.ssl.trustStore=%CATALINA_HOME%\conf\keystore.jks
-Dsyncope.connid.location=connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}
-Dsyncope.conf.dir=%CATALINA_HOME%\webapps\syncope\WEB-INF\classes
-Dsyncope.log.dir=%CATALINA_HOME%\logs -Dspring.profiles.active=embedded,all
-server -Xms2048m -Xmx2048m -XX:NewSize=256m -XX:MaxNewSize=256m
-DCATALINA_HOME=%CATALINA_HOME% -Dh2.returnOffsetDateTime=true
diff --git a/standalone/src/main/resources/setenv.sh
b/standalone/src/main/resources/setenv.sh
index fe44497a26..c5b642f8fb 100755
--- a/standalone/src/main/resources/setenv.sh
+++ b/standalone/src/main/resources/setenv.sh
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-JAVA_OPTS="-Djava.awt.headless=true -Dfile.encoding=UTF-8
-Djavax.net.ssl.trustStore=$CATALINA_HOME/conf/keystore.jks
-Djavax.net.ssl.trustStorePassword=password
-Dsyncope.conf.dir=$CATALINA_HOME/webapps/syncope/WEB-INF/classes
-Dsyncope.connid.location=connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}
-Dsyncope.log.dir=$CATALINA_HOME/logs -Dspring.profiles.active=embedded,all
-server -Xms2048m -Xmx2048m -XX:NewSize=256m -XX:MaxNewSize=256m
-DCATALINA_HOME=$CATALI [...]
+JAVA_OPTS="-Djava.awt.headless=true -Dfile.encoding=UTF-8
-Djavax.net.ssl.trustStore=$CATALINA_HOME/conf/keystore.jks
-Djavax.net.ssl.trustStorePassword=password
-Dsyncope.conf.dir=$CATALINA_HOME/webapps/syncope/WEB-INF/classes
-Dsyncope.connid.location=connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}
-Dsyncope.log.dir=$CATALINA_HOME/logs -Dspring.profiles.active=embedded,all
-server -Xms2048m -Xmx2048m -XX:NewSize=256m -XX:MaxNewSize=256m
-DCATALINA_HOME=$CATALI [...]
