Skip to content

Commit 068519c

Browse files
hguntupa-tibcohguntupa-tibco
authored
Merge pull request #87 from TIBCOSoftware/develop
Develop
2 parents f31ad45 + d382d43 commit 068519c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+740
-410
lines changed

‎jaspersoft-containers/Docker/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
This distribution includes Dockerfile, scripts, and supporting files for building, configuring, and running TIBCO JasperReports® Server and TIBCO JasperReports® Server Scalable Query Engine in Docker.
1+
This distribution includes Dockerfile, scripts, and supporting files for building, configuring, and running JasperReports® Server and JasperReports® Server Scalable Query Engine in Docker.

‎jaspersoft-containers/Docker/jrs/.env

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
INSTALL_CHROMIUM=false
22
JASPERREPORTS_SERVER_APP_IMAGE_NAME=jasperserver-webapp
33
JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_NAME=jasperserver-buildomatic
4-
JASPERREPORTS_SERVER_VERSION=8.1.1
5-
JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.1.1
6-
JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.1.1
7-
TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-openjdk
4+
JASPERREPORTS_SERVER_VERSION=8.2.0
5+
JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.2.0
6+
JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.2.0
7+
TOMCAT_BASE_IMAGE= tomcat:9.0.65-jdk11-openjdk
88
JDK_BASE_IMAGE=openjdk:11-jdk
9+
## TOMCAT_BASE_IMAGE=tomcat:9.0.62-jdk17-openjdk
10+
## JDK_BASE_IMAGE=eclipse-temurin:17-jdk
911
RELEASE_DATE=May 13,2022
1012
JS_INSTALL_TARGETS=gen-config pre-install-test-pro prepare-all-pro-dbs-normal
1113
## For including samples gen-config pre-install-test-pro prepare-all-pro-dbs-normal

‎jaspersoft-containers/Docker/jrs/Dockerfile

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
# Copyright (c) 2021-2021. TIBCO Software Inc.
1+
# Copyright © 2021-2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
22
# This file is subject to the license terms contained
33
# in the license file that is distributed with this file
44

5-
#ARG TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-corretto
6-
ARG TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-openjdk
5+
#ARG TOMCAT_BASE_IMAGE=tomcat:9.0.73-jdk11-corretto
6+
#ARG TOMCAT_BASE_IMAGE=tomcat:9.0.62-jdk17-openjdk
7+
#ARG TOMCAT_BASE_IMAGE=tomcat:9.0.73-jdk17-corretto
8+
ARG TOMCAT_BASE_IMAGE=tomcat:9.0.65-jdk11-openjdk
9+
710
ARG INSTALL_CHROMIUM=false
8-
ARG JASPERREPORTS_SERVER_VERSION=8.1.1
11+
ARG JASPERREPORTS_SERVER_VERSION=8.2.0
912

1013
FROM ${TOMCAT_BASE_IMAGE} as deployment
1114

@@ -16,7 +19,7 @@ ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
1619

1720

1821
ENV INSTALL_CHROMIUM ${INSTALl_CHROMIUM:-false}
19-
ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1}
22+
ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0}
2023
ENV JRS_HOME /usr/src/jasperreports-server
2124
ENV BUILDOMATIC_MODE non-interactive
2225

@@ -57,7 +60,7 @@ ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022}
5760

5861

5962
LABEL "org.jasperosft.name"="JasperReports Server" \
60-
"org.jaspersoft.vendor"="TIBCO Software Inc." \
63+
"org.jaspersoft.vendor"="Cloud Software Group, Inc." \
6164
"org.jaspersoft.maintainer"="[email protected]" \
6265
"org.jaspersoft.version"=$JASPERREPORTS_SERVER_VERSION \
6366
"org.jaspersoft.release_date"=$RELEASE_DATE \

‎jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
# Copyright (c) 2021-2021. TIBCO Software Inc.
1+
# Copyright © 2005-2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
22
# This file is subject to the license terms contained
33
# in the license file that is distributed with this file
44

55
#ARG JDK_BASE_IMAGE=amazoncorretto:11
6+
#ARG JDK_BASE_IMAGE=amazoncorretto:17
7+
#ARG JDK_BASE_IMAGE=eclipse-temurin:17-jdk
68
ARG JDK_BASE_IMAGE=openjdk:11-jdk
79
FROM ${JDK_BASE_IMAGE}
810

9-
ARG JASPERREPORTS_SERVER_VERSION=8.1.1
11+
ARG JASPERREPORTS_SERVER_VERSION=8.2.0
1012
ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/jrs
1113
ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
1214

13-
ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1}
15+
ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0}
1416
ENV JRS_HOME /usr/src/jasperreports-server
1517
ENV BUILDOMATIC_MODE non-interactive
1618
ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022}
1719

1820
LABEL "org.jasperosft.name"="JasperReports Server" \
19-
"org.jaspersoft.vendor"="TIBCO Software Inc." \
21+
"org.jaspersoft.vendor"="Cloud Software Group, Inc." \
2022
"org.jaspersoft.maintainer"="[email protected]" \
2123
"org.jaspersoft.version"=$JASPERREPORTS_SERVER_VERSION \
2224
"org.jaspersoft.release_date"=$RELEASE_DATE \

‎jaspersoft-containers/Docker/jrs/README.md

+46-34
Large diffs are not rendered by default.

‎jaspersoft-containers/Docker/jrs/cluster-config/WEB-INF/classes/ehcache_hibernate.xml

+131-86
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Copyright (C) 2005 - 2021 TIBCO Software Inc. All rights reserved.
2+
~ Copyright (C) 2005-2023. Cloud Software Group, Inc. All Rights Reserved.
33
~ http://www.jaspersoft.com.
44
~
55
~ Unless you have purchased a commercial license agreement from Jaspersoft,
@@ -26,27 +26,27 @@
2626
<!-- Below are four configurations:
2727
1. No clustering (default)
2828
2. RMI distribution with autodiscovery based on multicast
29-
- For this to work IP-Multicasting must be enabled on all nodes
29+
- For this to work IP-Multicasting must be enabled on all nodes
3030
3. JMS distribution based on ActiveMQ JMS server
3131
- Make sure you have correct IP:PORT for each providerURL property
3232
4. AWS distribution utilizing Amazon SNS/SQS services. Using this option might incurr additional costs as Amazon charges customers per API call.
3333
- note that this is experimental support and that ActiveMQ JMS option also works for AWS and is a preferred method of distribution.
3434
3535
********************************************************************************
36-
* If you have clustering environment comment or remove default "NO CLUSTERING" *
36+
* If you have clustering environment comment or remove default "NO CLUSTERING" *
3737
* segment and uncomment ONE of the options provided *
3838
* by removing "START" and "END" lines inside the corresponding block *
3939
* (RMI, JMS or AWS) *
4040
********************************************************************************
41-
-->
42-
<defaultCache
43-
maxElementsInMemory="10000"
44-
eternal="false"
45-
overflowToDisk="false"
46-
timeToIdleSeconds="3600"
47-
timeToLiveSeconds="18000"
48-
diskPersistent="false"
49-
diskExpiryThreadIntervalSeconds="120"/>
41+
-->
42+
<defaultCache
43+
maxElementsInMemory="10000"
44+
eternal="false"
45+
overflowToDisk="false"
46+
timeToIdleSeconds="3600"
47+
timeToLiveSeconds="18000"
48+
diskPersistent="false"
49+
diskExpiryThreadIntervalSeconds="120"/>
5050

5151
<!-- ******************************************************************** NO CLUSTERING *************************************************** -->
5252
<!-- START
@@ -64,62 +64,108 @@
6464

6565
<!-- ******************************************************************** END of NO CLUSTERING ******************************************** -->
6666

67+
<cache name="roles"
68+
maxElementsInMemory="1000"
69+
eternal="true"
70+
overflowToDisk="false"
71+
diskPersistent="false"/>
72+
73+
<cache name="rolesByTenant"
74+
maxElementsInMemory="1000"
75+
eternal="true"
76+
overflowToDisk="false"
77+
diskPersistent="false"/>
78+
79+
<cache name="users"
80+
maxElementsInMemory="10000"
81+
eternal="true"
82+
overflowToDisk="false"
83+
diskPersistent="false"/>
84+
<cache name="usersByTenant"
85+
maxElementsInMemory="10000"
86+
eternal="true"
87+
overflowToDisk="false"
88+
diskPersistent="false"/>
89+
90+
<cache name="tenants"
91+
maxElementsInMemory="1000"
92+
eternal="true"
93+
overflowToDisk="false"
94+
diskPersistent="false"/>
95+
<cache name="tenantsByName"
96+
maxElementsInMemory="1000"
97+
eternal="true"
98+
overflowToDisk="false"
99+
diskPersistent="false"/>
100+
101+
<cache name="folders"
102+
maxElementsInMemory="100000"
103+
eternal="true"
104+
overflowToDisk="false"
105+
diskPersistent="false"/>
106+
107+
<cache name="profileAttributes"
108+
maxElementsInMemory="100000"
109+
eternal="true"
110+
overflowToDisk="false"
111+
diskPersistent="false"/>
112+
67113
<!-- ******************************************************************** RMI ********************************************************** -->
68-
<!-- START
69-
<cacheManagerPeerProviderFactory
70-
class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
71-
properties="peerDiscovery=automatic,multicastGroupAddress=228.0.0.1,multicastGroupPort=4446,timeToLive=1"/>
72-
<cacheManagerPeerListenerFactory
73-
class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
74-
properties="port=40011,remoteObjectPort=40012,socketTimeoutMillis=120000"/>
75-
76-
<cache name="org.hibernate.cache.internal.StandardQueryCache"
77-
maxEntriesLocalHeap="5000"
78-
maxElementsInMemory="5000"
79-
eternal="false"
80-
timeToLiveSeconds="120">
81-
82-
<cacheEventListenerFactory
114+
<!-- START
115+
<cacheManagerPeerProviderFactory
116+
class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
117+
properties="peerDiscovery=automatic,multicastGroupAddress=228.0.0.1,multicastGroupPort=4446,timeToLive=1"/>
118+
<cacheManagerPeerListenerFactory
119+
class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
120+
properties="port=40011,remoteObjectPort=40012,socketTimeoutMillis=120000"/>
121+
122+
<cache name="org.hibernate.cache.internal.StandardQueryCache"
123+
maxEntriesLocalHeap="5000"
124+
maxElementsInMemory="5000"
125+
eternal="false"
126+
timeToLiveSeconds="120">
127+
128+
<cacheEventListenerFactory
83129
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
84130
properties="replicateAsynchronously=true, replicatePuts=true, replicateUpdates=true,replicateUpdatesViaCopy=false, replicateRemovals=true "/>
85-
<bootstrapCacheLoaderFactory
86-
class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
87-
properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
131+
<bootstrapCacheLoaderFactory
132+
class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
133+
properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
88134
89-
</cache>
135+
</cache>
90136
91-
<cache name="org.hibernate.cache.spi.UpdateTimestampsCache"
92-
maxEntriesLocalHeap="5000"
93-
eternal="true">
94-
95-
<cacheEventListenerFactory
137+
<cache name="org.hibernate.cache.spi.UpdateTimestampsCache"
138+
maxEntriesLocalHeap="5000"
139+
eternal="true">
140+
141+
<cacheEventListenerFactory
96142
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
97143
properties="replicateAsynchronously=true, replicatePuts=true, replicateUpdates=true,replicateUpdatesViaCopy=true, replicateRemovals=true "/>
98-
<bootstrapCacheLoaderFactory
99-
class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
100-
properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
101-
</cache>
102-
103-
<cache name="defaultRepoCache"
104-
maxElementsInMemory="10000"
105-
eternal="false"
106-
overflowToDisk="false"
107-
timeToIdleSeconds="36000"
108-
timeToLiveSeconds="180000"
109-
diskPersistent="false"
110-
diskExpiryThreadIntervalSeconds="120"
111-
statistics="true">
112-
113-
<cacheEventListenerFactory
114-
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
115-
properties="replicateAsynchronously=true, replicatePuts=false, replicateUpdates=true,replicateUpdatesViaCopy=false, replicateRemovals=true "/>
116-
<bootstrapCacheLoaderFactory
117-
class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
118-
properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
119-
</cache>
144+
<bootstrapCacheLoaderFactory
145+
class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
146+
properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
147+
</cache>
148+
149+
<cache name="defaultRepoCache"
150+
maxElementsInMemory="10000"
151+
eternal="false"
152+
overflowToDisk="false"
153+
timeToIdleSeconds="36000"
154+
timeToLiveSeconds="180000"
155+
diskPersistent="false"
156+
diskExpiryThreadIntervalSeconds="120"
157+
statistics="true">
158+
159+
<cacheEventListenerFactory
160+
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
161+
properties="replicateAsynchronously=true, replicatePuts=false, replicateUpdates=true,replicateUpdatesViaCopy=false, replicateRemovals=true "/>
162+
<bootstrapCacheLoaderFactory
163+
class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
164+
properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"/>
165+
</cache>
120166
121167
END -->
122-
<!-- ******************************************** END of RMI ************************************************ -->
168+
<!-- ******************************************** END of RMI ************************************************ -->
123169

124170
<!-- *************************************************** JMS ************************************************ -->
125171
<cacheManagerPeerProviderFactory
@@ -190,16 +236,16 @@
190236

191237
</cache>
192238

193-
<cache name="defaultRepoCache"
194-
maxElementsInMemory="10000"
195-
eternal="false"
196-
overflowToDisk="false"
197-
timeToIdleSeconds="36000"
198-
timeToLiveSeconds="180000"
199-
diskPersistent="false"
200-
diskExpiryThreadIntervalSeconds="120"
201-
statistics="true">
202-
239+
<cache name="defaultRepoCache"
240+
maxElementsInMemory="10000"
241+
eternal="false"
242+
overflowToDisk="false"
243+
timeToIdleSeconds="36000"
244+
timeToLiveSeconds="180000"
245+
diskPersistent="false"
246+
diskExpiryThreadIntervalSeconds="120"
247+
statistics="true">
248+
203249
<cacheEventListenerFactory
204250
class="net.sf.ehcache.distribution.jms.JMSCacheReplicatorFactory"
205251
properties="replicateAsynchronously=true,
@@ -221,17 +267,17 @@
221267
topicBindingName=ehcache,providerURL=${jasperserver.cache.jms.provider}"
222268
propertySeparator=","/>
223269

224-
</cache>
270+
</cache>
225271

226272
<!-- ***************************************************** END of JMS **************************************************************************** -->
227273

228274
<!-- ********************************************************** AWS **************************************************************************** -->
229-
<!-- START
275+
<!-- START
230276
<cacheManagerPeerProviderFactory
231277
class="com.jaspersoft.jasperserver.api.engine.replication.JRSNevadoCacheManagerPeerProviderFactory"
232278
properties=""
233279
propertySeparator="," />
234-
280+
235281
<cache name="org.hibernate.cache.internal.StandardQueryCache"
236282
maxEntriesLocalHeap="5000"
237283
maxElementsInMemory="5000"
@@ -257,24 +303,24 @@
257303
class="net.sf.ehcache.distribution.jms.JMSCacheReplicatorFactory"
258304
properties="replicateAsynchronously=true,
259305
replicatePuts=true,
260-
replicatePutsViaCopy=true,
306+
replicatePutsViaCopy=true,
261307
replicateUpdates=false,
262308
replicateUpdatesViaCopy=false,
263309
replicateRemovals=true,
264310
asynchronousReplicationIntervalMillis=100"
265311
propertySeparator=","/>
266312
</cache>
267-
268-
<cache name="defaultRepoCache"
269-
maxElementsInMemory="10000"
270-
eternal="false"
271-
overflowToDisk="false"
272-
timeToIdleSeconds="36000"
273-
timeToLiveSeconds="180000"
274-
diskPersistent="false"
275-
diskExpiryThreadIntervalSeconds="120"
276-
statistics="true">
277-
313+
314+
<cache name="defaultRepoCache"
315+
maxElementsInMemory="10000"
316+
eternal="false"
317+
overflowToDisk="false"
318+
timeToIdleSeconds="36000"
319+
timeToLiveSeconds="180000"
320+
diskPersistent="false"
321+
diskExpiryThreadIntervalSeconds="120"
322+
statistics="true">
323+
278324
<cacheEventListenerFactory
279325
class="net.sf.ehcache.distribution.jms.JMSCacheReplicatorFactory"
280326
properties="replicateAsynchronously=true,
@@ -284,10 +330,9 @@
284330
replicateRemovals=true,
285331
asynchronousReplicationIntervalMillis=1000"
286332
propertySeparator=","/>
287-
</cache>
333+
</cache>
288334
289335
END -->
290336
<!-- ***************************************************** END of AWS ***************************************************************************** -->
291337

292338
</ehcache>
293-

0 commit comments

Comments
 (0)