Commit 89a43457 authored by Brian Long's avatar Brian Long
Browse files

major refactoring with testing; not done

parent da06f5ad

pom.xml

+16 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
						<goals><goal>jar</goal></goals>

						<configuration>

							<show>public</show>

							<skip>true</skip>

						</configuration>

					</execution>

				</executions>
@@ -212,6 +213,13 @@ 
									<goal>run</goal>

								</goals>

								<configuration>

									<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.appName>${aps-model.appName}</aps-model.appName>

									</properties>

									<pomIncludes>

										<pomInclude>${run-it}/pom.xml</pomInclude>

									</pomIncludes>
@@ -224,6 +232,14 @@ 
		</profile>

	</profiles>

	

	<repositories>

		<repository>

			<id>inteligr8-releases</id>

			<name>Inteligr8 Releases</name>

			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>

		</repository>

	</repositories>



	<distributionManagement>

		<repository>

			<id>inteligr8-releases</id>

src/it/download-app/pom.xml

+3 −11
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 


	<name>Download App Plugin Tests</name>

	

	<properties>

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

	</properties>

	

	<build>

		<plugins>

			<plugin>
@@ -29,9 +25,6 @@ 
						<goals>

							<goal>download-app</goal>

						</goals>

						<configuration>

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

						</configuration>

					</execution>

					<execution>

						<id>download-app-other</id>
@@ -40,8 +33,7 @@ 
							<goal>download-app</goal>

						</goals>

						<configuration>

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

							<targetDirectory>${basedir}/src/main/app</targetDirectory>

							<zipDirectory>${basedir}/src/main/aps</zipDirectory>

						</configuration>

					</execution>

				</executions>
@@ -57,8 +49,8 @@ 
							<rules>

								<requireFilesExist>

									<files>

										<file>${project.build.directory}/app/${aps.app}.zip</file>

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

										<file>${project.build.directory}/aps/${aps-model.appName}.zip</file>

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

									</files>

								</requireFilesExist>

							</rules>

src/it/translate-app/pom.xml

+3 −8
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 


	<name>Translate App Plugin Tests</name>

	

	<properties>

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

	</properties>

	

	<build>

		<plugins>

			<plugin>
@@ -31,7 +27,7 @@ 
							<goal>unpack-app</goal>

						</goals>

						<configuration>

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

							<normalize>true</normalize>

						</configuration>

					</execution>

					<execution>
@@ -41,8 +37,7 @@ 
							<goal>translate-app</goal>

						</goals>

						<configuration>

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

							<targetDirectory>${basedir}/src/main/app</targetDirectory>

							<finalDirectory>${basedir}/src/main/aps/app</finalDirectory>

						</configuration>

					</execution>

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

								<requireFilesExist>

									<files>

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

										<file>${basedir}/src/main/aps/app/${aps-model.appName}/${aps-model.appName}.json</file>

									</files>

								</requireFilesExist>

							</rules>

src/it/unpack-app/pom.xml

+3 −11
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 


	<name>Unpack App Plugin Tests</name>

	

	<properties>

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

	</properties>

	

	<build>

		<plugins>

			<plugin>
@@ -30,9 +26,6 @@ 
							<goal>download-app</goal>

							<goal>unpack-app</goal>

						</goals>

						<configuration>

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

						</configuration>

					</execution>

					<execution>

						<id>unpack-app</id>
@@ -41,8 +34,7 @@ 
							<goal>unpack-app</goal>

						</goals>

						<configuration>

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

							<targetDirectory>${basedir}/src/main/app</targetDirectory>

							<unzipDirectory>${basedir}/src/main/aps/app</unzipDirectory>

						</configuration>

					</execution>

				</executions>
@@ -58,8 +50,8 @@ 
							<rules>

								<requireFilesExist>

									<files>

										<file>${project.build.directory}/app/${aps.app}/${aps.app}.json</file>

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

										<file>${project.build.directory}/aps/app/${aps-model.appName}/${aps-model.appName}.json</file>

										<file>${basedir}/src/main/aps/app/${aps-model.appName}/${aps-model.appName}.json</file>

									</files>

								</requireFilesExist>

							</rules>

src/main/java/com/inteligr8/maven/aps/modeling/ApsAddressibleGoal.java→src/main/java/com/inteligr8/maven/aps/modeling/goal/ApsAddressibleGoal.java

+14 −14
Original line number Diff line number Diff line 
package com.inteligr8.maven.aps.modeling;

package com.inteligr8.maven.aps.modeling.goal;



import org.apache.maven.plugin.AbstractMojo;

import org.apache.maven.plugins.annotations.Parameter;



import com.inteligr8.alfresco.activiti.ApsClientConfiguration;

import com.inteligr8.alfresco.activiti.ApsClientJerseyImpl;

import com.inteligr8.alfresco.activiti.ApsPublicRestApiJerseyImpl;



public abstract class ApsAddressibleGoal extends AbstractMojo {

public abstract class ApsAddressibleGoal extends DisablableGoal {

	

	@Parameter( property = "activitiAppBaseUrl", required = true, defaultValue = "http://localhost:8080/activiti-app" )

	@Parameter( property = "aps-model.baseUrl", required = true, defaultValue = "http://localhost:8080/activiti-app"  )

	protected String activitiAppBaseUrl;

	

	@Parameter( property = "activitiAppAuth", required = true, defaultValue = "BASIC" )

	@Parameter( property = "aps-model.authType", required = true, defaultValue = "BASIC" )

	protected String activitiAppAuthType;

	

	@Parameter( property = "activitiAppBasicUsername", required = false, defaultValue = "admin" )

	@Parameter( property = "aps-model.basicAuth.username", required = false, defaultValue = "admin@app.activiti.com" )

	protected String activitiAppAuthBasicUsername;

	

	@Parameter( property = "activitiAppBasicPassword", required = false, defaultValue = "admin" )

	@Parameter( property = "aps-model.basicAuth.password", required = false, defaultValue = "admin" )

	protected String activitiAppAuthBasicPassword;

	

	@Parameter( property = "oAuthCode", required = false )

	@Parameter( property = "aps-model.oauth.code", required = false )

	protected String oauthCode;

	

	@Parameter( property = "oAuthClientId", required = false )

	@Parameter( property = "aps-model.oauth.clientId", required = false )

	protected String oauthClientId;

	

	@Parameter( property = "oAuthClientSecret", required = false )

	@Parameter( property = "aps-model.oauth.clientSecret", required = false )

	protected String oauthClientSecret;

	

	@Parameter( property = "oAuthUsername", required = false )

	@Parameter( property = "aps-model.oauth.username", required = false )

	protected String oauthUsername;

	

	@Parameter( property = "oAuthPassword", required = false )

	@Parameter( property = "aps-model.oauth.password", required = false )

	protected String oauthPassword;

	

	@Parameter( property = "oAuthTokenUrl", required = false )

	@Parameter( property = "aps-model.oauth.tokenUrl", required = false )

	protected String oauthTokenUrl;

	

	private ApsPublicRestApiJerseyImpl api;

	

	public ApsClientConfiguration getApsClientConfiguration() {

		this.getLog().debug("Configuring APS to URL: " + this.activitiAppBaseUrl);

		ApsClientConfiguration config = new ApsClientConfiguration();

		config.setBaseUrl(this.activitiAppBaseUrl);

		switch (this.activitiAppAuthType.toUpperCase()) {
@@ -64,7 +64,7 @@ public abstract class ApsAddressibleGoal extends AbstractMojo { 
				config.setOAuthPassword(this.oauthPassword);

				break;

			default:

				throw new IllegalArgumentException("The 'activitiAppAuth' configuration must be either 'Basic' or 'OAuth'");

				throw new IllegalArgumentException("The 'activitiAppAuthType' configuration must be either 'Basic' or 'OAuth'");

		}

		

		return config;