Commit 5c05f73f authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents e68366d1 52f237e5

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

+21 −0
Original line number Diff line number Diff line
@@ -19,6 +19,25 @@ 
 		xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://bitbucket.org/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">



	<build>

		<testResources>

			<!-- need to split certain test resources to load before webapp -->

			<testResource>

				<directory>src/test/resources</directory>

				<filtering>true</filtering>

				<excludes>

					<exclude>activiti/**/*</exclude>

					<exclude>**/README*</exclude>

				</excludes>

			</testResource>

			<testResource>

				<directory>src/test/resources</directory>

				<filtering>true</filtering>

				<includes>

					<include>activiti/**/*</include>

				</includes>

				<targetPath>${project.build.directory}/rt-test-resources</targetPath>

			</testResource>

		</testResources>

		<plugins>

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

			<plugin>
@@ -120,7 +139,9 @@ 
											<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>${project.build.directory}/rt-resources:/var/lib/tomcat/dev/classes:ro</volume>

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

												<volume>${project.build.directory}/rt-test-resources:/var/lib/tomcat/dev/classes-extra1: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>

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

+21 −0
Original line number Diff line number Diff line
@@ -27,6 +27,25 @@ 
				</property>

			</activation>

			<build>

				<testResources>

					<!-- need to split certain test resources to load before webapp -->

					<testResource>

						<directory>src/test/resources</directory>

						<filtering>true</filtering>

						<excludes>

							<exclude>activiti/**/*</exclude>

							<exclude>**/README*</exclude>

						</excludes>

					</testResource>

					<testResource>

						<directory>src/test/resources</directory>

						<filtering>true</filtering>

						<includes>

							<include>activiti/**/*</include>

						</includes>

						<targetPath>${project.build.directory}/rt-test-resources</targetPath>

					</testResource>

				</testResources>

				<plugins>

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

					<plugin>
@@ -125,7 +144,9 @@ 
													<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>${project.build.directory}/rt-resources:/var/lib/tomcat/dev/classes:ro</volume>

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

														<volume>${project.build.directory}/rt-test-resources:/var/lib/tomcat/dev/classes-extra1: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>