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

Merge branch 'develop' into stable

parents 920d8588 05bf7c29

beedk-acs-share-rad-tile/tile.xml

+47 −0
Original line number Diff line number Diff line
@@ -13,6 +13,51 @@ 
			</activation>

			<build>

				<plugins>

					<!-- This plugin downloads the Alfresco SDK configuration for Share -->

					<plugin>

						<groupId>com.googlecode.maven-download-plugin</groupId>

						<artifactId>download-maven-plugin</artifactId>

						<version>1.6.1</version>

						<executions>

							<execution>

								<id>download-share-config</id>

								<phase>generate-resources</phase>

								<goals>

									<goal>wget</goal>

								</goals>

								<configuration>

									<url>https://raw.githubusercontent.com/Alfresco/alfresco-sdk/alfresco-sdk-aggregator-${alfresco.sdk.version}/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/share-config-custom.xml</url>

									<outputDirectory>${project.build.directory}/download</outputDirectory>

								</configuration>

							</execution>

						</executions>

					</plugin>

					<!-- This plugin configures the Share configuration for the BeeDK -->

					<plugin>

						<groupId>com.google.code.maven-replacer-plugin</groupId>

						<artifactId>maven-replacer-plugin</artifactId>

						<version>1.4.1</version>

						<executions>

							<execution>

								<phase>process-resources</phase>

								<goals>

									<goal>replace</goal>

								</goals>

							</execution>

						</executions>

						<configuration>

							<basedir>${project.build.directory}/download</basedir>

							<outputBasedir>${project.build.directory}/runtime-classes</outputBasedir>

							<file>share-config-custom.xml</file>

							<outputDir>alfresco/web-extension</outputDir>

							<replacements>

								<replacement>

									<token>http://\$\{acs\.host\}:8080</token>

									<value>${acs-platform.url}</value>

								</replacement>

							</replacements>

						</configuration>

					</plugin>

					<!-- Using Docker to host the web application -->

					<plugin>

						<groupId>io.fabric8</groupId>
@@ -50,6 +95,7 @@ 
														<volume>${beedk.deploy.share.modClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro</volume>

														<volume>${beedk.deploy.share.extClassesDirectory}:/var/lib/tomcat/dev/classes-extra2:ro</volume>

														<volume>${beedk.deploy.share.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra3:ro</volume>

														<volume>${project.build.directory}/runtime-classes:/var/lib/tomcat/dev/classes-extra4:ro</volume>

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

														<volume>${beedk.deploy.share.webDirectory}:/var/lib/tomcat/dev/web:ro</volume>

													</bind>
@@ -100,6 +146,7 @@ 
				<beedk.deploy.share.extDirectory>${project.build.directory}/doesnotexist</beedk.deploy.share.extDirectory>

				<beedk.deploy.share.webDirectory>${project.build.directory}/doesnotexist</beedk.deploy.share.webDirectory>

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

				<acs-platform.url>http://${project.artifactId}-acs-platform:8080</acs-platform.url>

				<acs-share.timeout>150000</acs-share.timeout>

				<acs-share.debugger.enabled>true</acs-share.debugger.enabled>

				<acs-share.hotswap.enabled>true</acs-share.hotswap.enabled>

beedk-acs-share-self-rad-tile/tile.xml

+1 −47
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
			</activation>

			<build>

				<plugins>

					<!-- This plugin downloads the Share JAR-based extension modules and runtime/test dependencies -->

					<!-- This plugin downloads the Share JAR-based extension modules -->

					<plugin>

						<artifactId>maven-dependency-plugin</artifactId>

						<version>3.1.2</version>
@@ -31,51 +31,6 @@ 
							</execution>

						</executions>

					</plugin>

					<!-- This plugin downloads the Alfresco SDK configuration for Share -->

					<plugin>

						<groupId>com.googlecode.maven-download-plugin</groupId>

						<artifactId>download-maven-plugin</artifactId>

						<version>1.6.1</version>

						<executions>

							<execution>

								<id>download-share-config</id>

								<phase>generate-resources</phase>

								<goals>

									<goal>wget</goal>

								</goals>

								<configuration>

									<url>https://raw.githubusercontent.com/Alfresco/alfresco-sdk/alfresco-sdk-aggregator-${alfresco.sdk.version}/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/share-config-custom.xml</url>

									<outputDirectory>${project.build.directory}/download</outputDirectory>

								</configuration>

							</execution>

						</executions>

					</plugin>

					<!-- This plugin configures the Share configuration for the BeeDK -->

					<plugin>

						<groupId>com.google.code.maven-replacer-plugin</groupId>

						<artifactId>maven-replacer-plugin</artifactId>

						<version>1.4.1</version>

						<executions>

							<execution>

								<phase>process-resources</phase>

								<goals>

									<goal>replace</goal>

								</goals>

							</execution>

						</executions>

						<configuration>

							<basedir>${basedir}/target/download</basedir>

							<outputBasedir>${basedir}/target/test-classes</outputBasedir>

							<file>share-config-custom.xml</file>

							<outputDir>alfresco/web-extension</outputDir>

							<replacements>

								<replacement>

									<token>http://\$\{acs\.host\}:8080</token>

									<value>${acs-platform.url}</value>

								</replacement>

							</replacements>

						</configuration>

					</plugin>

				</plugins>

			</build>

		</profile>
@@ -88,7 +43,6 @@ 
			</activation>

			<properties>

				<!-- configurable -->

				<acs-platform.url>http://${project.artifactId}-acs-platform:8080</acs-platform.url>

				<beedk.deploy.share.warFile>${project.build.warFile}</beedk.deploy.share.warFile>

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

				<beedk.deploy.share.modClassesDirectory>${project.build.directory}/module-classes</beedk.deploy.share.modClassesDirectory>