Commit 3d353cf6 authored by Brian Long's avatar Brian Long
Browse files

finished, tested and fixed initial impl

parent 0541cf50

pom.xml

+2 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
		<dependency>

			<groupId>com.inteligr8.alfresco</groupId>

			<artifactId>aps-public-rest-api</artifactId>

			<version>1.2.0</version>

			<version>1.2.1</version>

			<classifier>aps1</classifier>

		</dependency>

		<dependency>
@@ -216,8 +216,7 @@ 
									<properties>

										<aps-model.baseUrl>${aps-model.baseUrl}</aps-model.baseUrl>

										<aps-model.authType>${aps-model.authType}</aps-model.authType>

										<aps-model.basicAuth.username>${aps-model.basicAuth.username}</aps-model.basicAuth.username>

										<aps-model.basicAuth.password>${aps-model.basicAuth.password}</aps-model.basicAuth.password>

										<aps-model.basicAuth.mavenServerId>${aps-model.basicAuth.mavenServerId}</aps-model.basicAuth.mavenServerId>

										<aps-model.appName>${aps-model.appName}</aps-model.appName>

									</properties>

									<pomIncludes>

src/it/deploy-app/pom.xml

+35 −7
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 


	<name>Deploy App Plugin Tests</name>

	

	<properties>

		<aps.app>FORMS Core</aps.app>

	</properties>

	

	<build>

		<plugins>

			<plugin>
@@ -24,14 +20,46 @@ 
				<version>@pom.version@</version>

				<executions>

					<execution>

						<id>download-app</id>

						<phase>validate</phase>

						<id>download-unpack-app</id>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

							<goal>unpack-app</goal>

						</goals>

						<configuration>

							<reformat>true</reformat>

							<normalize>true</normalize>

						</configuration>

					</execution>

					<execution>

						<id>translate-app</id>

						<phase>compile</phase>

						<goals>

							<goal>translate-app</goal>

						</goals>

						<configuration>

							<finalDirectory>${project.build.directory}/aps-dev</finalDirectory>

						</configuration>

					</execution>

					<execution>

						<id>pack-app</id>

						<phase>package</phase>

						<goals>

							<goal>pack-app</goal>

						</goals>

						<configuration>

							<unzipDirectory>${project.build.directory}/aps-dev</unzipDirectory>

							<zipDirectory>${project.build.directory}/aps-test</zipDirectory>

						</configuration>

					</execution>

					<execution>

						<id>deploy-app</id>

						<phase>package</phase>

						<goals>

							<goal>deploy-app</goal>

						</goals>

						<configuration>

							<apsAppName>${aps.app}</apsAppName>

							<zipDirectory>${project.build.directory}/aps-test</zipDirectory>

						</configuration>

					</execution>

				</executions>

src/it/download-app/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
				<executions>

					<execution>

						<id>download-app</id>

						<phase>validate</phase>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

						</goals>

					</execution>

					<execution>

						<id>download-app-other</id>

						<phase>validate</phase>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

						</goals>

src/it/pack-app/pom.xml

+4 −7
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 


	<name>Pack App Plugin Tests</name>

	

	<properties>

		<aps.app>FORMS Core</aps.app>

	</properties>

	

	<build>

		<plugins>

			<plugin>
@@ -25,7 +21,7 @@ 
				<executions>

					<execution>

						<id>download-unpack-app</id>

						<phase>validate</phase>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

							<goal>unpack-app</goal>
@@ -36,11 +32,12 @@ 
					</execution>

					<execution>

						<id>pack-app</id>

						<phase>validate</phase>

						<phase>package</phase>

						<goals>

							<goal>pack-app</goal>

						</goals>

						<configuration>

							<zipDirectory>${basedir}</zipDirectory>

						</configuration>

					</execution>

				</executions>
@@ -56,7 +53,7 @@ 
							<rules>

								<requireFilesExist>

									<files>

										<file>${basedir}/src/main/app/${aps.app}.zip</file>

										<file>${basedir}/${aps-model.appName}.zip</file>

									</files>

								</requireFilesExist>

							</rules>

src/it/translate-app/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
				<executions>

					<execution>

						<id>download-unpack-app</id>

						<phase>validate</phase>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

							<goal>unpack-app</goal>
@@ -33,7 +33,7 @@ 
					</execution>

					<execution>

						<id>translate-app</id>

						<phase>validate</phase>

						<phase>compile</phase>

						<goals>

							<goal>translate-app</goal>

						</goals>