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

fix APS RAD tiles

parent 439e45e2

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

+36 −20
Original line number Diff line number Diff line
@@ -33,10 +33,21 @@ 
						<artifactId>maven-dependency-plugin</artifactId>

						<version>3.6.1</version>

						<executions>

							<!-- This execution downloads the dependency JARs, including JAR modules -->

							<execution>

								<id>download-jars</id>

								<phase>generate-test-resources</phase>

								<goals><goal>copy-dependencies</goal></goals>

								<configuration>

									<excludeScope>provided</excludeScope>

									<includeTypes>jar</includeTypes>

									<outputDirectory>${beedk.deploy.aps.extDirectory}</outputDirectory>

								</configuration>

							</execution>

							<!-- This execution downloads the parameterized WAR -->

							<execution>

								<id>download-webapp</id>

								<phase>process-test-classes</phase>

								<phase>generate-test-resources</phase>

								<goals><goal>copy</goal></goals>

								<configuration>

									<artifactItems>
@@ -47,7 +58,7 @@ 
											<type>war</type>

										</artifactItem>

									</artifactItems>

									<outputDirectory>${project.build.warDirectory}</outputDirectory>

									<outputDirectory>${beedk.deploy.aps.warDirectory}</outputDirectory>

								</configuration>

							</execution>

						</executions>
@@ -56,7 +67,6 @@ 
					<plugin>

						<groupId>io.fabric8</groupId>

						<artifactId>docker-maven-plugin</artifactId>

						<version>${beedk.plugins.fabric8.docker.version}</version>

						<executions>

							<execution>

								<id>run-aps</id>
@@ -66,11 +76,11 @@ 
									<images>

										<image>

											<name>postgres:${aps-postgres.version}</name>

											<alias>acs-db</alias>

											<alias>aps-db</alias>

											<run>

												<env>

													<POSTGRES_PASSWORD>activiti</POSTGRES_PASSWORD>

													<POSTGRES_USER>activiti</POSTGRES_USER>

													<POSTGRES_PASSWORD>alfresco</POSTGRES_PASSWORD>

													<POSTGRES_USER>alfresco</POSTGRES_USER>

													<POSTGRES_DB>activiti</POSTGRES_DB>

												</env>

												<ports>
@@ -90,12 +100,16 @@ 
													<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>

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

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

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

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

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

												</env>

												<ports>

													<port>${aps.port}:8080</port>

													<port>${aps.debugger.port}:8000</port>

												</ports>

												<dependsOn>

													<container>aps-db</container>

												</dependsOn>

												<network>

													<mode>custom</mode>

													<name>${project.artifactId}</name>
@@ -103,20 +117,20 @@ 
												<volumes>

													<bind>

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

														<volume>${beedk.deploy.aps.warFile}:/var/lib/tomcat/webapps/activiti-app.war: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/classes-extra1:ro</volume>

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

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

													</bind>

												</volumes><!--

												</volumes>

												<wait>

													<http>

														<url>http://localhost:${aps.port}/activiti-app/service/api/server</url>

														<url>http://admin%40app.activiti.com:admin@localhost:${aps.port}/activiti-app/api/management/engine</url>

														<method>GET</method>

														<status>200..399</status>

														<status>200</status>

													</http>

													<time>${aps.timeout}</time>

												</wait>-->

												</wait>

											</run>

										</image>

									</images>
@@ -148,12 +162,13 @@ 
			</activation>

			<properties>

				<!-- configurable -->

				<aps.war.groupId>org.alfresco</aps.war.groupId>

				<aps.war.groupId>com.activiti</aps.war.groupId>

				<aps.war.artifactId>activiti-app</aps.war.artifactId>

				<aps.war.version>${aps.version}</aps.war.version>

				<project.build.warDirectory>${project.build.directory}/war</project.build.warDirectory>

				<beedk.deploy.aps.classesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.aps.classesDirectory>

				<beedk.deploy.aps.testClassesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.aps.testClassesDirectory>

				<beedk.deploy.aps.extDirectory>${project.build.directory}/doesnotexist</beedk.deploy.aps.extDirectory>

				<beedk.deploy.aps.classesDirectory>${project.build.outputDirectory}</beedk.deploy.aps.classesDirectory>

				<beedk.deploy.aps.testClassesDirectory>${project.build.testOutputDirectory}</beedk.deploy.aps.testClassesDirectory>

				<beedk.deploy.aps.extDirectory>${project.build.directory}/ext</beedk.deploy.aps.extDirectory>

				<beedk.deploy.aps.warDirectory>${project.build.warDirectory}</beedk.deploy.aps.warDirectory>

				<aps.timeout>60000</aps.timeout>

				<aps.memory>512m</aps.memory>
@@ -163,13 +178,14 @@ 
				<aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory>



				<!-- ports -->

				<aps-postgres.port>5432</aps-postgres.port>

				<aps-postgres.port>5433</aps-postgres.port>

				<aps.port>8080</aps.port>

				<aps.debugger.port>8000</aps.debugger.port>

				

				<!-- versions -->

				<aps.version>1.11.1.1</aps.version>

				<tomcat-rad.version>9-1.4</tomcat-rad.version>

				<aps-postgres.version>9.6</aps-postgres.version>

				<aps.version>1.11.5</aps.version>

				<tomcat-rad.version>9-2.1</tomcat-rad.version>



				<!-- results -->

				<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>

beedk-aps-rad-tile/tile.xml

+9 −17
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ 
													<POSTGRES_USER>alfresco</POSTGRES_USER>

													<POSTGRES_DB>activiti</POSTGRES_DB>

												</env>

												<ports>

													<port>${aps-postgres.port}:5432</port>

												</ports>

												<network>

													<mode>custom</mode>

													<name>${project.artifactId}</name>
@@ -68,11 +71,6 @@ 
												<ports>

													<port>${aps.port}:8080</port>

												</ports>

												<volumes>

													<bind>

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

													</bind>

												</volumes>

												<dependsOn>

													<container>aps-db</container>

												</dependsOn>
@@ -80,6 +78,11 @@ 
													<mode>custom</mode>

													<name>${project.artifactId}</name>

												</network>

												<volumes>

													<bind>

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

													</bind>

												</volumes>

											</run>

										</image>

									</images>
@@ -90,18 +93,6 @@ 
				</plugins>

			</build>

		</profile>

		<!-- allow downstream tiles to default this before this tile does -->

		<profile>

			<id>tomcat-opts-unspecified</id>

			<activation>

				<property>

					<name>!aps.tomcat.opts</name>

				</property>

			</activation>

			<properties>

				<aps.tomcat.opts></aps.tomcat.opts>

			</properties>

		</profile>

		<profile>

			<id>default-props</id>

			<activation>
@@ -115,6 +106,7 @@ 
				<aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory>



				<!-- ports -->

				<aps-postgres.port>5433</aps-postgres.port>

				<aps.port>8080</aps.port>

				

				<!-- versions -->