Skip to content

Commit bbc57e4

Browse files
kabicinkabicin
committed
Add service name and remove beta support tag in infinispan-client-sessioncache.xml
1 parent ed207a1 commit bbc57e4

10 files changed

Lines changed: 18 additions & 10 deletions

File tree

‎releases/22.0.0.9/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<feature>sessionCache-1.0</feature>
44
</featureManager>
55
<httpSessionCache libraryRef="InfinispanLib">
6-
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
6+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
77
<properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
88
<properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
99
<properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -12,7 +12,6 @@
1212
<properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
1313
<properties infinispan.client.hotrod.auth_server_name="infinispan"/>
1414
</httpSessionCache>
15-
<httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
1615
<library id="InfinispanLib">
1716
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
1817
</library>

‎releases/22.0.0.9/full/helpers/runtime/docker-server.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ importKeyCert
7878
# Infinispan Session Caching
7979
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
8080
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
81+
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
82+
export INFINISPAN_SERVICE_NAME_ORIGINAL
8183
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
8284
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
8385

‎releases/22.0.0.9/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<server>
22
<httpSessionCache libraryRef="InfinispanLib">
3-
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
3+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
44
<properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
55
<properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
66
<properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -9,7 +9,6 @@
99
<properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
1010
<properties infinispan.client.hotrod.auth_server_name="infinispan"/>
1111
</httpSessionCache>
12-
<httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
1312
<library id="InfinispanLib">
1413
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
1514
</library>

‎releases/22.0.0.9/kernel-slim/helpers/runtime/docker-server.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ importKeyCert
7878
# Infinispan Session Caching
7979
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
8080
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
81+
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
82+
export INFINISPAN_SERVICE_NAME_ORIGINAL
8183
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
8284
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
8385

‎releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<feature>sessionCache-1.0</feature>
44
</featureManager>
55
<httpSessionCache libraryRef="InfinispanLib">
6-
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
6+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
77
<properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
88
<properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
99
<properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -12,7 +12,6 @@
1212
<properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
1313
<properties infinispan.client.hotrod.auth_server_name="infinispan"/>
1414
</httpSessionCache>
15-
<httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
1615
<library id="InfinispanLib">
1716
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
1817
</library>

‎releases/latest/beta/helpers/runtime/docker-server.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ importKeyCert
7878
# Infinispan Session Caching
7979
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
8080
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
81+
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
82+
export INFINISPAN_SERVICE_NAME_ORIGINAL
8183
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
8284
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
8385

‎releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<feature>sessionCache-1.0</feature>
44
</featureManager>
55
<httpSessionCache libraryRef="InfinispanLib">
6-
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
6+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
77
<properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
88
<properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
99
<properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -12,7 +12,6 @@
1212
<properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
1313
<properties infinispan.client.hotrod.auth_server_name="infinispan"/>
1414
</httpSessionCache>
15-
<httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
1615
<library id="InfinispanLib">
1716
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
1817
</library>

‎releases/latest/full/helpers/runtime/docker-server.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ importKeyCert
7878
# Infinispan Session Caching
7979
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
8080
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
81+
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
82+
export INFINISPAN_SERVICE_NAME_ORIGINAL
8183
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
8284
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
8385

‎releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<server>
2+
<featureManager>
3+
<feature>sessionCache-1.0</feature>
4+
</featureManager>
25
<httpSessionCache libraryRef="InfinispanLib">
3-
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
6+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
47
<properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
58
<properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
69
<properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -9,7 +12,6 @@
912
<properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
1013
<properties infinispan.client.hotrod.auth_server_name="infinispan"/>
1114
</httpSessionCache>
12-
<httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
1315
<library id="InfinispanLib">
1416
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
1517
</library>

‎releases/latest/kernel-slim/helpers/runtime/docker-server.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ importKeyCert
7878
# Infinispan Session Caching
7979
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
8080
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
81+
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
82+
export INFINISPAN_SERVICE_NAME_ORIGINAL
8183
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
8284
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
8385

0 commit comments

Comments
 (0)