Commit adc5caf1 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 8a0e38f0 cf03dc88

beedk-aps-ext-rad-tile/tile.xml

+9 −3
Original line number Diff line number Diff line
@@ -100,8 +100,14 @@ 
													<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>

													<ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP>

													<ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP>

													<CATALINA_OPTS>-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \

													<CATALINA_OPTS>--add-opens java.base/java.net=ALL-UNNAMED \

														-Djava.awt.headless=true \

														-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \

														-Djavascript.secure-scripting.enabled=false -Djavascript.secure-scripting.enable-class-whitelisting=false \

														-Dbeans.whitelisting.enabled=false \

														-Del.whitelisting.enabled=false \

														-Dshell.whitelisting.enabled=false \

														-Dservice.task.class.whitelisting.enabled=false \

														${aps.tomcat.opts}</CATALINA_OPTS>

												</env>

												<ports>
@@ -119,8 +125,8 @@ 
													<bind>

														<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>

														<volume>${project.build.warFile}:/var/lib/tomcat/webapps/activiti-app.war:ro</volume>

														<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>

														<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>

														<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>

														<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc-extra1:ro</volume>

														<volume>${beedk.deploy.aps.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>

													</bind>

												</volumes>